Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/productPrice.js

@@ -48,6 +48,7 @@ export function exportProductPriceExcel(query) {
   return request({
     url: '/ecw/product-price/export-excel',
     method: 'get',
+    timeout: 3*60*1000,
     params: query,
     responseType: 'blob'
   })

src/views/ecw/box/query.vue

@@ -74,7 +74,7 @@
                   <a href="javascript:void(0)" @click="jumpOrderDetail(scope.row)">{{ scope.row.orderNo }}</a>
                 </template>
               </el-table-column>
-              <el-table-column prop="goodsList" :label="$t('货物信息')" width="250px" align="center">
+              <el-table-column prop="goodsList" :label="$t('货物信息')" width="230px" align="center">
                 <template v-slot="{row}">
                   <section>
                     <div v-for="(item, index) in row.goodsList" :key="index">
@@ -98,7 +98,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="customsFee" :label="$t('报关费用')" align="center"></el-table-column>
-              <el-table-column prop="" :label="$t('操作')" align="center">
+              <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
                 </template>
@@ -363,17 +363,17 @@ export default {
     getErrorType() {
       for (const [key, value] of Object.entries(this.shipmentObj)) {
         // 报关异常 customsInfo
-        if (key === "customsInfo" && value.hasAbnormal) {
+        if (key === "customsInfo" && value && value.hasAbnormal) {
           this.$set(this.errorInfo, "errorType", "customs");
           this.$set(this.dialogConfig, "title", this.$t("更新报关异常状态"));
         }
         // 起运异常 shippingInfo
-        if (key === "shippingInfo" && value.hasAbnormal) {
+        if (key === "shippingInfo" && value && value.hasAbnormal) {
           this.$set(this.errorInfo, "errorType", "shipping");
           this.$set(this.dialogConfig, "title", this.$t("更新起运异常状态"));
         }
         // 到港异常 arrivalInfo
-        if (key === "arrivalInfo" && value.hasAbnormal) {
+        if (key === "arrivalInfo" && value && value.hasAbnormal) {
           this.$set(this.errorInfo, "errorType", "arrival");
           this.$set(this.dialogConfig, "title", this.$t("更新到港异常状态"));
         }

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

@@ -53,9 +53,8 @@
                   <section class="table-goodList">
                     <div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
                       <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
-                      <p>{{$t('品牌')}}：【
-                        <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.productRecord" />
-                        】
+                      <p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
+                        <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
                       </p>
                       <p>{{$t('其他')}}：{{getTotlContent(item)}}</p>
                     </div>

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

@@ -24,7 +24,7 @@
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('正常报关订单')">
+      <el-form-item :label="$t('正常报关订单')" v-show="isShowNormal">
         <div v-for="item in normalOrderList" :key="item.orderId">
           <a href="javascript:void(0)" @click="jumpOrderDetail(item)">{{ item.orderNo }}</a>
         </div>
@@ -231,6 +231,7 @@ export default {
       )[0].value,
       isDownload: false,
       normalOrderList: [],
+      isShowNormal: false,
     };
   },
   created() {
@@ -240,6 +241,7 @@ export default {
       ...this.shipmentObj[voName],
       documentInfo: this.shipmentObj.documentInfo?.split(",") ?? [],
     };
+    console.log(oldData)
 
     if (!this.shipmentObj[voName]) {
       oldData.dcCustomsType = oldData.dcCustomsType
@@ -260,7 +262,6 @@ export default {
     ]);
 
     this.cusDeclarationObj = oldData;
-    // this.getCustomsOrderList(oldData.dcCustomsType);
   },
   methods: {
     getCustomsOrderList(dcCustomsType) {
@@ -269,6 +270,11 @@ export default {
         customsTypes: dcCustomsType === "3" ? "2,3" : dcCustomsType,
       }).then((res) => {
         this.normalOrderList = res.data ?? [];
+        if (dcCustomsType === "1") {
+          this.isShowNormal = false;
+        } else {
+          this.isShowNormal = true;
+        }
       });
     },
     regCloseDialog(type) {
@@ -520,11 +526,8 @@ export default {
     },
     /* 判断查验选择是否禁用 */
     disabledRadio(item) {
-      const {
-        checkExamineStatus,
-        checkDealStatus,
-        customsInfo,
-      } = this.shipmentObj;
+      const { checkExamineStatus, checkDealStatus, customsInfo } =
+        this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {}; // 部分退场状态并且审核通过，退场不可选择
       if (
         checkExamineStatus === 2 &&
@@ -562,7 +565,7 @@ export default {
     "cusDeclarationObj.dcCustomsStatus"(val) {
       if (val !== "3") {
         this.$set(this.cusDeclarationObj, "dcCheckStatus", "");
-        this.$set(this.cusDeclarationObj, "dcPassTime", "");
+        // this.$set(this.cusDeclarationObj, "dcPassTime", "");
       } else {
         const { customsInfo } = this.shipmentObj;
         this.$set(
@@ -604,11 +607,8 @@ export default {
   computed: {
     /* 获取报关审核退场状态文字 */
     getCheckExamineStatus() {
-      const {
-        checkExamineStatus,
-        checkDealStatus,
-        customsInfo,
-      } = this.shipmentObj;
+      const { checkExamineStatus, checkDealStatus, customsInfo } =
+        this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {};
       if (checkExamineStatus === 1) {
         return dcCheckStatus === 1
@@ -625,11 +625,8 @@ export default {
     /* 判断是否已处理 */
     isCheckDeal() {
       return (type) => {
-        const {
-          checkExamineStatus,
-          checkDealStatus,
-          customsInfo,
-        } = this.shipmentObj;
+        const { checkExamineStatus, checkDealStatus, customsInfo } =
+          this.shipmentObj;
         const { dcCheckStatus } = customsInfo ?? {};
 
         // 状态

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

@@ -30,8 +30,8 @@
           <el-option v-for="item in declarationMethodOps" :label="item.label" :value="item.value" :key="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('订单号')" prop="toBePreOrderNo">
-        <el-input v-model="queryParams.toBePreOrderNo" :placeholder="$t('请输入订单号码')" clearable />
+      <el-form-item :label="$t('待预装订单')" prop="toBePreOrderNo">
+        <el-input v-model="queryParams.toBePreOrderNo" :placeholder="$t('请输入待预装订单')" clearable />
       </el-form-item>
       <el-form-item :label="$t('已预装单号')" prop="preOrderNo">
         <el-input v-model="queryParams.preOrderNo" :placeholder="$t('请输入已预装单号')" clearable />
@@ -236,9 +236,10 @@
               <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
                 <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
                 <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
-                <el-table-column :label="$t('备案')" align="center" prop="brandType">
-                  <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
+                <el-table-column :label="$t('备案')" align="center" prop="feeType">
+                  <template slot-scope="{row}">
+                    <template v-if="row.brandName">{{row.brandName}}</template>
+                    <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('箱数')" align="center" prop="num" />

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -41,8 +41,9 @@
               <el-table-column :label="$t('商品信息')" width="250px" align="center" prop="prodTitleZh">
               </el-table-column>
               <el-table-column :label="$t('备案')" align="center" prop="feeType">
-                <template v-slot="{row}">
-                  <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
+                <template slot-scope="{row}">
+                  <template v-if="row.brandName">{{row.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                 </template>
               </el-table-column>
               <el-table-column :label="$t('报关方式')" align="center" prop="customsType">

src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue

@@ -34,11 +34,14 @@
             {{ scope.row.orderNo }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('商品信息')" align="center" prop="goodsList">
+        <el-table-column :label="$t('商品信息')" align="center" prop="goodsList" width="200px">
           <template slot-scope="scope">
             <section class="table-goodList">
               <div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
-                <p>{{index+1}}：{{$l(item, 'prodTitle')}}</p>
+                <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
+                <p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
+                </p>
               </div>
             </section>
           </template>
@@ -392,14 +395,16 @@ export default {
   .table-area {
     .table-goodList {
       .goodList-div {
+        border-bottom: 1px solid #e6ebf5;
         > p {
           text-align: left;
-        }
-        > p:last-child {
           > span {
-            margin-right: 5px;
+            margin-right: 0px;
+          }
         }
       }
+      > div:last-child {
+        border-bottom: none;
       }
     }
   }

src/views/ecw/financial/creatCollection.vue

@@ -921,10 +921,10 @@ export default {
                 discountTotal: discountDollar,
                 currencyId: item.id,
                 receivableAmount: dollar,
-                writeOffRate: t?.writeOffRate || NP.divide(this.currencyList.find(v => v.id === item.id).huilv, this.currencyList.find(v => v.id === this.showCurrencyId).huilv).toFixed(6),
+                writeOffRate:  NP.divide(this.currencyList.find(v => v.id === item.id).huilv, this.currencyList.find(v => v.id === this.showCurrencyId).huilv).toFixed(6),
                 platformAccountId: t?.platformAccountId || '',
-                collectionCurrencyId: t?.collectionCurrencyId || item.id,
-                collectionRate: t?.collectionRate || 1
+                collectionCurrencyId:  item.id,
+                collectionRate: 1
               }
             )
             this.calculationCount(NP.minus(dollar, discountDollar), item.id)

src/views/ecw/financial/receiptDetail.vue

@@ -516,6 +516,7 @@ export default {
     },
     WriteOffProportion(){
         let total = 0
+        if(!this.form.receiptAccountList) return 0
         let amountTotal = this.form.receiptAccountList.find(item=>item.type=='total').writeOffAmount
 
         this.detailed.forEach(item => {
@@ -609,23 +610,23 @@ export default {
 
 
 
-
+        var n
         // 收款总计
         var amountList =[]
         this.currencyList.forEach((item,index)=>{
           var nairaListByList = this.list.filter(v => v.currencyId === item.id)
           if(nairaListByList.length>0){
             var discountNaira = nairaListByList.reduce((total, currentValue) => NP.plus(total, currentValue.discountTotal || 0), 0)
-            var n = res.data.find(v => v.currencyId == item.id)
+            n = res.data.find(v => v.currencyId == item.id)
             n && (n.discountTotal = discountNaira)
           }
           var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
           if(dollarList.length>0){
             var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(2)
-           if(n.discountTotal&&n.discountTotal>0){
-             amountList.push({currencyName:item.titleZh,amount:(dollar-n.discountTotal).toFixed(2)})
+           if(n && n.discountTotal&&n.discountTotal>0){
+             amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:(dollar-n.discountTotal).toFixed(2)})
            }else{
-             amountList.push({currencyName:item.titleZh,amount:dollar})
+             amountList.push({currencyName:item.titleZh, currencyId: item.id, amount:dollar})
            }
 
           }
@@ -910,6 +911,8 @@ export default {
     },
     handleAddReceiptItem() {
       this.surplusData = []
+
+      // 已收
       let recepted = []
       this.detailed.forEach(item => {
 
@@ -918,13 +921,19 @@ export default {
           }else recepted[item.currencyId] = NP.plus(recepted[item.currencyId], item.amount)
       })
       console.log('rece',recepted)
+
+      // 应收
       let collom = []
-      this.form.receiptAccountList.forEach(item => {
+      /* this.form.receiptAccountList.forEach(item => {
           if(item.type!='total'){
             if(!collom[item.currencyId]){
               collom[item.currencyId] = item.receivableAmount-item.discountTotal
             }else collom[item.currencyId] = NP.plus(collom[item.currencyId], item.receivableAmount)
           }
+      }) */
+      // 从期望收费金额中提取应收币种和金额
+      this.form.receiptAccountList.find(item => item.type == 'total').collectionAmount.forEach(item => {
+        collom[item.currencyId] = item.amount
       })
           console.log('collom',collom)
       // if(recepted.length>collom.length){

src/views/ecw/order/detail.vue

@@ -195,7 +195,7 @@
         </el-tab-pane>
         <el-tab-pane :label="$t('运单资料/提货单')" name="three">
           <!--inWarehouseState 1待入库，2多了，3少了，4到齐-->
-          <el-button type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState <= 1">{{$t('查看入仓单')}}</el-button>
+          <el-button type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0">{{$t('查看入仓单')}}</el-button>
           <el-button type="text" @click.native="showLadingBill=true" :disabled="!order.ladingState">{{$t('查看提货单')}}</el-button>
           <el-button :disabled="!order.packingListUrl" type="text" @click="downloadPackingList">{{$t('装箱单')}}</el-button>
         </el-tab-pane>
@@ -418,7 +418,6 @@ export default {
 
       const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
       // 不是特价则显示其他字段
-      if(!row.specialPriceType){
       freightFields = [
         // {field: 'oneSeaFreight', label: '成交单价'},
         {field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
@@ -439,6 +438,7 @@ export default {
         freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
       }
       freightFields.push({field: 'oneSeaFreight', label: this.$t('成交单价')})
+      console.log({freightFields})
       freightFields.forEach(item => {
         if(row[item.field]){
           freight.push({
@@ -460,7 +460,7 @@ export default {
       ]
       // 品牌加价
       if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
-          freightFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+        clearanceFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
       }
       if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
         clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
@@ -477,7 +477,7 @@ export default {
           })
         }
       })
-      }
+    
 
       freight.push({
         label: '价格更新时间',

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

@@ -248,6 +248,7 @@
                       <el-input v-else v-model="tableData1[$index].cartonsNum" placeholder="">
                         <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span>
                       </el-input>
+                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="tableData1[$index].specificationType" @change="handleVolume($index)"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -266,7 +267,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'">
                       <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[0] : '' }}</span>
-                      <el-input v-else v-model.number="tableData1[$index].boxGauge1" placeholder="" @blur="handleVolume($index, 1)"></el-input>
+                      <el-input v-else type="number" v-model="tableData1[$index].boxGauge1" placeholder="" @blur="handleVolume($index, 1)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -274,7 +275,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'">
                       <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[1] : '' }}</span>
-                      <el-input v-else v-model.number="tableData1[$index].boxGauge2" placeholder="" @blur="handleVolume($index, 1)"></el-input>
+                      <el-input v-else type="number" v-model="tableData1[$index].boxGauge2" placeholder="" @blur="handleVolume($index, 1)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -282,7 +283,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'">
                       <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[2] : '' }}</span>
-                      <el-input v-else v-model.number="tableData1[$index].boxGauge3" placeholder="" @blur="handleVolume($index, 1)"></el-input>
+                      <el-input v-else type="number" v-model="tableData1[$index].boxGauge3" placeholder="" @blur="handleVolume($index, 1)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -293,7 +294,7 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
                       <span v-if="tableData1[$index].id">{{ tableData1[$index].volume }}</span>
-                      <el-input v-else v-model.number="tableData1[$index].volume" placeholder=""></el-input>
+                      <el-input v-else type="number" v-model="tableData1[$index].volume" placeholder=""></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -304,14 +305,11 @@
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
                       <span v-if="tableData1[$index].id">{{ tableData1[$index].weight }}</span>
-                      <el-input v-else v-model.number="tableData1[$index].weight" placeholder=""></el-input>
+                      <el-input v-else type="number" v-model="tableData1[$index].weight" placeholder=""></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="数量" width="130px">
-                  <template v-slot:header>
-                    <span style="color: red">*</span> 数量
-                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
                       <span v-if="tableData1[$index].id">{{ tableData1[$index].quantityAll }}</span>
@@ -500,6 +498,8 @@ export default {
         this.form.material = this.warehousing.material
         if (this.warehousing.brand && this.warehousing.brand !== 0){
           this.form.brand = this.warehousing.brand.toString() || ''
+        } else {
+          this.form.brand = ''
         }
         this.handleBrandChange(this.form.brand)
         getWarehouseLastUpdateApprovalInfo({

src/views/ecw/productPrice/index.vue

@@ -77,6 +77,9 @@
         <el-button  v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchBlock" :disabled="multiple">{{$t('批量加入黑名单')}}</el-button>
         <el-button  v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchOff" :disabled="multiple">{{$t('批量下架')}}</el-button>
 
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" >{{$t('导出')}}</el-button>
+      </el-col>
+
         <!--指定商品-->
         <el-button v-if="$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchSetSingleProductPrice">{{$t('批量设置单个商品的路线')}}</el-button>
       </el-col>
@@ -711,14 +714,16 @@ export default {
       params.pageNo = undefined;
       params.pageSize = undefined;
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-      // 执行导出
-      this.$modal.confirm(this.$t('是否确认导出所有产品价格数据项?')).then(() => {
+      // c
+      this.$modal.confirm(this.$t('是否确认导出所有数据项?')).then(() => {
           this.exportLoading = true;
           return exportProductPriceExcel(params);
         }).then(response => {
-          this.$download.excel(response, '${table.classComment}.xls');
+          this.$download.excel(response, '路线价格.xlsx');
           this.exportLoading = false;
-        }).catch(() => {});
+        }).catch(() => {
+          this.exportLoading = false;
+        });
     },
     // 表格多选
     handleSelectionChange(selection) {