Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/regError.vue

@@ -27,12 +27,12 @@
         <userSelect v-model="errorObj.notifyUsers" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" multiple />
       </el-form-item>
 
-      <!-- <el-form-item :label="$t('是否更新订单状态')">
-        <el-radio-group v-model="errorObj.orderStatus">
+      <el-form-item :label="$t('是否更新订单状态')">
+        <el-radio-group v-model="errorObj.updateStatus">
           <el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('中文内容')">
+      <!-- <el-form-item :label="$t('中文内容')">
         <el-input v-model="errorObj.contentZh" type="textarea" rows="2" :placeholder="$t('请输入中文内容')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('英文内容')">

src/views/ecw/box/shippingAir/nodePage/subMaterial.vue

@@ -140,7 +140,7 @@ export default {
       this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookAirInfo?.sono||undefined)
       this.$set(this.subMaterialObj,'blMblNo',this.shipmentObj.bookAirInfo?.blNo||undefined)
       this.$set(this.subMaterialObj,'markNo',"N/M")
-      this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookAirInfo?.bigPortId||undefined)
+      this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookAirInfo?.departurePortId||undefined)
       this.$set(this.subMaterialObj,'shipCompanyId',Number(this.shipmentObj.bookAirInfo?.shipCompanyType)||undefined)
       this.$set(this.subMaterialObj,'destPortId',this.shipmentObj.bookAirInfo?.destPortId||undefined)
       this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)

src/views/ecw/deptTarget/myAchievement.vue

@@ -48,19 +48,19 @@
          <el-form-item :label="$t('联系方式')" prop="key">
            <el-input v-model="queryParams.phoneNew" :placeholder="$t('请输入联系方式')" clearable/>
          </el-form-item>
-        <el-form-item :label="$t('客户经理')" prop="customerService">
-           <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
+        <el-form-item :label="$t('客户经理')" prop="userId">
+           <el-select clearable  v-model="queryParams.userId" :placeholder="$t('请选择客户经理')" clearable size="small">
              <el-option v-for="dict in customerServiceList"
                         :key="dict.id" :label="dict.nickname" :value="dict.id"/>
            </el-select>
          </el-form-item>
-         <el-form-item :label="$t('始发仓')" prop="destinationId">
-            <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发仓')" clearable>
+         <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
+            <el-select v-model="queryParams.startWarehouseId" :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="destinationId">
-            <el-select :multiple="true" v-model="queryParams.destinationId" multiple :placeholder="$t('请选择目的仓')" clearable>
+          <el-form-item :label="$t('目的仓')" prop="destWarehouseIdArr">
+            <el-select :multiple="true" v-model="queryParams.destWarehouseIdArr" multiple :placeholder="$t('请选择目的仓')" clearable>
               <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -167,7 +167,7 @@
                 tableList: [],
                 // 弹出层标题
                 title: "",
-              dateFilter:[],
+                dateFilter:[],
                 detail: {
                     deptName: null,
                     targetType: null,
@@ -256,6 +256,9 @@
             listServiceUser().then(r=>{
               this.customerServiceList = r.data;
             })
+            getWarehouseList().then(res => {
+              this.warehouseList = res.data
+            })
         },
         methods: {
             getChannelList() {
@@ -295,8 +298,12 @@
             /** 查询列表 */
             getList() {
                 this.loading = true;
+                const params = {...this.queryParams}
+                if(params.destWarehouseIdArr?.length){
+                  params.destWarehouseIds = params.destWarehouseIdArr.join(',')
+                }
                 // 执行查询
-              myAchievementByPage(this.queryParams).then(response => {
+              myAchievementByPage(params).then(response => {
                     this.list = response.data.myAchievementDtos.list;
                     this.total = response.data.myAchievementDtos.total;
                     this.myAchievementData = response.data

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -48,19 +48,19 @@
          <el-form-item :label="$t('联系方式')" prop="key">
            <el-input v-model="queryParams.phoneNew" :placeholder="$t('请输入联系方式')" clearable/>
          </el-form-item>
-        <el-form-item :label="$t('客户经理')" prop="customerService">
-           <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
+        <el-form-item :label="$t('客户经理')" prop="userId">
+           <el-select clearable  v-model="queryParams.userId" :placeholder="$t('请选择客户经理')" clearable size="small">
              <el-option v-for="dict in customerServiceList"
                         :key="dict.id" :label="dict.nickname" :value="dict.id"/>
            </el-select>
          </el-form-item>
-         <el-form-item :label="$t('始发仓')" prop="destinationId">
-            <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发仓')" clearable>
+         <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
+            <el-select v-model="queryParams.startWarehouseId" :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="destinationId">
-            <el-select :multiple="true" v-model="queryParams.destinationId" multiple :placeholder="$t('请选择目的仓')" clearable>
+          <el-form-item :label="$t('目的仓')" prop="destWarehouseIdArr">
+            <el-select :multiple="true" v-model="queryParams.destWarehouseIdArr" multiple :placeholder="$t('请选择目的仓')" clearable>
               <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -196,6 +196,7 @@
                     transportType: null,
                     shippingChannel: null,
                   endStartTime: null,
+                  destWarehouseIdArr:[]
                 },
                 tableQueryParams: {
                     pageNo: 1,
@@ -252,6 +253,9 @@
             listServiceUser().then(r=>{
               this.customerServiceList = r.data;
             })
+            getWarehouseList().then(res => {
+              this.warehouseList = res.data
+            })
         },
         methods: {
             getChannelList() {
@@ -291,8 +295,12 @@
             /** 查询列表 */
             getList() {
                 this.loading = true;
+              const params = {...this.queryParams}
+              if(params.destWarehouseIdArr?.length){
+                params.destWarehouseIds = params.destWarehouseIdArr.join(',')
+              }
                 // 执行查询
-              myDeptAchievementByPage(this.queryParams).then(response => {
+              myDeptAchievementByPage(params).then(response => {
                     this.list = response.data.myAchievementDtos.list;
                     this.total = response.data.myAchievementDtos.total;
                     this.myAchievementData = response.data

src/views/ecw/order/penddingList.vue

@@ -435,7 +435,7 @@ export default {
     },
     // 批量可出
     batchCanShipment(){
-      let orderNo = this.multipleSelection.map(item => item.orderNo).join(',')
+      let orderNo = this.multipleSelection.map(item => item.orderNo).join(', ')
       this.$confirm(this.$t(`您确定要将订单{orderNo}设置为可出吗？`, {orderNo})).then(() =>{
         return batchCanShipment(this.ids)
       }).then(res =>{