Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/api/ecw/boxSea.js

@@ -143,6 +143,17 @@ export function billCreate(data) {
   });
 }
 
+/**
+ * 获得提单补料pdf
+ */
+export function getBoxLadingBillPdf(params) {
+  return request({
+    url: "/ecw/box-lading-bill/getBoxLadingBillPdf",
+    method: "get",
+    params,
+  });
+}
+
 /**
  * 驳船
  *

src/api/ecw/futureBox.js

@@ -93,3 +93,14 @@ export function getOrderReportVolume(params){
     params
   })
 }
+
+// 根据运输方式ID获取待排单订单方数
+export function getWarehousingVolume(params){
+  return request({
+    url: '/ecw/future-box/getWarehousingVolume',
+    method: 'get',
+    params
+  })
+}
+
+

src/components/WarehouseAreaSelect/index.vue

@@ -4,7 +4,7 @@
     <el-button v-show="!readonly" type="primary" size="mini" @click="handleOpen">选择</el-button>
 
     <el-dialog
-      title="提示"
+      title="储位"
       :visible.sync="dialogVisible"
       width="30%"
       append-to-body
@@ -177,22 +177,21 @@ export default {
       this.initArea()
     },
     handleSave(){
-      this.$emit('input', this.inputValue)
-      this.dialogVisible = false
-
-      if (this.isEditing) {
-        this.$nextTick(() => {
-          const data = this.inputValue.map(e => {
-            return {
-              ...e,
-              orderItemId: this.orderItemId,
-              warehouseInId: this.warehouseInId
-            }
-          })
-          updateWarehouseInLocation(data)
-
+      this.$nextTick(() => {
+        const data = this.inputValue.map(e => {
+          return {
+            ...e,
+            orderItemId: this.orderItemId,
+            warehouseInId: this.warehouseInId
+          }
         })
-      }
+        this.$emit('input', data)
+        this.dialogVisible = false
+
+        if (this.isEditing || this.orderItemId) {
+            updateWarehouseInLocation(data)
+        }
+      })
     },
     handleClose() {
       this.dialogVisible = false

src/views/chat.vue

+<template>
+    <iframe src="https://chat.groupage.cn/" class="iframe"></iframe>
+</template>
+<style>
+    .iframe{
+        width: 100%;
+        height: calc(100vh - 84px);
+        border: none;
+    }
+</style>

src/views/ecw/box/indexFutureBox.vue

@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume,getExceptionVolume, getOrderReportVolume} from "@/api/ecw/futureBox";
+import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume,getExceptionVolume, getOrderReportVolume,getWarehousingVolume} from "@/api/ecw/futureBox";
 import {getCabinetPage} from "@/api/ecw/cabinet";
 import { getChannelList } from '@/api/ecw/channel';
 import { getWarehouseList } from "@/api/ecw/warehouse"
@@ -334,10 +334,10 @@ export default {
     'form.shippingChannelId'(){
       this.getVolume()
     },
-    'form.warehousedNumber'(){
+    //'form.warehousedNumber'(){
       //在仓 = 已入仓-已封柜
-      this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
-    },
+      //this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
+    //},
     'form.loadingNumber'(){
       //在仓 = 已入仓-已封柜
       this.$set(this.form, 'warehousingNumber',  Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
@@ -378,6 +378,11 @@ export default {
       getOrderReportVolume(data).then(res => {
         this.$set(this.form, 'orderReportNumber', res.data || 0)
       })
+
+      // 获得待排单订单方数
+      getWarehousingVolume(data).then(res => {
+        this.$set(this.form, 'warehousingNumber', res.data || 0)
+      })
     },
     setDefaultVolume(){
       this.$set(this.form, 'loadingNumber', 0)

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -69,6 +69,7 @@
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
       <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
+      <el-button :disabled="shipmentObj.ladingBillInfo == null" @click="download">{{$t('下载提单确认件')}}</el-button>
     </el-row>
   </div>
 </template>
@@ -80,9 +81,10 @@ import userSelect from "./common/userSelect.vue";
 import ladingSelect from "./common/ladingSelect.vue";
 import { getUnitList } from "@/api/ecw/unit";
 import { getCabinetPage } from "@/api/ecw/cabinet";
-import { billCreate } from "@/api/ecw/boxSea";
+import { billCreate, getBoxLadingBillPdf } from "@/api/ecw/boxSea";
 import { getSupplier } from "@/api/ecw/supplier";
 import { formatNumberString, constantDict, serviceMsg } from "../utils";
+import FileSaver from 'file-saver'
 
 /**
  * 提单补料
@@ -132,7 +134,6 @@ export default {
       ...oldData,
       packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
     };
-    console.log(this.shipmentObj)
     this.$set(this.subMaterialObj,'agentId',this.shipmentObj.agentInfo?.agentId||undefined)
     this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
     this.$set(this.subMaterialObj,'markNo',"N/M")
@@ -166,6 +167,7 @@ export default {
             operateType,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
+              this.download()
               this.cancel("submit");
             });
           });
@@ -176,6 +178,12 @@ export default {
     cancel(type) {
       this.$emit("closeDialog", type);
     },
+    download() {
+      getBoxLadingBillPdf({shipmentId: this.shipmentObj.id}).then(res=>{
+        let blob = new Blob([res], {type: "application/pdf"})
+        FileSaver.saveAs(blob, this.$t('提单确认件')); 
+      })
+    }
   },
 };
 </script>

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -46,6 +46,7 @@ import unloadingWidget from "./nodePage/unloading/index.vue";
 import settlementWidget from "./nodePage/settlement.vue";
 import reviewWidget from "./nodePage/review.vue";
 import tallyWidget from "./nodePage/tally/index.vue";
+import {checkPermi} from '@/utils/permission'
 
 /**
  * 海运流程图
@@ -131,10 +132,10 @@ export default {
     },
     /** 节点点击 */
     nodeClick(currIndex, node) {
-      // if () {
-      //   this.$message.error(this.$t("没有此操作的权限"));
-      //   return;
-      // }
+      if (!checkPermi(['box:'+node.type+':show'])) {
+        this.$message.error(this.$t("没有此操作的权限"));
+        return;
+      }
       if (currIndex > this.currIndex) {
         this.$message.error(this.$t("请先完成上一步"));
         return;

src/views/ecw/box/shippingSea/seaStepDetail.vue

@@ -2,7 +2,7 @@
   <div class="app-seaStepDetail">
     <el-scrollbar :vertical="true" viewClass="shipping-step">
       <template v-for="(step, index) in flatSeaStep">
-        <div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName]" class="step-table">
+        <div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['box:'+step.type+':show'])" class="step-table">
           <div class="step-title">{{step.title}}</div>
           <div v-for="(data, index) in columnsMapping[step.voName]" :key="index" class="step-content">
             <p>{{data.title}}</p>
@@ -17,6 +17,7 @@
 <script>
 import dayjs from "dayjs";
 import * as _C from "./utils";
+import {checkPermi} from '@/utils/permission'
 
 export default {
   name: "seaStepDetail",
@@ -32,6 +33,7 @@ export default {
     };
   },
   methods: {
+    checkPermi, // 检查权限
     getObjInfo(voName, data) {
       const { key, type } = data;
       let val = this.shipmentObj[voName]?.[key] ?? "";

src/views/ecw/coupon/edit.vue

@@ -662,7 +662,7 @@ export default {
 					}
 				})
 
-				
+				this.$set(this.form, 'suitableProdType', this.isAllProduct ? 0 : 1)
 
 
                 let data = Object.assign({}, this.form, {discountDetailedVOs})
@@ -681,6 +681,7 @@ export default {
 				if(this.form.type != 1 && !this.isAllProduct && !this.form.prodIds){
 					return this.$message.error('请选择商品')
 				}
+				this.$set(this.form, 'suitableProdType', this.isAllProduct ? 0 : 1)
 
 				// 修改的提交
 				if (data.couponId != null) {

src/views/ecw/customer/index.vue

@@ -57,7 +57,7 @@
         </el-select>
       </el-form-item>
        <el-form-item  :label="$t('市场获客')" prop="department">
-        <dict-selector clearable  :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number"></dict-selector>
+        <dict-selector clearable  :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.resourceType" formatter="number"></dict-selector>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
@@ -575,7 +575,7 @@ export default {
         department: null,
         creditLevel:null,
         country:null,
-        marketType:null,
+        resourceType:null,
       },
       // 表单参数
       form: {},

src/views/ecw/financial/creatCollection.vue

@@ -375,7 +375,7 @@
             <template slot-scope="scope">
               <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
               <div v-else>
-                <div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
+                <div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?(itemAmount?itemAmount.currencyNameZh:''):(itemAmount?itemAmount.currencyNameEn:'')}}: {{ itemAmount.amount}}</div>
 <!--                <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
                 <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
                 <div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> -->
@@ -810,8 +810,9 @@ export default {
 
           this.form.receiptAccountList.forEach((item, index) => {
             this.rateChange(item, index)
-            // this.calculation()
+
           });
+          this.calculation()
         })
       })
     }
@@ -917,7 +918,7 @@ export default {
         // if (row.currencyId == 3 && val == 2) row.collectionRate = this.RMBtoNAN()
         // if (row.currencyId == 2 && val == 1) row.collectionRate = this.NANtoUS()
         // if (row.currencyId == 2 && val == 3) row.collectionRate = this.NANtoRMB()
-         row.collectionRate = NP.divide(this.currencyList.find(v => v.id === row.currencyId).huilv, this.currencyList.find(v => v.id === val).huilv).toFixed(6)
+         row.collectionRate = NP.times(this.currencyList.find(v => v.id === row.currencyId).huilv/100, this.currencyList.find(v => v.id === val).exchangeToFc/100).toFixed(6)
       }
 
       this.rateChange(row, index)
@@ -986,12 +987,13 @@ export default {
             dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.taxAmount || 0), 0)
             discountDollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.discountTotal || 0), 0)
             var t = copyList.find(v => v.currencyId == item.id)
+            console.log(discountDollar)
             this.form.receiptAccountList.push(
               {
                 discountTotal: discountDollar,
                 currencyId: item.id,
                 receivableAmount: dollar,
-                writeOffRate:  NP.divide(this.currencyList.find(v => v.id === item.id).huilv, this.currencyList.find(v => v.id === this.showCurrencyId).huilv).toFixed(6),
+                writeOffRate: item.id==this.showCurrencyId?1: NP.times(this.currencyList.find(v => v.id === item.id).huilv/100, this.currencyList.find(v => v.id === this.showCurrencyId).exchangeToFc/100).toFixed(6),
                 platformAccountId: t?.platformAccountId || '',
                 collectionCurrencyId:  item.id,
                 collectionRate: 1
@@ -1206,12 +1208,14 @@ export default {
         //     this.calculation()
         //   })
         // }else{
+          var discount = this.list[this.selectListIndex]
+          discount['discountTotal'] = this.discountForm.discountTotal
           setTimeout(()=>{
-            getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
-              this.$set(this.list, this.selectListIndex, {...res.data})
+            // getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
+              this.$set(this.list, this.selectListIndex, {...discount})
               this.cancelDiscount()
               this.calculation()
-            })
+            // })
           },1000)
 
 

src/views/ecw/financial/receiptDetail.vue

@@ -885,7 +885,7 @@ export default {
         // else if (this.showCurrencyId === 3 && val === 2) rate = this.NANtoRMB()
         // else if (this.showCurrencyId === 2 && val === 1) rate = this.UStoNAN()
         // else if (this.showCurrencyId === 2 && val === 3) rate = this.RMBtoNAN()
-        rate = NP.divide(this.currencyList.find(v => v.id === val).huilv, this.currencyList.find(v => v.id === this.showCurrencyId).huilv).toFixed(6)
+        rate = NP.times(this.currencyList.find(v => v.id === val).huilv/100, this.currencyList.find(v => v.id === this.showCurrencyId).exchangeToFc/100).toFixed(6)
       }
       this.$set(this.addForm, 'rate', rate)
     },

src/views/ecw/financial/receivable.vue

@@ -144,25 +144,25 @@
               clearable
             ></dict-selector>
           </el-form-item>
-          <el-form-item :label="$t('发货人')">
+<!--          <el-form-item :label="$t('发货人')">
             <customer-selector
               v-model="queryParams.consignorNameOrPhone"
               @change="consignor = $event"
               clearable
             />
-          </el-form-item>
-          <!--              <el-form-item label="发货人:" >
-                  <el-input style="max-width: 188px;" v-model="queryParams.orderNo" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery"/>
-              </el-form-item> -->
+          </el-form-item> -->
+            <el-form-item label="发货人:" >
+              <el-input style="max-width: 188px;" v-model="queryParams.consignorNameOrPhone" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery"/>
+            </el-form-item>
         </el-row>
         <el-row>
           <el-form-item :label="$t('收货人')">
-            <!-- <el-input style="max-width: 188px;" v-model="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery"/> -->
-            <customer-selector
+            <el-input style="max-width: 188px;" v-model="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery"/>
+<!--           <customer-selector
               v-model="queryParams.consigneeNameOrPhone"
               @change="consignor = $event"
               clearable
-            />
+            /> -->
           </el-form-item>
           <el-form-item :label="$t('创建时间')">
             <!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
@@ -328,7 +328,14 @@ export default {
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      console.log(this.queryParams)
+      let params = {};
+      for(let key in this.queryParams){
+        if(this.queryParams[key]&&this.queryParams[key]!= undefined){
+          params[key] = this.queryParams[key]
+        }
+      }
+
       this.addBeginAndEndTime(params, this.dateType, "createTime");
       // 执行查询
       getReceivableList(params).then((response) => {

src/views/ecw/financial/voucher.vue

@@ -307,8 +307,6 @@ export default {
       dateType: [],
       loading: "",
       params: {
-        page: 1,
-        rows: 20,
       },
       // 查询参数
       queryParams: {
@@ -355,7 +353,7 @@ export default {
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = { ...this.params };
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
       getReceiptList(params).then((response) => {
@@ -484,6 +482,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.params = {}
       if(this.dateFilter&&this.dateFilter.length>0){
         this.queryParams.beginCreateTime = this.dateFilter[0]
         this.queryParams.endCreateTime = this.dateFilter[1]
@@ -493,6 +492,11 @@ export default {
       }
 
       this.queryParams.pageNo = 1;
+      for(var key in this.queryParams){
+          if(this.queryParams[key]){
+            this.params[key] = this.queryParams[key]
+          }
+         }
       this.getList();
     },
     /** 新增按钮操作 */

src/views/ecw/order/cargoControl.vue

@@ -35,12 +35,12 @@
        <el-form-item :label="$t('提单号')" prop="tidanNo">
         <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('发货人')" prop="consignorId">
-        <el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('发货人')" prop="consignorKey">
+        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item :label="$t('收货人')" prop="consigneeId">
-        <el-input v-model="queryParams.consigneeId" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('收货人')" prop="consigneeKey">
+        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item :label="$t('报关方式')" prop="customsType">
@@ -246,15 +246,20 @@ export default {
       this.loading = true;
       // 执行查询
       getCargoControlOrderPage(this.combinedQueryParams).then(response => {
-        this.list = response.data.list;
-        this.total = response.data.total;
+        this.list = []
+        // 直接更细数据，可能因为elTable的部分渲染产生bug，比如权限控制异常
+        this.$nextTick( () => {
+          this.list = response.data.list;
+          this.total = response.data.total;
+        })
+        
         this.loading = false;
       });
     },
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */

src/views/ecw/order/cargoControlDetail.vue

@@ -42,7 +42,11 @@
                 <template slot-scope="scope">{{scope.$index + 1}}</template>
             </el-table-column>
             <el-table-column :label="$t('收货人')" prop="consigneeName" />
-            <el-table-column :label="$t('收货人电话')" prop="consigneePhone" />
+            <el-table-column :label="$t('收货人电话')" prop="consigneePhone">
+                <template slot-scope="{row}">
+                    +{{row.consigneeCountryCode}} {{row.consigneePhone}}
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('控货箱数')" prop="controlNum"></el-table-column>
             <el-table-column :label="$t('放货箱数')" prop="pickNum"></el-table-column>
             <el-table-column :label="$t('体积') + '(m³)'" prop="pickVolume"></el-table-column>
@@ -67,7 +71,7 @@
                     <el-button v-if="scope.row.status == 3" type="danger" size="mini" @click="fallbackIndex=scope.$index">{{$t('反复核')}}</el-button>
                     <el-button v-if="scope.row.status == 3" type="success" size="mini" @click="cargoControlPickId=scope.row.id">{{$t('调货')}}</el-button>
                     
-                    <el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.id)">{{$t('审核详情')}}</el-button>
+                    <el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.formId)">{{$t('审核详情')}}</el-button>
                     <el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="danger" size="mini" @click="cancelApproval(scope.row.id)">{{$t('取消审核')}}</el-button>
                 </template>
             </el-table-column>
@@ -181,8 +185,8 @@ export default {
             this.loadData()
         },
         // 查看审核详情
-        showApprovalDetail(id){
-            this.$router.push('/bpm/process-instance/detail?id=' + this.getApproval(id, 'formId'))
+        showApprovalDetail(formId){
+            this.$router.push('/bpm/process-instance/detail?id=' + formId)
         },
         // 取消审核
         cancelApproval(id){

src/views/ecw/order/components/PrintWarehouseReceipt.vue

@@ -6,7 +6,7 @@
                 <p style="padding-bottom:10px;font-size:16px;">
                     {{$t('订单号')}}：{{detail.orderNo}}
                     &nbsp;&nbsp;&nbsp;{{$t('发货人电话')}}：{{detail.consignorVO.countryCode}} {{detail.consignorVO.phone}}
-                    &nbsp;&nbsp;&nbsp;{{$t('提货地点')}}：{{objective.titleZh}}
+                    &nbsp;&nbsp;&nbsp;{{$t('提货地点')}}：{{$l(objective, 'title')}}
                     <img :src="qrcode" style="margin-left: 10px;width:17mm;vertical-align:middle" />
                 </p>
                 <div id="table1" width="205mm">
@@ -100,10 +100,14 @@ export default {
             return t
         },
         objective(){
-            if(this.detail && this.detail.orderObjectiveVO && this.detail.orderObjectiveVO.objective){
+            return {
+                titleZh: this.detail.logisticsInfoDto.destTitleZh,
+                titleEn: this.detail.logisticsInfoDto.destTitleEn
+            }
+            /* if(this.detail && this.detail.orderObjectiveVO && this.detail.orderObjectiveVO.objective){
                 return JSON.parse(this.detail.orderObjectiveVO.objective)
             }
-            return {}
+            return {} */
         },
         items(){
             let arr = []

src/views/ecw/order/index.vue

@@ -17,7 +17,7 @@
         <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="">
-        <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
+        <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
         <el-date-picker v-model="dateFilter" type="datetimerange"  range-separator="-"
           :start-placeholder="$t('开始日期')"
           :end-placeholder="$t('结束日期')"

src/views/ecw/order/special/index.vue

@@ -31,7 +31,11 @@
           :label="$t('入库货物属性')">
           <template v-slot="{row}">
             <template v-if="row.warehouseInInfoVO">
-              {{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /><br>
+              {{$t('品牌')}}：
+              <!-- 23-03-27 根据需求方要求，按照详情页一样的规则显示 -->
+              <template v-if="row.brandName">{{row.brandName}}</template>
+              <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+              <!-- <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /> --><br>
               {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
               {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
               {{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg

src/views/ecw/order/warehousing/components/Warehouse.vue

+<template>
+  <div style="display: inline-block;margin-right: 10px">
+    <el-button size="mini" @click="visible = true" type="text">{{ title }}</el-button>
+    <el-dialog
+      :title="title + ' - ' + warehousing.orderNo"
+      :visible.sync="visible"
+      width="1280px"
+    >
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane :label="edit ? $t('货物修改') : $t('货物入仓')" name="first">
+          <el-form ref="form" :model="form" :rules="formRules" label-width="80px">
+            <el-descriptions border :column="2">
+              <el-descriptions-item>
+                <template slot="label"><span style="color: red">*</span>{{ $t('中文品名') }}</template>
+                <product-selector v-if="!order.parentOrderId" v-model="form.prodId" @change="onProductChange"/>
+                <span v-else>{{ warehousing.prodTitleZh }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"><span style="color: red">*</span>{{ $t('英文品名') }}</template>
+                <product-selector v-if="!order.parentOrderId" lang="En" v-model="form.prodId" @change="onProductChange"/>
+                <span v-else>{{ warehousing.prodTitleEn }}</span>
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('品牌')">
+                <template slot="label"><span style="color: red">*</span>{{ $t('品牌') }}</template>
+                <el-form-item required label="" prop="brand" label-width="0">
+                  <el-select
+                    v-model="form.brand"
+                    :placeholder="$t('可修改')"
+                    filterable
+                    remote
+                    @change="handleBrandChange"
+                    :remote-method="getProductBrandPage"
+                    clearable>
+                    <el-option
+                      v-for="item in brandList"
+                      :key="item.id"
+                      :label="item.titleZh"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('是否备案')">
+                <template slot="label"><span style="color: red">*</span>{{ $t('是否备案') }}</template>
+                {{ isBeian }}
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('收费模式')">
+                <template slot="label"><span style="color: red">*</span>{{ $t('收费模式') }}</template>
+                {{ feeType }}
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('填单参数')">{{ $t('箱数：') }}<el-input size="mini" v-if="edit" v-model="warehousing.num" style="display: inline-block;width: 100px"></el-input>
+                <span v-else>{{ warehousing.num }}</span><br>{{ $t('体积：') }}<el-input size="mini" v-if="edit" v-model="warehousing.volume" style="display: inline-block;width: 100px"></el-input>
+                <span v-else>{{ warehousing.volume }}</span>m³<br>{{ $t('重量：') }}<el-input size="mini" v-if="edit" v-model="warehousing.weight" style="display: inline-block;width: 100px"></el-input>
+                <span v-else>{{ warehousing.weight }}</span>Kg
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-form-item :label="$t('材质')" style="margin-top: 20px">
+              <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material" clearable></dict-selector>
+            </el-form-item>
+            <el-form-item :label="$t('入仓时间')" v-if="!edit">
+              <el-date-picker v-model="form.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+          </el-form>
+
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>{{ $t('入仓记录') }}</span>
+              <el-button style="float: right;margin-left: 15px" size="mini" type="primary" icon="el-icon-minus" circle @click="handleDelete"></el-button>
+              <el-button style="float: right" size="mini" type="primary" icon="el-icon-plus" circle @click="handleAdd()"></el-button>
+            </div>
+            <el-form ref="tableForm" :rules="tableFormRules" :model="form" size="mini">
+              <el-table
+                :data="form.table"
+                style="width: 100%">
+                <el-table-column :label="$t('箱数')" width="150px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span>{{ $t('箱数') }}</template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.cartonsNum">
+                      <el-input v-model="form.table[$index].cartonsNum" placeholder="" @blur="handleVolume($index)">
+                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE, form.table[$index].specificationType) }}</span>
+                      </el-input>
+                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form.table[$index].specificationType" @change="handleVolume($index)"></dict-selector>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('包装类型')" width="100px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span>{{ $t('包装类型') }}</template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <dict-selector :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form.table[$index].unit"></dict-selector>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="长(cm)">
+                  <template v-slot:header>
+                    <span>{{ $t('长') }}</span>(cm)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.boxGauge1">
+                      <el-input type="number" v-model="form.table[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="宽(cm)">
+                  <template v-slot:header>
+                    <span>{{ $t('宽') }}</span>(cm)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.boxGauge2">
+                      <el-input type="number" v-model="form.table[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="高(cm)">
+                  <template v-slot:header>
+                    <span>{{ $t('高') }}</span>(cm)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.boxGauge3">
+                      <el-input type="number" v-model="form.table[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="体积(m³)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.volume">
+                      <el-input v-model="form.table[$index].volume" placeholder="" type="number"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="重量(Kg)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.weight">
+                      <el-input v-model="form.table[$index].weight" placeholder="" type="number"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('数量')" width="130px">
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item :rules="tableFormRules.quantityAll">
+                      <el-input v-model.number="form.table[$index].quantityAll" placeholder="">
+                        <template slot="append">{{ $t('个') }}</template>
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('快递单号')">
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <el-input v-model="form.table[$index].expressNo" placeholder=""></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('储位')" prop="orderLocationBackVOList"  width="150px">
+                  <template v-slot="{ row, column, $index }">
+                    <warehouse-area-select
+                      v-if="visible"
+                      v-model="form.table[$index].orderLocationBackVOList"
+                      :order-id="orderId"
+                      :order-item-id="warehousing.orderItemId"
+                      :warehouse-in-id="form.table[$index].id"
+                      :warehouse-id="warehouseId"
+                      :is-editing="edit"></warehouse-area-select>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+            </el-form>
+          </el-card>
+        </el-tab-pane>
+
+
+        <el-tab-pane :label="$t('添加新品名')" name="second" v-if="!edit">
+          <el-form ref="form1" :model="form1" :rules="formRules" label-width="80px">
+            <el-descriptions border :column="2">
+              <el-descriptions-item>
+                <template slot="label"><span style="color: red">*</span>{{ $t('中文品名') }}</template>
+                <el-form-item required label="" prop="prodId" label-width="0">
+                  <product-selector v-model="form1.prodId" @change="onProductChange1"/>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"><span style="color: red">*</span>{{ $t('英文品名') }}</template>
+                <el-form-item required label="" prop="prodId" label-width="0">
+                  <product-selector lang="En" v-model="form1.prodId" @change="onProductChange1"/>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('品牌')">
+                <template slot="label"><span style="color: red">*</span>{{ $t('品牌') }}</template>
+                <el-form-item required label="" prop="brand" label-width="0">
+                  <el-select
+                    v-model="form1.brand"
+                    :placeholder="$t('可修改')"
+                    filterable
+                    remote
+                    @change="handleBrandChange"
+                    :remote-method="getProductBrandPage"
+                    clearable>
+                    <el-option
+                      v-for="item in brandList"
+                      :key="item.id"
+                      :label="item.titleZh"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('是否备案')">
+                <template slot="label"><span style="color: red">*</span>{{ $t('是否备案') }}</template>
+                {{ isBeian1 }}
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('收费模式')">
+                <template slot="label"><span style="color: red">*</span>{{ $t('收费模式') }}</template>
+                {{ feeType1 }}
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('填单参数')">{{ $t('非填单货物') }}</el-descriptions-item>
+            </el-descriptions>
+            <el-form-item :label="$t('材质')" style="margin-top: 20px">
+              <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form1.material"></dict-selector>
+            </el-form-item>
+            <el-form-item :label="$t('入仓时间')">
+              <el-date-picker v-model="form1.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+          </el-form>
+
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>{{ $t('入仓记录') }}</span>
+              <el-button style="float: right;margin-left: 15px" size="mini" type="primary" icon="el-icon-minus" circle @click="handleDelete(1)"></el-button>
+              <el-button style="float: right" size="mini" type="primary" icon="el-icon-plus" circle @click="handleAdd(1)"></el-button>
+            </div>
+            <el-form ref="tableForm1" :model="form1" :rules="tableFormRules" size="mini">
+              <el-table
+                :data="form1.table"
+                style="width: 100%">
+                <el-table-column :label="$t('箱数')" width="150px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span>{{ $t('箱数') }}</template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">
+                        {{ form1.table[$index].cartonsNum }}
+                        {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, form1.table[$index].unit) }}
+                      </span>
+                      <el-input v-else v-model="form1.table[$index].cartonsNum" placeholder="">
+                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, form1.table[$index].unit) }}</span>
+                      </el-input>
+                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form1.table[$index].specificationType" @change="handleVolume($index)"></dict-selector>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('包装类型')" width="100px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span>{{ $t('包装类型') }}</template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, form1.table[$index].unit) }}</span>
+                      <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form1.table[$index].unit"></dict-selector>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="长(cm)">
+                  <template v-slot:header>
+                    <span>{{ $t('长') }}</span>(cm)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].boxGauge ? form1.table[$index].boxGauge.split('*')[0] : '' }}</span>
+                      <el-input v-else type="number" v-model="form1.table[$index].boxGauge1" placeholder="" @blur="handleVolume($index, 1)"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="宽(cm)">
+                  <template v-slot:header>
+                    <span>{{ $t('宽') }}</span>(cm)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].boxGauge ? form1.table[$index].boxGauge.split('*')[1] : '' }}</span>
+                      <el-input v-else type="number" v-model="form1.table[$index].boxGauge2" placeholder="" @blur="handleVolume($index, 1)"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="高(cm)">
+                  <template v-slot:header>
+                    <span>{{ $t('高') }}</span>(cm)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].boxGauge ? form1.table[$index].boxGauge.split('*')[2] : '' }}</span>
+                      <el-input v-else type="number" v-model="form1.table[$index].boxGauge3" placeholder="" @blur="handleVolume($index, 1)"></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="体积(m³)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].volume }}</span>
+                      <el-input v-else type="number" v-model="form1.table[$index].volume" placeholder=""></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column label="重量(Kg)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
+                  </template>
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].weight }}</span>
+                      <el-input v-else type="number" v-model="form1.table[$index].weight" placeholder=""></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('数量')" width="130px">
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].quantityAll }}</span>
+                      <el-input v-else v-model.number="form1.table[$index].quantityAll" placeholder="">
+                        <template slot="append">{{ $t('个') }}</template>
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('快递单号')">
+                  <template v-slot="{r,c,$index}">
+                    <el-form-item>
+                      <span v-if="form1.table[$index].id">{{ form1.table[$index].expressNo }}</span>
+                      <el-input v-else v-model="form1.table[$index].expressNo" placeholder=""></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('储位')" prop="orderLocationBackVOList"  width="150px">
+                  <template v-slot="{ row, column, $index }">
+                    <warehouse-area-select
+                      v-model="form1.table[$index].orderLocationBackVOList"
+                      :readonly="form1.table[$index].id && !edit"
+                      :order-id="orderId"
+                      :order-item-id="warehousing.orderItemId"
+                      :warehouse-in-id="form1.table[$index].id"
+                      :warehouse-id="warehouseId"
+                      :is-editing="edit"></warehouse-area-select>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form>
+          </el-card>
+
+        </el-tab-pane>
+      </el-tabs>
+
+
+      <div v-if="edit">
+        <h2>{{ $t('审批流程') }}</h2>
+        <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
+        <!--        <div>选择的用户：{{selectedUsers}}</div>-->
+      </div>
+
+      <span slot="footer">
+        <template v-if="!isEditing">
+          <el-button @click="handleClose">{{ $t('关 闭') }}</el-button>
+          <el-button type="primary" @click="handleSubmit()">{{ edit ? $t('确认修改') : $t('提 交') }}</el-button>
+        </template>
+        <template v-else>
+          <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + formId)">{{ $t('审核中') }}</el-button>
+          <el-button type="primary" @click="handleCancelProcessInstance">{{ $t('取消审核') }}</el-button>
+          <el-button @click="handleClose">{{ $t('返回') }}</el-button>
+        </template>
+        <template v-else>
+
+        </template>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ProductSelector from "@/components/ProductSelector"
+import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
+import {getFeeTypeByOrderProduct, getProductBrankPage} from "@/api/ecw/productBrank"
+import {cancelProcessInstance} from "@/api/bpm/processInstance"
+import WorkFlow from "@/components/WorkFlow"
+import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"
+import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
+
+export default {
+  name: "Warehouse",
+
+  components: {
+    ProductSelector,
+    WarehouseAreaSelect,
+    WorkFlow
+  },
+
+  props: {
+    title: {
+      type: String,
+      default: undefined
+    },
+    order: {
+      type: Object,
+      default: undefined
+    },
+    isJiyun: {
+      type: Boolean,
+      default: false
+    },
+    // 入仓修改
+    edit: {
+      type: Boolean,
+      default: false
+    },
+    warehousing: {
+      type: Object,
+      default: () => {
+        return {
+          material: undefined,
+          inTime: undefined,
+          orderWarehouseInBackItemDoList: []
+        }
+      }
+    }
+  },
+
+  computed: {
+    orderId(){
+      return this.order.orderId
+    },
+    brandObject(){
+      return this.brandList.find(e => e.id === this.form.brand) || ''
+    },
+    brandObject1(){
+      return this.brandList.find(e => e.id === this.form1.brand) || ''
+    },
+    isBeian(){
+      if (this.form.recordMode !== undefined){
+        return [this.$t('无备案'), this.$t('有备案'), this.$t('中性')][this.form.recordMode]
+      }
+      if (this.brandObject.filing){
+        return [this.$t('无备案'), this.$t('有备案'), this.$t('中性')][this.brandObject.filing]
+      } else {
+        return ''
+      }
+    },
+    isBeian1(){
+      if (this.form1.recordMode !== undefined){
+        return [this.$t('无备案'), this.$t('有备案'), this.$t('中性')][this.form1.recordMode]
+      }
+      if (this.brandObject1.filing){
+        return [this.$t('无备案'), this.$t('有备案'), this.$t('中性')][this.brandObject1.filing]
+      } else {
+        return ''
+      }
+    },
+    /**
+     * 收费模式
+     * @returns {string} 无牌价0，有牌价1，中性品牌价2
+     */
+    feeType(){
+      const feeType = this.form.feeType
+      if (feeType >= 0 && feeType < 3) {
+        return [this.$t('无牌价'), this.$t('有牌价'), this.$t('中性品牌价')][feeType]
+      }
+      return ''
+    },
+    feeType1(){
+      const feeType = parseInt(this.form1.feeType)
+      if (feeType >= 0 && feeType < 3) {
+        return [this.$t('无牌价'), this.$t('有牌价'), this.$t('中性品牌价')][feeType]
+      }
+      return ''
+    },
+    warehouseId(){
+      return this.order?.logisticsInfoDto?.startWarehouseId
+    }
+  },
+
+  watch: {
+    visible(val){
+      if (val) {
+        this.getProductBrandPage(this.warehousing.brandName)
+        this.handleBrandChange(parseInt(this.form.brand))
+      }
+    }
+  },
+
+  data(){
+    return {
+      DICT_TYPE,
+      getDictDataLabel,
+      getDictDatas,
+      activeName: 'first',
+      visible: false,
+      form: {
+        table: [],
+        brandType: undefined,
+        orderId: undefined,
+        orderNo: undefined,
+        brand: undefined,
+        inTime: undefined,
+        material: undefined,
+        orderItemId: undefined,
+        prodAttrIds: undefined,
+        prodId: undefined,
+        prodTitleEn: undefined,
+        prodTitleZh: undefined,
+        prodType: undefined,
+        type: undefined,
+        feeType: undefined
+      },
+      form1: {
+        table: [],
+        brandType: undefined,
+        orderId: undefined,
+        orderNo: undefined,
+        brand: undefined,
+        inTime: undefined,
+        material: undefined,
+        orderItemId: undefined,
+        prodAttrIds: undefined,
+        prodId: undefined,
+        prodTitleEn: undefined,
+        prodTitleZh: undefined,
+        prodType: undefined,
+        type: undefined,
+        feeType: undefined
+      },
+      brandList: [],
+      formRules: {
+        prodId: [{required: true, message: this.$t("请选择品名"), trigger: "change"}],
+        brand: [{required: true, message: this.$t("请选择品牌"), trigger: "change"}],
+      },
+      tableFormRules: {
+        // cartonsNum: [{required: true, message: this.$t("箱数不能为空"), trigger: "change"}],
+        // boxGauge1: [{required: true, message: this.$t("货物长不能为空"), trigger: "change"}],
+        // boxGauge2: [{required: true, message: this.$t("货物宽不能为空"), trigger: "change"}],
+        // boxGauge3: [{required: true, message: this.$t("货物高不能为空"), trigger: "change"}],
+        // volume: [{required: true, message: this.$t("体积不能为空"), trigger: "change"}],
+        // weight: [{required: true, message: this.$t("重量不能为空"), trigger: "change"}],
+        // // quantityAll: [{required: true, message: this.$t("数量不能为空"), trigger: "change"}]
+      },
+
+
+      selectedUsers: undefined,
+
+      // 入仓修改正在审核中
+      isEditing: false,
+      // 审批业务id
+      formId: ''
+    }
+  },
+
+  mounted() {
+    this.form.table = this.warehousing.orderWarehouseInBackItemDoList
+    this.form.brandType = this.warehousing.brandType
+    this.form.orderId = this.warehousing.orderId
+    this.form.orderItemId = this.warehousing.orderNo
+    this.form.orderNo = this.warehousing.orderNo
+    this.form.brand = this.warehousing.brand
+    this.form.brandType = this.warehousing.brandType
+    this.form.inTime = this.warehousing.inTime
+    this.form.material = this.warehousing.material
+    this.form.orderId = this.warehousing.orderId
+    this.form.orderItemId = this.warehousing.orderItemId
+    this.form.orderNo = this.warehousing.orderNo
+    this.form.prodAttrIds = this.warehousing.prodAttrIds
+    this.form.prodId = this.warehousing.prodId
+    this.form.prodTitleEn = this.warehousing.prodTitleEn
+    this.form.prodTitleZh = this.warehousing.prodTitleZh
+    this.form.prodType = this.warehousing.prodType
+    this.form.type = this.warehousing.type
+    this.form.feeType = this.warehousing.feeType
+
+    this.form.table.forEach(e => {
+      if (e.boxGauge) {
+        const boxGauge = e.boxGauge.split('*')
+        e.boxGauge1 = boxGauge[0]
+        e.boxGauge2 = boxGauge[1]
+        e.boxGauge3 = boxGauge[2]
+      }
+    })
+  },
+
+  methods: {
+    handleClose() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleVolume(index, val){
+      setTimeout(() => {
+        const {boxGauge1, boxGauge2, boxGauge3, specificationType, cartonsNum} = (val === 1 ? this.form1.table : this.form.table)[index]
+        let result = ''
+        if (boxGauge1 && boxGauge2 && boxGauge3 && specificationType && cartonsNum) {
+          result = (((specificationType === 1 || specificationType === '1') ? cartonsNum : 1) * (boxGauge1 * boxGauge2 * boxGauge3) / 1000000)?.toFixed(2) || ''
+        } else {
+          result = ''
+        }
+        if (result === '0.00') result = '0.01';
+        (val === 1 ? this.form1.table : this.form.table)[index].volume = result
+      }, 0)
+    },
+    handleSubmit() {
+      if (this.activeName !== "first"){
+        // 添加非填单货物
+        this.$refs['form1'].validate(valid => {
+          this.$refs['tableForm1'].validate(valid1 => {
+            if (!valid || !valid1) {
+              return
+            }
+            return orderWarehouseIn({
+              ...this.form1,
+              brandType: this.warehousing.brandType,
+              orderId: this.warehousing.orderId,
+              orderItemId: undefined,
+              orderNo: this.warehousing.orderNo,
+              orderWarehouseInItemDoList: this.form1.table.map(e => {
+                return {
+                  ...e,
+                  boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
+                  orderLocationCreateReqVOList: e.table
+                }
+              })
+            }).then(r => {
+              if (r.data) {
+                this.$message.success('新增入仓成功')
+                this.handleClose()
+              } else {
+                this.$message.success('新增入仓失败')
+              }
+            })
+          })
+        })
+      } else {
+        this.$refs['form'].validate(valid => {
+          this.$refs['tableForm'].validate(valid1 => {
+            if (!valid || !valid1) {
+              return
+            }
+            if (this.edit) {
+              // 入仓修改
+              return orderWarehouseInUpdateApply({
+                ...this.form,
+                brandType: this.warehousing.brandType,
+                orderId: this.warehousing.orderId,
+                orderItemId: this.warehousing.orderItemId,
+                orderNo: this.warehousing.orderNo,
+                num: this.warehousing.num,
+                volume: (+this.warehousing.volume)?.toFixed(2) || '',
+                weight: (+this.warehousing.weight)?.toFixed(2) || '',
+                prodId: this.form.prodId,
+                "orderWarehouseInUpdateItemDoList": this.form.table.map(e => {
+                  return {
+                    ...e,
+                    boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
+                    orderLocationCreateReqVOList: e.table
+                  }
+                }),
+                copyUserId: this.selectedUsers
+              }).then(r => {
+                if (r.data) {
+                  this.$message.success('入仓修改发起成功')
+                  this.handleClose()
+                } else {
+                  this.$message.success('入仓修改发起失败')
+                }
+              })
+            } else {
+              // 首次入仓、入仓补充
+              return orderWarehouseIn({
+                ...this.form,
+                brandType: this.warehousing.brandType,
+                orderId: this.warehousing.orderId,
+                orderItemId: this.warehousing.orderItemId,
+                orderNo: this.warehousing.orderNo,
+                orderWarehouseInItemDoList: this.form.table.map(e => {
+                  return {
+                    ...e,
+                    boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
+                    orderLocationCreateReqVOList: e.table
+                  }
+                }),
+              }).then(r => {
+                if (r.data) {
+                  this.$message.success('入仓成功')
+                  this.handleClose()
+                } else {
+                  this.$message.success('入仓失败')
+                }
+              })
+            }
+          })
+        })
+      }
+    },
+    handleCancelProcessInstance(){
+      this.$prompt('请输入取消原因？', this.$t("取消流程"), {
+        type: 'warning',
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: this.$t("取消原因不能为空"),
+      }).then(({ value }) => {
+        cancelProcessInstance(this.formId, value).then(() => {
+          this.opened = false
+          this.$modal.msgSuccess("取消成功");
+        })
+      })
+    },
+    onProductChange(product){
+      this.form.prodTitleZh = product.titleZh
+      this.form.prodTitleEn = product.titleEn
+      this.handleBrandChange(parseInt(this.form.brand))
+    },
+    onProductChange1(product){
+      this.form1.prodTitleZh = product.titleZh
+      this.form1.prodTitleEn = product.titleEn
+      this.handleBrandChange(parseInt(this.form1.brand))
+    },
+    getProductBrandPage(titleZh = undefined) {
+      getProductBrankPage({pageSize: 20, titleZh}).then(r => {
+        this.brandList = r.data.list.map(e => {
+          // if(e.id){
+          //   e.id = e.id.toString()
+          // }
+          return e
+        })
+      })
+    },
+    handleBrandChange(v){
+      getFeeTypeByOrderProduct({
+        brandId: parseInt(v),
+        productId: this.warehousing.prodId,
+        orderId: this.orderId
+      }).then(r => {
+        if(r.code === 0){
+          (this.activeName === "first" ? this.form : this.form1).feeType = parseInt(r.data.feeType);
+          (this.activeName === "first" ? this.form : this.form1).recordMode = parseInt(r.data.recordMode)
+        }
+      })
+    },
+    handleDelete(val) {
+      (val === 1 ? this.form1 : this.form).table.pop()
+    },
+    handleAdd(val = 0) {
+      let cartonsNum = ''
+      if (val !== 1) { // 货物入仓
+        let hasCartonsNum = 0
+        this.form.table.forEach(e => {
+          hasCartonsNum += e.cartonsNum
+        })
+        cartonsNum = this.warehousing.num - hasCartonsNum
+
+      }
+
+      const form = val === 1 ? this.form1 : this.form
+      form.table.push({
+        "boxGauge1": this.isJiyun ? 0 : '',
+        "boxGauge2": this.isJiyun ? 0 : '',
+        "boxGauge3": this.isJiyun ? 0 : '',
+        "cartonsNum": cartonsNum > 0 ? cartonsNum : '',
+        "expressNo": "",
+        "quantityAll": undefined,
+        "unit": "1",
+        "volume": '',
+        "weight": '',
+        specificationType: '1',
+        table: []
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/order/warehousing/index.vue

@@ -81,14 +81,17 @@
         prop="address"
         :label="$t('操作')">
         <template v-slot="{ row, column, $index }">
-          <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing(row)">{{$t('修改')}}</el-button>
+          <warehouse v-if="isEdit" :warehousing="{...order.orderItemVOList[$index], ...orderItemList[$index]}" :title="$t('修改')" :order="order" @close="getList"></warehouse>
+<!--          <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing(row)">{{$t('修改')}}</el-button>-->
           <template v-else-if="wareItem(row.orderItemId) && wareItem(row.orderItemId).orderWarehouseInBackItemDoList && wareItem(row.orderItemId).orderWarehouseInBackItemDoList.length > 0">
 <!--            <template v-if="!order.parentOrderId">-->
-              <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>
+            <warehouse :warehousing="{...order.orderItemVOList[$index], ...orderItemList[$index]}" :title="$t('追加')" :order="order" @close="getList"></warehouse>
+<!--            <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>-->
               <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button>
 <!--            </template>-->
           </template>
-          <el-button v-else size="mini" type="text" @click="handleWarehousing(row)">{{$t('入仓')}}</el-button>
+          <warehouse v-else :warehousing="{...order.orderItemVOList[$index], ...orderItemList[$index]}" :title="$t('入仓')" :order="order" @close="getList"></warehouse>
+<!--          <el-button v-else size="mini" type="text" @click="handleWarehousing(row)">{{$t('入仓')}}</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -212,6 +215,7 @@ import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseRe
 import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
 import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
+import Warehouse from "@/views/ecw/order/warehousing/components/Warehouse"
 export default {
   name: "Warehousing",
 
@@ -223,12 +227,13 @@ export default {
     PrintWarehouseReceipt,
     imageUpload,
     ImageAndVideoUpload,
+    Warehouse
   },
 
   mounted() {
     if(this.$route.query.id){
       this.orderId = parseInt(this.$route.query.id || undefined)
-      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
+      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
       getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
 
       Promise.all([
@@ -286,6 +291,10 @@ export default {
   },
 
   methods: {
+    getList(){
+      this.getOrder()
+      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
+    },
     getWarehousePictureList(){
       return warehousePictureList({
         bizId: this.order.orderId,
@@ -439,7 +448,7 @@ export default {
             message: this.$t('货物退仓成功!')
           });
 
-          getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
+          getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
           this.getOrder()
         })
 
@@ -452,7 +461,7 @@ export default {
     warehousingVisible(val) {
       if (!val){
         this.getOrder()
-        getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
+        getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
       }
     },
     orderSpecialNeeds(val){

src/views/ecw/productPrice/edit.vue

@@ -700,7 +700,8 @@ export default {
       this.$set(this.form, 'clearancePriceUnit', priceUnit)
       this.$set(this.form, 'allPriceUnit', priceUnit)
     },
-    submitForm() {
+    // force 为是否强制提交，在价格过期的时候需要确认后强制提交
+    submitForm(force = false) {
       this.$refs["form"].validate(valid => {
         if (!valid) {
           return;
@@ -747,6 +748,20 @@ export default {
           }
         }
 
+        // 设置了有效期，且已过期则给提示
+        if(this.form.validateEndDate && force !== true){
+          let validateEndDate = new Date(this.form.validateEndDate)
+          if(validateEndDate.getTime() < Date.now()){
+            return this.$confirm('您设置的线路价格已过期，确定提交吗?', '提示', {
+              confirmButtonText: '确认提交',
+              cancelButtonText: '取消提交',
+              type: 'warning'
+            }).then(res => {
+              this.submitForm(true)
+            })
+          }
+        }
+
         // 修改单条路线
         if (this.$route.query.action == 'update') {
           this.loading = true

src/views/infra/file/index.vue

@@ -55,7 +55,7 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".jpg, .png, .gif" :auto-upload="false" drag
+      <el-upload ref="upload" :limit="1" accept=".jpg, .png, .gif,.apk" :auto-upload="false" drag
                  :headers="upload.headers" :action="upload.url" :data="upload.data" :disabled="upload.isUploading"
                  :on-change="handleFileChange"
                  :on-progress="handleFileUploadProgress"