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

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

@@ -107,7 +107,9 @@ export default {
       cdOutBillType:
         oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType,
     };
+    if(!this.$attrs.shipmentObj.clearanceDocInfo){
       this.$set(this.cDocObj,'cdOutBillType',String(this.$attrs.shipmentObj.ladingBillInfo?.issueType)||undefined)
+    }
   },
   methods: {
     /** 提交 */

src/views/ecw/box/shippingSea/nodePage/common/ladingSelect.vue

 <template>
-  <el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable>
+  <el-select filterable :value="company === 0 ? undefined : company" @change="change" v-bind="$attrs" clearable>
     <el-option v-for="user in getUser" :key="user.id" :value="user.id" :label="$l(user, 'company')"></el-option>
   </el-select>
 </template>
@@ -24,8 +24,28 @@ export default {
   },
   computed: {
     getUser() {
+      this.allUsers.forEach(element => {
+        if(!element.companyEn) {
+          element.companyEn = element.companyZh
+        }
+      });
       return this.allUsers;
     },
+    company: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit("change", val);
+      }
+    }
+  },
+  created() {
+      this.company = this.value
+      let com = this.getUser.findIndex(item=>item.id==this.company)
+      if(com == -1){
+        this.company = 0
+      }
   },
   methods: {
     change(val) {

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

@@ -34,7 +34,10 @@
                     {{scope.row.orderNo}}
                   </div>
                   <div style="color:blue;fontWeight:bold;">
-                    {{ scope.row.isExternalWarehouse === 1 ? '(外部仓)' : ''}}
+                    {{ scope.row.isExternalWarehouse === 1 ? ('('+$t('外部仓')+')') : ''}}
+                  </div>
+                  <div style="color:red;fontWeight:bold;">
+                    {{ scope.row.adjustToDestWarehouseId > 0 ? ('('+$t('调仓')+')') : ''}}
                   </div>
                 </template>
               </el-table-column>