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

src/i18n/languages/en_US.json

@@ -4946,5 +4946,13 @@
   "货物状态": "Goods Status",
   "厂家": "Manufacturer",
   "厂家电话": "Manufacturer Phone",
-  "预计发货时间": "Estimated Delivery Time"
+  "预计发货时间": "Estimated Delivery Time",
+  "修改入仓信息": "Modify Warehouse Information",
+  "修改储位和影像": "Modify Storage Location and Image",
+  "运输方式-渠道/目的仓": "Transportation Method - Channel/Destination Warehouse",
+  "上次跟进类型": "Last Follow-up Type",
+  "上次根进时间": "Last Follow-up Time",
+  "上次跟进内容": "Last Follow-up Content",
+  "所报价格": "Quoted Price",
+  "厂家/电话": "Manufacturer/Phone"
 }

src/views/ecw/order/index.vue

@@ -155,6 +155,9 @@
       <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="draweeList" v-show="showSearch">
+        <dict-selector :type="DICT_TYPE.DRAWEE" v-model="queryParams.draweeList" multiple clearable @change="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>
@@ -808,7 +811,8 @@ export default {
         rows: 10,
         packageTypeArr: [],
         channelIds: [],
-        goodsTypes: []
+        goodsTypes: [],
+        draweeList: []
       },
       warehouseList: [],
       //tradeCityList: [],

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -5,7 +5,7 @@
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane :label="edit ? $t('货物修改') : $t('货物入仓')" name="first">
           <el-form ref="form" :model="form" :rules="formRules" label-width="80px">
-            <el-descriptions border :column="2">
+            <el-descriptions border :column="2" :style="baseStyles">
               <el-descriptions-item>
                 <template slot="label"><span style="color: red">*</span>{{ $t("中文品名") }}</template>
                 <span style="min-width: 200px; margin-right: 15px; display: inline-block">
@@ -42,7 +42,7 @@
                 >Kg
               </el-descriptions-item>
             </el-descriptions>
-            <el-row>
+            <el-row :style="baseStyles">
               <el-col :span="8">
                 <el-form-item :label="$t('材质')" style="margin-top: 20px">
                   <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material" clearable></dict-selector>
@@ -76,7 +76,7 @@
               <el-button style="float: right; margin-left: 15px" size="mini" type="primary" icon="el-icon-minus" circle @click="handleDelete" :disabled="form.table.length < protectRowCount"></el-button>
               <el-button style="float: right" size="mini" type="primary" icon="el-icon-plus" circle @click="handleAdd()"></el-button>
             </div>
-            <el-form ref="tableForm" :rules="tableFormRules" :model="form" size="mini">
+            <el-form ref="tableForm" :rules="tableFormRules" :model="form" size="mini" :style="baseStyles">
               <el-table :data="form.table" style="width: 100%">
                 <el-table-column :label="$t('箱数')" width="150px">
                   <template v-slot:header> <span style="color: red">*</span>{{ $t("箱数") }}</template>
@@ -170,7 +170,9 @@
                 </el-table-column>
                 <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" width="150px">
                   <template v-slot="{ row, column, $index }">
-                    <warehouse-area-select v-if="visible" v-model="form.table[$index].orderLocationBackVOList" :order-id="orderId" :order-item-id="warehousing.orderItemId" :warehouse-in-id="form.table[$index].id" :warehouse-id="warehouseId" :is-editing="edit"></warehouse-area-select>
+                    <div style="pointer-events: auto">
+                      <warehouse-area-select v-if="visible" v-model="form.table[$index].orderLocationBackVOList" :order-id="orderId" :order-item-id="warehousing.orderItemId" :warehouse-in-id="form.table[$index].id" :warehouse-id="warehouseId" :is-editing="edit"></warehouse-area-select>
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('备注')">
@@ -485,6 +487,10 @@ export default {
   },
 
   props: {
+    baseStyles: {
+      type: Object,
+      default: {}
+    },
     title: {
       type: String,
       default: undefined
@@ -782,7 +788,7 @@ export default {
         this.$confirm(text)
           .then((res) => {
             this.visible = false
-          })      
+          })
       } else {
         this.visible = false
       }

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

@@ -101,7 +101,18 @@
             :edit="true"
             :order-item-a="order.orderItemVOList[$index]"
             :order-item-b="orderItemList[$index]"
-            :title="$t('修改')"
+            :title="$t('修改入仓信息')"
+            :order="order"
+            :is-shipment="isShipment"
+            @close="getList"
+          ></warehouse>
+          <warehouse
+            v-if="isEdit"
+            :edit="true"
+            :order-item-a="order.orderItemVOList[$index]"
+            :order-item-b="orderItemList[$index]"
+            :base-styles="baseStyles"
+            :title="$t('修改储位和影像')"
             :order="order"
             :is-shipment="isShipment"
             @close="getList"
@@ -453,6 +464,9 @@ export default {
           },
         ],
       },
+      baseStyles: {
+        pointerEvents: 'none'
+      },
     };
   },