订单优化

src/views/ecw/order/edit.vue

@@ -1526,26 +1526,12 @@ export default {
       this.$set(this.form, this.contactChooseType + 'Name', contact.contactsName)
       this.$set(this.form, this.contactChooseType + 'NameEn', contact.contactsNameEn || '')
       this.$set(this.form, this.contactChooseType + 'Phone', contact.phoneNew)
+      this.$set(this.form, this.contactChooseType + 'DefaultPay', contact.defaultPay)
 
       if (this.contactChooseType == 'consignor') {
-
         this.noConsignee = contact.noConsignee
-        // 如果允许无收货人，则默认无收货人、控货
-        // 241023 根据最新的原型，默认有收货人
-        /*if(this.noConsignee){
-          this.hasConsignee = false
-        }*/
-        // 如果发货人不允许无收货人，则重置为有收货人
-        // if (!this.noConsignee && !this.hasConsignee) {
-        //   this.$set(this, 'hasConsignee', true)
-        // }
-        // 如果默认付款则设置为发货人付款
-        this.defaultPay = contact.defaultPay
-        if (contact.defaultPay) {
-          this.$set(this.form, 'drawee', 1)
-        }
       }
-
+      this.setDefaultDrawee()
       this.contactChooseType = null
       this.quickCreateType = null
       if (this.form.lineId) this.getOfferData()
@@ -2053,11 +2039,12 @@ export default {
     // 更新默认付款人
     // 1发货人，2收货人，3自定义
     setDefaultDrawee(){
-      if(this.defaultPay){
+      // 优先级为：发货人默认付款，发货人付款>收货人默认付款，收货人付款>订单控货，收货人付款
+      if(this.form.consignorDefaultPay){
         this.form.drawee = 1
         return
       }
-      if(!this.hasConsignee){
+      if(this.form.consigneeDefaultPay){
         this.form.drawee = 2
         return
       }

src/views/ecw/order/index.vue

@@ -18,13 +18,6 @@
         <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
 
-      <el-form-item :label="$t('发货人')" prop="consignorKey">
-        <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
-      </el-form-item>
-      <el-form-item :label="$t('收货人')" prop="consigneeKey">
-        <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
-      </el-form-item>
-
       <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
         <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable @change="handleQuery" class="w-200"/>
       </el-form-item>
@@ -150,6 +143,18 @@
           </template>
         </el-input>
       </el-form-item>
+      <el-form-item :label="$t('发货人')" prop="consignorKey" v-show="showSearch">
+        <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
+      </el-form-item>
+      <el-form-item :label="$t('收货人')" prop="consigneeKey" v-show="showSearch">
+        <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
+      </el-form-item>
+      <el-form-item :label="$t('发货人电话')" prop="consigneeKey" v-show="showSearch">
+        <el-input v-model.trim="queryParams.consignorPhone" :placeholder="$t('发货人电话')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
+      </el-form-item>
+      <el-form-item :label="$t('收货人电话')" prop="consigneeKey" v-show="showSearch">
+        <el-input v-model.trim="queryParams.consigneePhone" :placeholder="$t('收货人电话')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
+      </el-form-item>
       <div class="flex pb-20">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
         <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>