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

src/views/ecw/order/components/CancelCargo.vue

@@ -30,7 +30,7 @@
         </el-form-item>
         
         <el-form-item :label="$t('控货手机号')">
-            +{{detail.countryCode}} {{detail.phone}}
+            +{{detail.dialCode}} {{detail.phone}}
         </el-form-item>
         <el-form-item :label="$t('手机验证码')">
             <el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>

src/views/ecw/order/components/PrintTag.vue

@@ -11,6 +11,9 @@
               <el-form-item :label="$t('结束标签')" prop="end" required>
                 <el-input v-model.number="form.end" type="number"></el-input>
               </el-form-item>
+              <el-form-item :label="$t('标签范围')" v-if="tags.length">
+                <el-input :value="tags[0].labels" disabled></el-input>
+              </el-form-item>
               <el-form-item label="">
                 <el-button type="primary" @click="showPreview">{{$t('去打印')}}</el-button>
               </el-form-item>

src/views/ecw/order/edit.vue

@@ -833,7 +833,10 @@ export default {
         }
     },
     'form.isCargoControl'(isCargoControl){
-        this.$set(this.form, 'drawee', isCargoControl ? 1 : 2)
+        console.log('form.isCargoControl', this.form.isCargoControl, this.initing)
+        if(!this.initing){
+            this.$set(this.form, 'drawee', isCargoControl ? 1 : 2)
+        }
     },
     /* 'form.orderItemVOList'(){
         console.log('form.orderItemVOList', this.form.orderItemVOList.length, this.form.orderItemVOList)
@@ -875,11 +878,14 @@ export default {
 
     if(this.$route.query.id){
         this.getOrder()
-    }else this.addProduct()
+    }else{
+        this.addProduct()
+        this.$nextTick(() => {
+            this.initing = false
+        })
+    }
+    
     
-    this.$nextTick(() => {
-        this.initing = false
-    })
   },
   methods: {
     onTableMounted(e){
@@ -887,7 +893,7 @@ export default {
     },
     getOrder(){
         getUpdateInfo(this.$route.query.id).then(res => {
-            this.form = Object.assign({}, res.data, {orderItemVOList: []})
+            this.form = Object.assign({}, {...res.data}, {orderItemVOList: []})
 
             /* this.form.orderItemVOList = []; */
             
@@ -926,6 +932,13 @@ export default {
                 this.showWorkFlow = true
             }
 
+            // 如果是自定义付款人，则需要同步具体发货人信息
+            if(this.form.drawee == 3){
+                this.customDraweeList.forEach(item => {
+                    item.value = this.form.customDraweeVOList.find(it => it.name == item.name)?.value || item.value
+                }) 
+            }
+
             // 如果已完成入仓，则需要监听必填内容，发生更改后需要填写审批表单
             this.$nextTick(() => {
                 res.data.orderItemVOList.forEach(item => {

src/views/ecw/product/index.vue

@@ -15,11 +15,11 @@
         <el-input v-model="queryParams.titleZh" :placeholder="$t('请输入商品名称')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <!-- <el-form-item :label="$t('商品属性')" prop="attrId">
+      <el-form-item :label="$t('商品类型')" prop="attrId">
         <el-select v-model="queryParams.typeId" :placeholder="$t('选择商品类型')" clearable>
-          <el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id" />
+          <el-option v-for="type in typeList" :key="type.id" :label="$l(type, 'title')" :value="type.id" />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
 
       <el-form-item :label="$t('商品特性')" prop="attrId">
         <el-select v-model="queryParams.attrId" :placeholder="$t('选择商品特性')" clearable>
@@ -328,7 +328,7 @@ export default {
 
   activated(){
     if(this.$route.query.typeId != this.queryParams.typeId){
-      this.queryParams.typeId = this.$route.query.typeId
+      this.queryParams.typeId = +this.$route.query.typeId || null
     }
     this.getList()
   },