Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/financial/printVoucher.vue

@@ -64,7 +64,7 @@
             <p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.accountNo}}</p>
           </div>
           <div style="padding:6px 0;width: 87.5%;text-align: center;">
-            <p style="margin: 0;">{{$t('实收')}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.writeOffAmount}}¥</p>
+            <p style="margin: 0;">{{$t('实收')}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.amount}}¥</p>
             <!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
           </div>
         </div>

src/views/ecw/financial/receiptDetail.vue

@@ -108,7 +108,7 @@
         </el-descriptions-item>
       </el-descriptions>
     </el-card>
-    
+
     <el-card class="card">
       <div slot="header" class="card-title">{{ $t('收款信息') }}</div>
       <el-table :data="form.receiptAccountList" border>
@@ -802,6 +802,10 @@ export default {
         .catch(() => {});
     },
     verificationAll() {
+      if(!this.detailed||this.detailed.length==0){
+        this.$modal.msgError(this.$t('当前收款单未添加银行收款明细，无法全部核销，请添加银行收款单明细，并核销所有实收明细后再进行全部核销！'));
+        return
+      }
       this.$modal
         .confirm(this.$t('您确认要全部核销吗?'))
         .then(() => {

src/views/ecw/order/prepayDeal.vue

@@ -502,7 +502,9 @@
               this.$modal.msgError(this.$t('请上传报关资料'));
               return
             }
+            this.handlerParams.files = Array.isArray(this.handlerParams.fileList) ? this.handlerParams.fileList.join(',') : this.handlerParams.fileList
           }
+          
           handlerExceptionByExceptionId(this.handlerParams).then(res=>{
               this.$modal.msgSuccess(this.$t('提交成功'));
               this.$redirect('/order/pending?id=' + this.orderData.orderId)

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

@@ -561,11 +561,14 @@ export default {
     },
     handleVolume(index, val){
       const {boxGauge1, boxGauge2, boxGauge3} = (val === 1 ? this.tableData1 : this.tableData)[index]
+      let result = ''
       if (boxGauge1 && boxGauge2 && boxGauge3) {
-        (val === 1 ? this.tableData1 : this.tableData)[index].volume = ((boxGauge1 * boxGauge2 * boxGauge3) / 1000000)?.toFixed(2) || ''
+        result = ((boxGauge1 * boxGauge2 * boxGauge3) / 1000000)?.toFixed(2) || ''
       } else {
-        (val === 1 ? this.tableData1 : this.tableData)[index].volume = 0
+        result = ''
       }
+      if (result === '0.00') result = '0.01';
+      (val === 1 ? this.tableData1 : this.tableData)[index].volume = result
     },
     handleSubmit() {
       const orderWarehouseInItemDoList = [

src/views/ecw/order/weightDeal.vue

@@ -20,10 +20,10 @@
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
               </el-descriptions-item>
              <el-descriptions-item :label="$t('始发地')" :span="2">
-                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
+                 {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
              </el-descriptions-item>
              <el-descriptions-item :label="$t('目的地')">
-                {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
+                {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:$t('无')}}
              </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
@@ -76,7 +76,7 @@
               <template slot-scope="scope">
                  <span>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
                  <p>
-                  <span>{{$t('品牌')}}：{{getBrand(scope.row.brand)}}&nbsp;&nbsp;</span>
+                  <span>{{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" /></span>
                   <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</span>
                   <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM&nbsp;&nbsp;</span>
                   <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>