Merge remote-tracking branch 'origin/release2.2' into release2.2

src/api/ecw/box.js

@@ -343,3 +343,10 @@ export function updateUrl(data) {
     data,
   });
 }
+
+export function dealCustomsSplitNotify(notifyId){
+  return request({
+    url: `/shipment/box/dealCustomsSplitNotify?notifyId=${notifyId}`,
+    method: "get",
+  })
+}

src/views/ecw/box/indexSea.vue

@@ -210,7 +210,7 @@ import {
   getbox,
   getboxPage,
   exportboxExcel,
-  getNoticeList,
+  getNoticeList, dealCustomsSplitNotify,
 } from "@/api/ecw/box";
 import {
   downloadFile,
@@ -443,7 +443,7 @@ export default {
       }
     },
     /** 查看按钮操作 */
-    handleCommand(row, command) {
+    async handleCommand(row, command) {
       this.$set(this.dialogCfg, "fullscreen", false);
 
       switch (command) {
@@ -530,6 +530,9 @@ export default {
           if ([5, 6, 7].includes(noticeType)) {
             this.$router.push("/boxSea/query/" + row.id);
           }
+          if([9].includes(noticeType)){
+            await dealCustomsSplitNotify(row.notifyId)
+          }
           this.closeDialog();
           break;
       }

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -828,8 +828,8 @@ export default {
             remarks: this.shopForm.remarks,
             volume: this.putin.volume,
             weight: this.putin.weight,
-            chargeWeight: this.putin.chargeWeight,
-            chargeVolume: this.putin.chargeVolume,
+            chargeWeight: this.shopForm.chargeWeight,
+            chargeVolume: this.shopForm.chargeVolume,
             worth: this.shopForm.worth || 0,
             specsRecordVOList:this.shopForm.specsRecordVOList,
             shipmentSplit: true
@@ -962,8 +962,17 @@ export default {
       // 根据比例计算默认的收费方数和收费重量
       const orderItem = this.orderData.orderItemVOList.find(item => item.orderItemId == this.shopForm.orderItemId)
       const rate = this.putin.num / orderItem.warehouseInInfoVO.cartonsNum
-      this.$set(this.shopForm, 'chargeVolume', (orderItem.chargeVolume*rate).toFixed(2))
-      this.$set(this.shopForm, 'chargeWeight', (orderItem.chargeWeight*rate).toFixed(2))
+
+      /*
+      * 1 普货 2 重货 3 泡货
+      * 普货 收费数据=入仓数据
+      * 泡货 收费方数=入仓方数 收费重量 = 品名收费重量*比例
+      * 重货 收费方数=品名收费方数*比例 收费重量 = 入仓重量
+      * */
+      const chargeVolume = orderItem.itemType === 2 ? (orderItem.chargeVolume*rate).toFixed(2) : this.putin.volume
+      const chargeWeight = orderItem.itemType === 3 ? (orderItem.chargeWeight*rate).toFixed(2) : this.putin.weight
+      this.$set(this.shopForm, 'chargeVolume', chargeVolume)
+      this.$set(this.shopForm, 'chargeWeight', chargeWeight)
       this.$set(this.shopForm, 'worth', (orderItem.worth*rate).toFixed(2))
     }
   },

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -360,16 +360,22 @@ export default {
               this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
                 type: "warning",
+                confirmButtonText: '预装关联单',
+                cancelButtonText: '仅当前订单'
               })
                 .then((_) => {
-                  createGoods({ ...params, relationStatus: 2 }).then((res) => {
+                  createGoods({ ...params, relationStatus: 2, singleLoad: false }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
                   });
                 })
                 .catch((_) => {
-                  this.queryAllData();
+                  createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    });
+                  });
                 });
             }
           });

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

@@ -264,6 +264,7 @@ export default {
   },
   methods: {
     getCustomsOrderList(dcCustomsType) {
+      if(dcCustomsType) dcCustomsType = ''
       customsOrderList({
         shipmentId: this.shipmentObj.id,
         customsTypes: dcCustomsType === "3" ? "2,3" : dcCustomsType,

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

@@ -699,7 +699,7 @@ export default {
                 type: "warning",
               })
                 .then((_) => {
-                  createGoods({ ...params, relationStatus: 1 }).then((res) => {
+                  createGoods({ ...params, relationStatus: 1, singleLoad: true }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
@@ -714,16 +714,22 @@ export default {
               this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
                 type: "warning",
+                confirmButtonText: '预装关联单',
+                cancelButtonText: '仅当前订单'
               })
                 .then((_) => {
-                  createGoods({ ...params, relationStatus: 2 }).then((res) => {
+                  createGoods({ ...params, relationStatus: 2, singleLoad: false }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
                   });
                 })
                 .catch((_) => {
-                  this.queryAllData();
+                  createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    });
+                  });
                 });
             }
           });

src/views/ecw/financial/creatCollection.vue

@@ -102,7 +102,7 @@
         </el-col>
         <el-table v-loading="loadings" :data="list" border :key="isUpdate">
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-           <el-table-column :label="$t('自编号')" align="center" prop="selfNo" />
+           <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
           <el-table-column :label="$t('唛头')" align="center" prop="marks" />
           <el-table-column :label="$t('品名')" align="center" prop="title">
             <template slot-scope="scope">
@@ -532,9 +532,9 @@
             />
           </el-form-item>
 
-          <el-form-item :label="$t('自编号')" prop="selfNo">
+          <el-form-item :label="$t('自编号')" prop="containerNumber">
             <el-input
-              v-model="queryParams.selfNo"
+              v-model="queryParams.containerNumber"
               :placeholder="$t('请输入自编号')"
               clearable
               @keyup.enter.native="handleQuery"
@@ -558,7 +558,7 @@
         >
           <el-table-column type="selection" width="55" :reserve-selection="true"> </el-table-column>
           <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-          <el-table-column :label="$t('自编号')" align="center" prop="selfNo" />
+          <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
           <el-table-column :label="$t('唛头')" align="center" prop="marks" />
           <el-table-column :label="$t('品名')" align="center" prop="title">
             <template slot-scope="scope">
@@ -972,7 +972,9 @@ export default {
             collectionAmount: []
           }]
         }
-        this.$set(this.form, 'receiptAccountList', [...res.data])
+        console.log(res.data)
+        this.$set(this.form, 'receiptAccountList', res.data)
+
         this.$nextTick(() => {
           // const dollarList = this.list.filter(v => v.currencyId === 1)
           // const discountDollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.discountTotal || 0), 0)
@@ -989,11 +991,14 @@ export default {
           // const n = this.form.receiptAccountList.find(v => v.currencyId == 3)
           // n && (n.discountTotal = discountNaira)
 
-          this.form.receiptAccountList.forEach((item, index) => {
-            this.rateChange(item, index)
+          // this.form.receiptAccountList.forEach((item, index) => {
+          //   this.rateChange(item, index)
 
-          });
-          this.calculation()
+          // });
+          if(this.form.receiptAccountList.length>0){
+            this.editReceiptAccountList()
+          }
+          // this.calculation()
         })
       })
     },
@@ -1052,34 +1057,26 @@ export default {
       this.form.receiptAccountList[this.form.receiptAccountList.length -1].writeOffAmount = writeOffAmountTotal
     },
     rateChange(row, index) {
-      console.log(row)
       row.receivableAmount && (row.collectionAmount = Math.round(NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0))))
       this.form.receiptAccountList[index] = {...row}
 
       setTimeout(() => {
         // 收款总计
-        var amountList =[]
-        this.currencyList.forEach((item,index)=>{
-          var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
-          if(dollarList.length>0){
-            var dollar = Math.round(dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0))
-            amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
-          }
-        })
-        // const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
-        // const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
-
-        // const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
-        // const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
-
-        // const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
-        // const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
-        // const faList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 6)
-        // const fa = faList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
-        this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = amountList
-        this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
+        this.editReceiptAccountList()
       }, 100)
     },
+    editReceiptAccountList(){
+      var amountList =[]
+      this.currencyList.forEach((item,index)=>{
+        var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
+        if(dollarList.length>0){
+          var dollar = Math.round(dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0))
+          amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
+        }
+      })
+      this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = amountList
+      this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
+    },
     //明细改变税率
     changeTaxRate(row,index){
       var pointArr = []

src/views/ecw/financial/receiptDetail.vue

@@ -18,7 +18,7 @@
       <div slot="header" class="card-title">{{ $t('应收明细') }}</div>
       <el-table :data="list" border>
         <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-        <el-table-column :label="$t('自编号')" align="center" prop="selfNo" />
+        <el-table-column :label="$t('自编号')" align="center" prop="containerNumber" />
         <el-table-column :label="$t('唛头')" align="center" prop="marks" />
         <el-table-column :label="$t('品名')" align="center" prop="title">
           <template slot-scope="scope">

src/views/ecw/order/splitApply/components/PutIn.vue

@@ -94,7 +94,8 @@
           </template>
           <template v-slot="{row,$index}">
             <el-form-item  label-width="0">
-              <el-input-number controls-position="right" :min="0" class="w-100 tight"  v-model="row.boxGauge1" @blur="calcVolume(row)"/>
+              <input class="input" v-model="row.boxGauge1" type="number" @keyup="calcVolume(row)" @change="calcVolume(row)" :min="0"></input>
+              <!--<el-input-number controls-position="right" :min="0" class="w-100 tight"  v-model="row.boxGauge1" @blur="calcVolume(row)"/>-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -104,7 +105,8 @@
           </template>
           <template v-slot="{row,$index}">
             <el-form-item  label-width="0">
-              <el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge2" @blur="calcVolume(row)" />
+              <input class="input" v-model="row.boxGauge2" type="number" @keyup="calcVolume(row)" @change="calcVolume(row)" :min="0"></input>
+              <!--<el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge2" @blur="calcVolume(row)" />-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -114,7 +116,8 @@
           </template>
           <template v-slot="{row,$index}">
             <el-form-item  label-width="0">
-              <el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge3" @blur="calcVolume(row)"/>
+              <input class="input" v-model="row.boxGauge3" type="number" @keyup="calcVolume(row)" @change="calcVolume(row)" :min="0"></input>
+              <!--<el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge3" @blur="calcVolume(row)"/>-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -338,12 +341,15 @@ export default {
     },
     // 计算体积
     calcVolume(row){
+      // 改了规格后按照规格计算体积
+      this.$set(row, 'calcVolumeByBoxGauge', 1)
+
       let volume = Decimal(row.boxGauge1 || 0)
         .times(Decimal(row.boxGauge2 || 0))
         .times(Decimal(row.boxGauge3 || 0)).div(1000000)
       // 如果是箱的单位要乘以箱数
-      if(row.specificationType === 1) {
-        row.volume = volume.times(Decimal(row.num || 0))
+      if(+row.specificationType === 1) {
+        volume = volume.times(Decimal(row.num || 0))
       }
 
       // 最低0.01
@@ -355,16 +361,22 @@ export default {
       if(!locationArr || !locationArr.length) return ''
       let arr = []
       locationArr.forEach(item => {
-        arr.push(`${item.areaName}${item.locationName || ''}`)
+        arr.push(`${item.areaName || ''}${item.locationName || ''}`)
       })
       return Array.from(new Set(arr)).join(",")
     },
     // 根据箱数计算体积，重量,数量
     calc(row){
       const rate = row.num / this.warehouseRecord.cartonsNum
+
       row.volume = (this.warehouseRecord.volume * rate).toFixed(2)
       row.weight = (this.warehouseRecord.weight * rate).toFixed(2)
       row.quantity = (this.warehouseRecord.quantityAll * rate).toFixed(0)
+
+      // 如果是按照规格计算体积，则重新计算
+      if(row.calcVolumeByBoxGauge){
+        this.calcVolume(row)
+      }
     },
     closeDialog(){
       this.show = false

src/views/ecw/order/splitApply/components/WarehouseRecord.vue

@@ -33,9 +33,9 @@
       <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
       <el-table-column :label="$t('数量（个）')" prop="quantity" />
       <el-table-column :label="$t('入仓快递单号')" prop="expressNo" />
-      <!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" >
+      <el-table-column :label="$t('首次入仓时间')" prop="inTime" >
         <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
-      </el-table-column>-->
+      </el-table-column>
       <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
         <template slot-scope="{row}">
           <!--{{getLocationName(row.orderLocationList)}}-->
@@ -52,10 +52,12 @@
 
 <script>
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect/index.vue";
+import {parseTime} from "@/utils/ruoyi";
 
 export default {
   name: "WarehouseRecord",
   components: {WarehouseAreaSelect},
+  filters: {parseTime},
   props:{
     list:{
       type: Array,
@@ -73,6 +75,7 @@ export default {
     this.show = true
   },
   methods:{
+    parseTime,
     // 获取储位名称
     getLocationName(locationArr){
       if(!locationArr || !locationArr.length) return ''

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

@@ -920,21 +920,6 @@ export default {
       }
       this.open = true
     },
-    /*changeProdTitleZh(val){
-        var list = []
-        list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.id == val)
-        this.shopForm.sum = list[0].num
-        this.quantitySum = list[0].quantity
-        this.shopForm.orderItemId = list[0].orderItemId
-        this.shopForm.prodTitleEn = list[0].prodTitleEn
-        this.shopForm.prodTitleZh = list[0].prodTitleZh
-        // 默认给一个
-        if(!this.shopForm.specsRecordVOList || !this.shopForm.specsRecordVOList.length){
-          this.addRow()
-        }
-
-        this.numcheck()
-    },*/
     // 查询数量是否必填
     numcheck(){
       quantityRequired(this.orderData.lineId).then(res=>{