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

src/utils/request.js

@@ -103,6 +103,9 @@ service.interceptors.response.use(res => {
           + '<div>5 分钟搭建本地环境</div>',
       })
       return Promise.reject(new Error(msg))
+    } else if (code === 555) {
+      // 额外情况
+      return Promise.reject(res.data)
     } else if (code !== 200) {
       Notification.error({
         title: msg

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

@@ -193,7 +193,7 @@
               </div>
             </div>
           </el-row>
-          <el-pagination background layout="prev, pager, next" :page-size="pageParam.pageSize" :total="total" @current-change="pageChange" v-show="total > 0"></el-pagination>
+          <el-pagination background layout="prev, pager, next" :current-page="pageParam.pageNo" :page-size="pageParam.pageSize" :total="total" @current-change="pageChange" v-show="total > 0"></el-pagination>
           <el-scrollbar style="height:calc(100% - 75px)">
             <el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row">
               <el-row class="preinstall-title order-title">
@@ -439,6 +439,7 @@ export default {
       secGoodsList(params).then((res) => {
         this.preList = res.data;
         this.preLoading = false;
+        this.getPreLoad();
       });
     },
     /* 查询待预装 */
@@ -581,9 +582,11 @@ export default {
         createGoods(params).then((res) => {
           serviceMsg(res, this).then(() => {
             this.queryAllData();
-          }).catch(() => {
+          })
+        }).catch((res) => {
             if(res.code === 555) {
-              this.$confirm(res.msg, this.$t("提示"), {
+              const msg = res.msg && res.msg.replaceAll(',',"，");
+              this.$confirm(msg, this.$t("提示"), {
                 type: "warning",
               })
                 .then((_) => {
@@ -596,7 +599,6 @@ export default {
                 .catch((_) => {});
             }
           });
-        });
       } else {
         let params = {
           secId: part.id,
@@ -634,9 +636,8 @@ export default {
     },
     /* 查询所有数据 */
     queryAllData() {
-      this.getSecGoods();
       this.pageParam.pageNo = 1;
-      this.getPreLoad();
+      this.getSecGoods();
     },
     /* 获取参数 */
     getParams() {

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

@@ -29,6 +29,7 @@
 <script>
 import { createError } from "@/api/ecw/boxSea";
 import { serviceMsg } from "../../utils";
+import { debounce } from "throttle-debounce";
 /**
  * 卸柜异常
  */
@@ -41,8 +42,12 @@ export default {
     return {
       // 校验
       rules: {
-        exceptionType: [{ required: true, message: this.$t("必填"), trigger: "change" }],
-        productNum: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+        exceptionType: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
+        productNum: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
       },
       // 异常对象
       errorObj: {
@@ -54,7 +59,7 @@ export default {
   },
   methods: {
     /** 提交 */
-    onSubmit() {
+    onSubmit: debounce(340, function onSubmit() {
       this.$refs["errorForm"].validate((valid) => {
         if (valid) {
           const { productNum = 0 } = this.errorObj;
@@ -74,7 +79,7 @@ export default {
           });
         }
       });
-    },
+    }),
   },
 };
 </script>

src/views/ecw/financial/receiptDetail.vue

@@ -25,7 +25,11 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('箱数')" align="center" prop="num" />
-        <el-table-column :label="$t('体积/重量')" align="center" prop="weight" />
+        <el-table-column :label="$t('体积/重量')" align="center" prop="weight">
+          <template slot-scope="scope">
+              {{ scope.row.volume + "/" + scope.row.weight }}
+            </template>
+          </el-table-column>
         <el-table-column :label="$t('收入类型')" align="center" prop="feeType">
           <template slot-scope="scope">
             <dict-tag
@@ -120,7 +124,8 @@
         <!-- <el-table-column label="应收金额" align="center" prop="receivableAmount" /> -->
         <el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount">
           <template slot-scope="scope" v-if="scope.row.type !== 'total'">
-            {{ `${scope.row.receivableAmount - scope.row.discountTotal}(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }}
+           <span v-if="scope.row.discountTotal>0">{{ `${scope.row.receivableAmount - scope.row.discountTotal }(${scope.row.receivableAmount} - ${scope.row.discountTotal})` }}</span>
+           <span v-else>{{ `${scope.row.receivableAmount - scope.row.discountTotal }` }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" width="220">

src/views/ecw/financial/voucher.vue

@@ -140,7 +140,7 @@
       <!-- <el-table-column label="汇率" align="center" prop="totalAmount" /> -->
       <el-table-column :label="$t('实收日期')" align="center" prop="payedAt">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payedAt, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.writeOffAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('业务员')" align="center" prop="salesmanName" />

src/views/ecw/offer/edit.vue

@@ -576,23 +576,26 @@ export default {
                     trigger: 'blur'
                 }
             ],
-            lineId:         [{ required: true, message: "请选择线路"}],
+            lineId:         [{ required: true, message: this.$t("请选择线路")}],
             /* consignorId:    [{ required: true, message: "发货人不能为空",}],
             consigneeId:    [{ required: true, message: "收货人不能为空"}], */
-            startTime:      [{ required: true, message: "有效期开始时间不能为空"}],
-            endTime:        [{ required: true, message: "有效期结束时间不能为空"}],
-            transportId:    [{ required: true, message: "选择运输方式"}],
-            channelId:      [{ required: true, message: "选择出货渠道"}],
-            stopTime:       [{ required: true, message: "不能为空"}],
-            relation:       [{ required: true, message: "请选择所属人"}],
-            control:        [{ required: true, message: "请选择是否控货"}],
-            importance:     [{ required: true, message: "请选择重要成都"}]
+            startTime:      [{ required: true, message: this.$t("有效期开始时间不能为空")}],
+            endTime:        [{ required: true, message: this.$t("有效期结束时间不能为空")}],
+            transportId:    [{ required: true, message: this.$t("选择运输方式")}],
+            channelId:      [{ required: true, message: this.$t("选择出货渠道")}],
+            stopTime:       [{ required: true, message: this.$t("不能为空")}],
+            relation:       [{ required: true, message: this.$t("请选择所属人")}],
+            control:        [{ required: true, message: this.$t("请选择是否控货")}],
+            importance:     [
+                { required: true, message: this.$t("请选择重要程度")},
+                { type: 'number', min: 1, message: this.$t("请选择重要程度")}
+            ]
         }
         if(this.form.relation == 1){
-            rules.consignorId = [{ required: true, message: "发货人不能为空",}]
+            rules.consignorId = [{ required: true, message: this.$t("发货人不能为空")}]
         }
         if(this.form.relation == 2){
-            rules.consigneeId = [{ required: true, message: "收货人不能为空",}]
+            rules.consigneeId = [{ required: true, message: this.$t("收货人不能为空")}]
         }
         return rules
     },

src/views/ecw/order/edit.vue

@@ -736,6 +736,8 @@ export default {
                 }))
             })
         }
+        // 更换运输方式之后，之前选择的路线会失效，需要重新选择
+        this.$set(this.form, 'lineId', undefined)
         this.getOpenedRouterList()
     },
     'form.lineId'(lineId){

src/views/ecw/order/release.vue

@@ -4,6 +4,20 @@
           <el-form-item :label="$t('订单号')" v-if="order">
             {{order.orderNo}}
           </el-form-item>
+          <el-form-item label="" v-if="order">
+            <div>
+                {{$t('箱数')}}：{{order.sumNum}}{{$t('箱')}}
+            </div>
+            <div>
+                {{$t('重量')}}：{{order.sumWeight}}Kg
+            </div>
+            <div>
+                {{$t('体积')}}：{{order.sumVolume}}m³
+            </div>
+            <div>
+                {{$t('数量')}}：{{order.sumQuantity}}{{$t('个')}}
+            </div>
+          </el-form-item>
           <el-form-item :label="$t('放货方式')">
             <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
           </el-form-item>
@@ -16,7 +30,7 @@
                 {{order.consigneeVO.name}}
             </el-form-item>
             <el-form-item :label="$t('收货电话')">
-                {{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
+                +{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
             </el-form-item>
             <el-form-item :label="$t('收货地址')">
                 <!--缺少国城名字-->

src/views/ecw/supplier/edit.vue

@@ -315,7 +315,11 @@ export default {
         if(this.$route.query.id){
             getSupplier(this.$route.query.id).then(response => {
                 /* response.data.companyType = response.data.companyType.split(",") || [] */
-                this.formData = response.data;
+                this.formData = response.data
+                this.$set(this.formData, 'companyTypeArr', response.data.companyType?.split(",") || [])
+                this.formData.bankList.forEach(item => {
+                  item.currency = +item.currency
+                })
             });
         }
       })