Merge branch 'pre-release' into 'jd_dev'

Pre Release最新代码合并入捷道研发分支20241123

See merge request !101

src/views/ecw/box/indexAir.vue

@@ -5,36 +5,36 @@
       <el-form-item :label="$t('自编号')" prop="selfNo">
         <el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('出货渠道')" prop="shippingChannelId">
-        <el-select v-model="queryParams.shippingChannelId" :placeholder="$t('请选择出货渠道')">
+      <el-form-item :label="$t('出货渠道')" prop="shippingChannelIdList">
+        <el-select v-model="queryParams.shippingChannelIdList" multiple :placeholder="$t('请选择出货渠道')" clearable>
           <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('始发仓')" prop="startWarehouseIdList">
-        <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags>
+        <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable>
           <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('目的国')" prop="countryIdList">
-        <el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable collapse-tags>
+        <el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable>
           <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的城市')" prop="destCityIdList">
-        <el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable collapse-tags>
+        <el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable>
           <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
-        <el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable collapse-tags>
+        <el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable>
           <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('状态')" prop="shipmentStatusAirList">
-        <el-select v-model="queryParams.shipmentStatusAirList" :placeholder="$t('请选择状态')" clearable size="small" multiple collapse-tags>
+        <el-select v-model="queryParams.shipmentStatusAirList" :placeholder="$t('请选择状态')" clearable size="small" multiple>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -54,10 +54,10 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('起运港')" v-show="showSearch">
-          <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
+          <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple />
         </el-form-item>
         <el-form-item :label="$t('目的港')" v-show="showSearch">
-          <dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
+          <dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple />
         </el-form-item>
         <el-form-item :label="$t('目的港清关')" prop="destinationClearance" v-show="showSearch">
           <el-select v-model="queryParams.destinationClearance" :placeholder="$t('请选择目的港清关')" clearable size="small">
@@ -66,7 +66,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('发货方式')" prop="deliveryType" v-show="showSearch">
-          <el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small" multiple collapse-tags>
+          <el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small" multiple>
             <el-option v-for="item in deliveryTypeData" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
@@ -83,21 +83,21 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('订舱代理')" v-show="showSearch">
-          <supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple collapse-tags />
+          <supplierSelect v-model="queryParams.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="allSupplier" clearable multiple />
         </el-form-item>
         <el-form-item :label="$t('航空公司')" v-show="showSearch">
-          <supplierSelect v-model="queryParams.airlineCompanyIdList"  :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple collapse-tags />
+          <supplierSelect v-model="queryParams.airlineCompanyIdList"  :placeholder="$t('请选择航空公司')" company-type="10" :allSupplier="allSupplier" clearable multiple />
         </el-form-item>
         <el-form-item :label="$t('代理公司Agent')" v-show="showSearch">
-          <supplierSelect v-model="queryParams.agentIdList"  :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple collapse-tags />
+          <supplierSelect v-model="queryParams.agentIdList"  :placeholder="$t('请选择代理公司')" company-type="1" :allSupplier="allSupplier" clearable multiple />
         </el-form-item>
         <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
-          <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple collapse-tags>
+          <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple>
             <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('报关公司')" v-show="showSearch">
-          <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
+          <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple />
         </el-form-item>
         <el-row>
           <el-form-item :label="$t('预计起飞时间')" prop="flyTime" v-show="showSearch">

src/views/ecw/box/indexSea.vue

@@ -56,42 +56,42 @@
       </el-form-item>
 
       <el-form-item :label="$t('始发仓')" prop="startWarehouseIdList">
-        <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable collapse-tags>
+        <el-select v-model="queryParams.startWarehouseIdList" multiple :placeholder="$t('请选择始发仓')" clearable>
           <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('目的国')" prop="countryIdList">
-        <el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable collapse-tags>
+        <el-select v-model="countryIdList" multiple :label="countryIdList" :placeholder="$t('请选择目的国')" clearable>
           <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的城市')" prop="destCityIdList">
-        <el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable collapse-tags>
+        <el-select v-model="destCityIdList" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable>
           <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的仓')" prop="destWarehouseIdList">
-        <el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable collapse-tags>
+        <el-select v-model="destWarehouseIdList" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable>
           <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('国家')" prop="countryId">
-        <el-select
-          v-model="queryParams.countryId"
-          :placeholder="$t('请选择国家')"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="item in countryList"
-            :key="item.id"
-            :label="$l(item, 'title')"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item :label="$t('国家')" prop="countryId">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.countryId"-->
+<!--          :placeholder="$t('请选择国家')"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="item in countryList"-->
+<!--            :key="item.id"-->
+<!--            :label="$l(item, 'title')"-->
+<!--            :value="item.id"-->
+<!--          >-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
         <el-select
           v-model="queryParams.ladingBillStatus"
@@ -127,7 +127,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('出单方式')" v-show="showSearch">
-        <el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable  multiple collapse-tags>
+        <el-select v-model="queryParams.cdOutBillType" :placeholder="$t('请选择出单方式')" clearable  multiple>
           <el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
@@ -163,24 +163,24 @@
       </el-row>
 
       <el-form-item :label="$t('起运港')" v-show="showSearch">
-        <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
+        <dockSelect v-model="queryParams.bigPortIdList" :placeholder="$t('请选择起运港')" portType="2" :allDocks="allDocks" clearable multiple/>
       </el-form-item>
       <el-form-item :label="$t('目的港')" v-show="showSearch">
-        <dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
+        <dockSelect v-model="queryParams.destPortIdList" :placeholder="$t('请选择目的港')" portType="2" :allDocks="allDocks" clearable multiple/>
       </el-form-item>
       <el-form-item :label="$t('驳船港')" v-show="showSearch">
-        <dockSelect v-model="queryParams.bargePortIdList" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="allDocks" clearable multiple collapse-tags />
+        <dockSelect v-model="queryParams.bargePortIdList" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="allDocks" clearable multiple/>
       </el-form-item>
       <el-form-item :label="$t('订舱公司')" v-show="showSearch">
-        <supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple collapse-tags />
+        <supplierSelect v-model="queryParams.spaceCompanyIdList" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="allSupplier" clearable multiple/>
       </el-form-item>
       <el-form-item :label="$t('报关方式')" prop="dcCustomsType" v-show="showSearch">
-        <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple collapse-tags>
+        <el-select v-model="queryParams.dcCustomsType" :placeholder="$t('请选择报关方式')" clearable  multiple>
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('报关公司')" v-show="showSearch">
-        <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
+        <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple/>
       </el-form-item>
       <el-form-item :label="$t('预计驳船时间')" v-show="showSearch">
         <el-date-picker type="datetimerange" :start-placeholder="$t('预计驳船开始日期')" :end-placeholder="$t('预计驳船结束日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="queryParams.bargeBeginTime"></el-date-picker>

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

@@ -270,12 +270,13 @@ export default {
         <template slot-scope="{row}">
           <!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
           <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>-->
-          <div v-if="row.warehouseInInfoVO">
+          <el-link type="primary" @click.native="$emit('showWarehouseLogs', row,1)" v-if="row.warehouseInInfoVO">
             {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
             {{row.warehouseInInfoVO.weight}}Kg
             {{row.warehouseInInfoVO.volume}}m³
             {{row.warehouseInInfoVO.quantityAll}}{{$t('个')}}
-          </div>
+          </el-link>
+          <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
         </template>
       </el-table-column>
       <el-table-column prop="warehouseType" :label="$t('类型')"  width="120px"/>

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

 <template>
   <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
-    <el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="100px">
+    <el-form v-if="agreement" ref="form" :model="formData" :rules="rules" size="small" label-width="140px">
       <el-row>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('订单号')">
             {{ detail.orderNo }}
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item :label="$t('总箱数')">
-            {{ detail.sumNum }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('体积')">
             {{ detail.sumVolume }}m³
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('重量')">
             {{ detail.sumWeight }}kg
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
+          <el-form-item :label="$t('总箱数')">
+            {{ detail.sumNum }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="$t('总控货箱数')">
             {{ detail.sumNum }}
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item :label="$t('剩余放货箱数')">
             {{ detail.sumNum - detail.releaseNum }}
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item :label="$t('到仓日期/卸柜日期')" label-width="200px">
-            {{ detail.unloadTime }}
+        <el-col :span="8">
+          <el-form-item :label="$t('到仓日期/卸柜日期')">
+            {{ detail.unloadTime || '-'}}
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item :label="$t('放货锁定收货人到期')" label-width="200px">
+        <el-col :span="8">
+          <el-form-item :label="$t('放货锁定收货人到期')">
             {{ detail.lockConsigneeTime || '-' }}
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('订单限制修改收货人')">
+            {{ detail.isLimitUpdateConsignee ? $t("是") : $t("否") }}
+          </el-form-item>
+        </el-col>
       </el-row>
-      <div class="title">{{ $t('请填写放货信息') }}</div>
+      <div class="title flex">
+        <div>
+          {{ $t('请填写放货信息') }}
+        </div>
+
+        <!--
+        http://czxy.cpolar.top/task-view-818.html
+        新增备注信息，逻辑如下：
+        1. 当订单限制修改收货人=是&&订单已卸柜/到仓&&当前时间<=放货锁定收货人到期时间
+        备注：订单锁定收货人未到期，不允许修改控货收货人
+        2. 当订单限制修改收货人=是&&订单已卸柜/到仓&&当前时间>放货锁定收货人到期时间
+        备注：订单锁定收货人信息已到期，允许修改控货收货人
+        3. 当订单限制修改收货人=是&&订单未卸柜/到仓
+        备注：订单未卸柜/到仓，不允许修改控货收货人
+        4. 当订单限制修改收货人=否
+        备注： 订单允许修改控货收货人
+        -->
+        <div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() <= (new Date(detail.lockConsigneeTime)).getTime()">
+          {{$t('备注：订单锁定收货人未到期，不允许修改控货收货人')}}
+        </div>
+        <div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && detail.unloadTime && Date.now() > (new Date(detail.lockConsigneeTime)).getTime()">
+          {{$t('备注：订单锁定收货人信息已到期，允许修改控货收货人')}}
+        </div>
+        <div class="ml-20 red" v-if="detail.isLimitUpdateConsignee && !detail.unloadTime">
+          {{$t('备注：订单未卸柜/到仓，不允许修改控货收货人')}}
+        </div>
+        <div class="ml-20 red" v-if="!detail.isLimitUpdateConsignee">
+          {{$t('备注：订单允许修改控货收货人')}}
+        </div>
+      </div>
       <div class="flex">
         <el-form-item :label="$t('收货人')" prop="consigneeName">
-          <el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable
+          <el-input v-model="formData.consigneeName" :placeholder="$t('请输入收货人')" clearable :disabled="disableUpdateCongsignee"
                     class="w-150"></el-input>
         </el-form-item>
         <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
           <!-- <el-input v-model="formData.field109" :placeholder="$t('区号')" clearable class="w-150"></el-input> -->
-          <area-code-selector v-model="formData.consigneeCountryCode" class="w-150"/>
-          <el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable
-                    class="w-150 ml-10"></el-input>
+          <div class="flex">
+            <area-code-selector v-model="formData.consigneeCountryCode" class="w-80" :disabled="disableUpdateCongsignee"/>
+            <el-input v-model="formData.consigneePhone" :placeholder="$t('请输入收货人电话')" clearable :disabled="disableUpdateCongsignee"
+                      class="w-120 flex-1 ml-5"></el-input>
+          </div>
         </el-form-item>
         <el-form-item :label="$t('收货人邮箱')" prop="consigneeEmail">
-          <el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable
+          <el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable :disabled="disableUpdateCongsignee"
                     class="w-150"></el-input>
         </el-form-item>
       </div>
@@ -168,6 +202,14 @@ export default {
         t += '-' + this.detail.orderNo
       }
       return t
+    },
+    disableUpdateCongsignee(){
+      if(!this.detail?.isLimitUpdateConsignee) return false
+      // 锁定且过期了返回false，其他情况全部是true
+      if(this.detail.isLimitUpdateConsignee && this.detail.lockConsigneeTime && new Date(this.detail.lockConsigneeTime).getTime() < Date.now()){
+        return false
+      }
+      return true
     }
   },
   created() {
@@ -206,6 +248,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.w-80{
+  width: 80px;
+}
+.red{
+  color: red;
+}
 .title {
   font-size: 16px;
   margin: 20px 0;

src/views/ecw/order/detail.vue

@@ -187,11 +187,27 @@
     <el-card class="card">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('货物详情')" name="first">
-          <detail-prod :list="order.orderItemVOList" :attr-list="attrList" :prod-type-list="prodTypeList" :currency-map="currencyMap" :unit-map="unitMap" :transport-id="order.transportId"></detail-prod>
+          <detail-prod
+            :list="order.orderItemVOList"
+            :attr-list="attrList"
+            :prod-type-list="prodTypeList"
+            :currency-map="currencyMap"
+            :unit-map="unitMap"
+            :transport-id="order.transportId"
+            @showWarehouseLogs="showWarehouseLogs"
+          ></detail-prod>
         </el-tab-pane>
         <!--退参品名  退仓/已混箱品名 lanbm 2024-04-16 按客户的要求修改-->
         <el-tab-pane :label="$t('退仓/已混箱品名')" name="six">
-          <detail-prod :list="orderItemDeletedData" :attr-list="attrList" :prod-type-list="prodTypeList" :currency-map="currencyMap" :unit-map="unitMap" :transport-id="order.transportId"></detail-prod>
+          <detail-prod
+            :list="orderItemDeletedData"
+            :attr-list="attrList"
+            :prod-type-list="prodTypeList"
+            :currency-map="currencyMap"
+            :unit-map="unitMap"
+            :transport-id="order.transportId"
+            @showWarehouseLogs="showWarehouseLogs"
+          ></detail-prod>
         </el-tab-pane>
         <!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
         <el-tab-pane :label="$t('订单动态')" name="second">

src/views/ecw/order/edit.vue

@@ -275,7 +275,7 @@
               {{ $t('件数') }} <span class="red">*</span>
             </template>
             <template slot-scope="{row}">
-              <el-input-number :min="0" :controls="false" style="width: 65px" v-model.number="row.num"
+              <el-input-number :min="1" :controls="false" style="width: 65px" v-model.number="row.num"
                                :disabled="!canAddProduct || !productEditable"/>
             </template>
           </el-table-column>
@@ -1359,11 +1359,11 @@ export default {
           // 默认不允许控货无收货人
           this.noConsignee = false
         }
-        // // 如果订单无收货人，但是最新的发货人允许无收货人则重置状态
-        // if (this.noConsignee && !this.hasConsignee) {
-        //   // 最新的发货人允许无收货人，则重置为有收货人
-        //   this.hasConsignee = true
-        // }
+        // 最新的发货人档案不允许无收货人则重置状态
+        if (!this.noConsignee) {
+          // 最新的发货人不允许无收货人，则重置为有收货人
+          this.hasConsignee = true
+        }
       })
     },
     async getOrder() {
@@ -1396,6 +1396,8 @@ export default {
         console.log("集运服务类型", this.form.type)
         this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
         this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
+        // 是否有收货人
+        this.hasConsignee = !!res.data.consigneeVO
         // 每次编辑订单详情需要实时获取发货人当前信息
         if (res.data.consignorVO) {
           this.$set(this.form, 'consignorCompany', res.data.consignorVO.company)
@@ -1424,10 +1426,6 @@ export default {
         // res.data.hasConsignee 订单冗余的发货人是否允许无收货人
         // res.data.noConsignee 当前订单发货人是否允许无收货
 
-
-        // 是否有收货人
-        // this.hasConsignee = !!res.data.consigneeVO
-
         if (this.form.channelId == 0) {
           delete this.form.channelId
         }
@@ -1626,7 +1624,7 @@ export default {
         worth: '',
         volume: '',
         weight: '',
-        num: ''
+        num: 1
       })
     },
     // 更新路线并打印来源

src/views/ecw/order/stockingList.vue

@@ -2,12 +2,13 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" class="search-z">
       <el-form-item :label="$t('编号')" prop="orderNo">
         <el-input
           v-model.trim="queryParams.numberKey"
           :placeholder="$t('请输入订单号、唛头、提单号')"
           clearable
+          class="w-200"
           @keyup.enter.native="handleQuery"
           @input="replaceSpace(queryParams, 'numberKey')"
         />
@@ -19,6 +20,7 @@
           :placeholder="$t('发货人')"
           clearable
           @keyup.enter.native="handleQuery"
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
@@ -27,6 +29,7 @@
           :placeholder="$t('收货人')"
           clearable
           @keyup.enter.native="handleQuery"
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('客户经理')">
@@ -37,11 +40,12 @@
           clearable
           @change="handleQuery"
           :prepend="{ id: 0, nickname: $t('未分配客户经理') }"
+          class="w-200"
         />
       </el-form-item>
       <div>
         <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
-          <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+          <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery" class="w-200">
             <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -53,6 +57,7 @@
             :placeholder="$t('请选择目的国')"
             clearable
             @change="handleQuery"
+            class="w-200"
           >
             <el-option
               v-for="item in AddressProvince"
@@ -67,9 +72,9 @@
             v-model="objectiveId"
             multiple
             :placeholder="$t('请选择目的城市')"
-            style="width: 200px"
             clearable
             @change="handleQuery"
+            class="w-200"
           >
             <el-option
               v-for="item in AddressCity"
@@ -84,9 +89,9 @@
             v-model="destWarehouseId"
             multiple
             :placeholder="$t('请选择目的仓')"
-            style="width: 200px"
             clearable
             @change="handleQuery"
+            class="w-200"
           >
             <el-option
               v-for="item in AddressTown"
@@ -103,7 +108,7 @@
       </el-form-item>-->
 
       <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
-        <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id">
+        <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id" class="w-200">
         </selector>
       </el-form-item>
 
@@ -113,6 +118,7 @@
           :placeholder="$t('请输入商品类型、品名或品牌')"
           clearable
           @keyup.enter.native="handleQuery"
+          class="w-200"
         />
       </el-form-item>
 
@@ -121,6 +127,7 @@
           :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
           v-model="queryParams.warehouseType"
           clearable
+          class="w-200"
         />
       </el-form-item>
 
@@ -130,6 +137,7 @@
           :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
           fomatter="bool"
           clearable
+          class="w-200"
         />
       </el-form-item>
 
@@ -139,6 +147,7 @@
           v-model="queryParams.status"
           @keyup.enter.native="handleQuery"
           clearable
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch">
@@ -147,6 +156,7 @@
           v-model="queryParams.customsType"
           clearable
           @change="handleQuery"
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('是否齐货')" v-show="showSearch">
@@ -157,6 +167,7 @@
           fomatter="bool"
           clearable
           @change="handleQuery"
+          class="w-200"
         />
       </el-form-item>
 
@@ -167,6 +178,7 @@
           multiple
           clearable
           @change="handleQuery"
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
@@ -176,6 +188,7 @@
           clearable
           @keyup.enter.native="handleQuery"
           onkeyup="this.value=this.value.replace(/\s+/g, '')"
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
@@ -184,6 +197,7 @@
           :placeholder="$t('请选择')"
           clearable
           @change="handleQuery"
+          class="w-200"
         >
           <el-option :label="$t('外部仓')" :value="1"></el-option>
           <el-option :label="$t('自有仓')" :value="0"></el-option>
@@ -196,6 +210,7 @@
           v-model="queryParams.abnormalState"
           @keyup.enter.native="handleQuery"
           clearable
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('审核状态')" prop="status" v-show="showSearch">
@@ -204,6 +219,7 @@
           v-model="queryParams.auditType"
           @keyup.enter.native="handleQuery"
           clearable
+          class="w-200"
         />
       </el-form-item>
       <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
@@ -212,6 +228,7 @@
           multiple
           :placeholder="$t('请选择')"
           clearable
+          class="w-200"
         >
           <el-option :label="$t('普通订单')" :value="0"></el-option>
           <el-option :label="$t('集运服务')" :value="1"></el-option>
@@ -225,6 +242,7 @@
           value-field="channelId"
           v-model="queryParams.channelIds"
           multiple
+          class="w-200"
         ></selector>
       </el-form-item>
       <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
@@ -233,6 +251,7 @@
           multiple
           :placeholder="$t('请选择')"
           clearable
+          class="w-200"
         >
           <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
             <el-option
@@ -242,33 +261,12 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item label="">
-        <dict-selector
-          :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
-          :filter="(item) => item.value != 'PickTime'"
-          v-model="dateFilterType"
-          defaultable
-          style="width: 150px; margin-right: 5px"
-        />
-        <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>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
-          $t("搜索")
-        }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{
-          $t("重置")
-        }}</el-button>
-      </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>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
+      </div>
     </el-form>
 
     <!-- 操作工具栏 -->