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

src/api/ecw/order.js

@@ -192,6 +192,17 @@ export function getLabelByOrder(orderId){
   })
 }
 
+// 根据订单id获取待入仓标签箱号
+export function getLabelWaitInByOrder(orderId){
+  return request({
+    url: '/order/order-warehouse-in/get-label-wait-in-by-order',
+    method: 'get',
+    params: {
+      orderId
+    }
+  })
+}
+
 // 入仓修改储位
 export function saveOrUpdateOrderLocation(data){
   return request({

src/views/ecw/box/query.vue

@@ -354,7 +354,6 @@ export default {
       } else if (type === "single") {
         orders = [row];
       }
-      debugger
       this.getErrorType();
       this.$set(this.errorInfo, "orderList", orders);
       this.$set(this.errorInfo, "operate", type);
@@ -363,18 +362,18 @@ export default {
     },
     getErrorType() {
       for (const [key, value] of Object.entries(this.shipmentObj)) {
-        // 报关异常 customsInfo
-        if (key === "customsInfo" && value && value.hasAbnormal) {
+        // 报关异常 customsHasAbnormal
+        if (key === "customsHasAbnormal" && value) {
           this.$set(this.errorInfo, "errorType", "customs");
           this.$set(this.dialogConfig, "title", this.$t("更新报关异常状态"));
         }
-        // 起运异常 shippingInfo
-        if (key === "shippingInfo" && value && value.hasAbnormal) {
+        // 起运异常 shippingHasAbnormal
+        if (key === "shippingHasAbnormal" && value) {
           this.$set(this.errorInfo, "errorType", "shipping");
           this.$set(this.dialogConfig, "title", this.$t("更新起运异常状态"));
         }
-        // 到港异常 arrivalInfo
-        if (key === "arrivalInfo" && value && value.hasAbnormal) {
+        // 到港异常 arrivalHasAbnormal
+        if (key === "arrivalHasAbnormal" && value) {
           this.$set(this.errorInfo, "errorType", "arrival");
           this.$set(this.dialogConfig, "title", this.$t("更新到港异常状态"));
         }

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

@@ -237,7 +237,11 @@ export default {
           if (end.includes(val[keyName])) {
             node.currStatus = "end";
             // 判断是否存在异常未处理
-            if (val[voName].hasAbnormal) {
+            if (
+              val.customsHasAbnormal ||
+              val.shippingHasAbnormal ||
+              val.arrivalHasAbnormal
+            ) {
               continue;
             }
             // 报关

src/views/ecw/customer/query.vue

@@ -25,6 +25,8 @@
               <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" :value="customer.resourceType"></dict-tag>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('客户等级')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_LEVEL, customer.level) }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('信用等级')">{{ customer.creditLevelNameZh }}</el-descriptions-item>
+
             <el-descriptions-item :label="$t('国家')">{{ country }}</el-descriptions-item>
 <!--            <el-descriptions-item :label="$t('业务员')">{{ customer }}</el-descriptions-item>-->
             <el-descriptions-item :label="$t('客户来源')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_SOURCE, customer.source) }}</el-descriptions-item>

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

@@ -102,9 +102,9 @@
         <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
         <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
       </div>
-<!--      <div style="text-align: center">-->
-<!--        <el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>-->
-<!--      </div>-->
+      <div style="text-align: center">
+        <el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>
+      </div>
     </el-card>
 
     <h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
@@ -194,7 +194,7 @@
 <script>
 import {getCurrencyList} from "@/api/ecw/currency"
 import {
-  getLabelByOrder,
+  getLabelByOrder, getLabelWaitInByOrder,
   getOrder,
   getOrderWarehouseIn,
   getSpecialListByOrderId, listByOrderId,
@@ -294,22 +294,30 @@ export default {
         return arr.indexOf(state) == -1
       }
     },
-    // handleLabelSubmit(){
-    //   orderWarehouseInUpdateLabel({
-    //     ...this.label,
-    //     orderId: this.orderId
-    //   }).then(r => {
-    //     if (r.code === 0){
-    //       this.$message.success(r.msg || this.$t('修改标签箱号成功'))
-    //     }
-    //   })
-    // },
+    handleLabelSubmit(){
+      orderWarehouseInUpdateLabel({
+        ...this.label,
+        orderId: this.orderId
+      }).then(r => {
+        if (r.code === 0){
+          this.$message.success(r.msg || this.$t('修改标签箱号成功'))
+        }
+      })
+    },
 
     // 箱号标签回显
     getLabelByOrder(){
       getLabelByOrder(this.orderId).then(r => {
         if (r.code === 0 && !! r.data && r.data.length > 0) {
           this.label.orderLabelDtoList = r.data
+        } else {
+          // 没有历史数据，查默认值
+          getLabelWaitInByOrder(this.orderId).then(r => {
+            console.log(r)
+            if (r.code === 0 && !! r.data) {
+              this.label.orderLabelDtoList = [r.data]
+            }
+          })
         }
       })
     },

src/views/ecw/warehouse/index.vue

@@ -446,6 +446,7 @@ export default {
 
       serviceGroup: [
         {id: '1', text: this.$t('集运服务')},
+        {id: '6', text: this.$t('数量(个)是否必填')},
       ],
 
       endServiceGroup: [