Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/order/edit.vue

@@ -324,13 +324,14 @@
                     />
                 </el-form-item>
             </div>
+            <div class="form-section" v-if="form.customsType==2">
+                <span style="color:red;font-size:14px">{{$t('报关退税，请备齐资料。')}}</span>
+             </div>
             <div class="form-section" v-if="collectionProxy">
                 <el-form-item :label="$t('是否代收货款')" prop="isCollection">
                     <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" :disabled="false" />
                 </el-form-item>
-                <div class="form-section" v-if="form.customsType==2">
-                    <span style="color:red;font-size:14px">{{$t('报关退税，请备齐资料。')}}</span>
-                 </div>
+
                 <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
                 <el-form-item :label="$t('代收货款金额')" v-if="collectionProxy && form.isCollection" prop="collectionProxy" class="ml-20">
                     <el-input type="number" v-model="form.collectionProxy" class="w-200 mr-10"  :disabled="false"></el-input>

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

@@ -41,11 +41,12 @@
           <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.orderStatus"
             @keyup.enter.native="handleQuery" clearable />
         </el-form-item>
-<!--        <el-form-item :label="$t('跟进客服')" prop="destinationId">
-          <el-select v-model="queryParams.destinationId" multiple :placeholder="$t('请选择目的仓')" clearable>
-            <el-option v-for="item in followUserList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+        <el-form-item :label="$t('跟进客服')" prop="salesmanId">
+          <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择')">
+            <el-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
+
       </el-row>
       <el-row>
         <el-form-item :label="$t('控货')+':'">
@@ -86,7 +87,7 @@
              <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :clearable="true" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
         </el-form-item>
         <el-form-item :label="$t('客户经理')+':'">
-         <el-select v-model="queryParams.salesmanId" multiple  :placeholder="$t('请选择跟进业务')" clearable>
+         <el-select v-model="queryParams.customerIds" multiple  :placeholder="$t('请选择客户经理')" clearable>
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>
         </el-form-item>
@@ -243,7 +244,7 @@ import {getOrderExceptionPage, exportExcel,getStatistics} from "@/api/ecw/orderE
 import {getTradeCityList} from '@/api/ecw/region'
 import {DICT_TYPE} from  '@/utils/dict'
 // import { userList } from "@/api/system/user"
-import {listServiceUser} from "@/api/system/user"
+import {listServiceUser,userList} from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
 import {getWarehouseList} from '@/api/ecw/warehouse'
@@ -272,7 +273,8 @@ export default {
       },
        tradeCityList:[],
        warehouseList:[],
-       totalData:{}
+       totalData:{},
+       followUpList:[],
     };
   },
   activated(){
@@ -284,6 +286,9 @@ export default {
     getTradeCityList().then(res => this.tradeCityList = res.data)
     listServiceUser().then(r => {
       this.creatorData = r.data
+    })
+    userList('documentary customer service').then(r => {
+      this.followUpList = r.data;
     })
      getWarehouseList().then(res => this.warehouseList = res.data)
     // userList('salesman').then(res =>this.creatorData = res.data)
@@ -324,7 +329,8 @@ export default {
       this.queryParams = {
         page: 1,
         rows: 10,
-      };
+      }
+      this.getList()
     },
     importCityName(id){
         return this.tradeCityList.filter(item => item.id == id)

src/views/ecw/order/special/Discounts.vue

@@ -16,24 +16,24 @@
           </template>
         </el-table-column>
        <el-table-column :label="$t('填单货物属性')" align="center">
-          <template slot-scope="scope">
-            {{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="order.orderItemVOList[scope.$index].brandType" /><br>
-            {{$t('箱数')}}：{{ order.orderItemVOList[scope.$index].num }}<br>
-            {{$t('体积')}}：{{ order.orderItemVOList[scope.$index].volume }}m³<br>
-            {{$t('重量')}}：{{ order.orderItemVOList[scope.$index].weight }}Kg
+          <template v-slot="{row}">
+            {{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" /><br>
+            {{$t('箱数')}}：{{ row.num }}<br>
+            {{$t('体积')}}：{{ row.volume }}m³<br>
+            {{$t('重量')}}：{{ row.weight }}Kg
           </template>
         </el-table-column>
         <el-table-column
           prop="address"
           :label="$t('入库货物属性')">
-          <template slot-scope="scope">
-            <template v-if="order.orderItemVOList[scope.$index].warehouseInInfoVO">
+          <template v-slot="{row}">
+            <template v-if="row.warehouseInInfoVO">
               {{$t('品牌')}}：
-              <template v-if="order.orderItemVOList[scope.$index].brandName">{{order.orderItemVOList[scope.$index].brandName}}</template>
-              <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="order.orderItemVOList[scope.$index].feeType" /><br>
-              {{$t('箱数')}}：{{ order.orderItemVOList[scope.$index].warehouseInInfoVO.cartonsNum }}<br>
-              {{$t('体积')}}：{{ order.orderItemVOList[scope.$index].warehouseInInfoVO.volume }}m³<br>
-              {{$t('重量')}}：{{ order.orderItemVOList[scope.$index].warehouseInInfoVO.weight }}Kg
+              <template v-if="row.brandName">{{row.brandName}}</template>
+              <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /><br>
+              {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
+              {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
+              {{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg
             </template>
             <span v-else>{{$t('暂时没有入库信息')}}</span>
           </template>
@@ -90,6 +90,7 @@ export default {
   name: "OrderSpecialDiscount",
   props: {
     order: Object,
+    ids:Array,
     applyType:{ // // 31是优惠申请32是管理折扣
       type: Number,
       default: 31
@@ -175,6 +176,39 @@ export default {
     getOrderSpecial(){
       getOrderSpecialBatch(this.order.orderId, this.applyType).then(r => {
         this.form = r.data
+        var volist = r.data.batchApplyOrderItemDetailVOList
+        if(this.form.applyStatus==1){
+          this.form.batchApplyOrderItemDetailVOList.map(v=>{
+            var item = this.order.orderItemVOList.find(vs=>vs.orderItemId==v.orderItemId)
+            if(item){
+              v.brandType = item.brandType
+              v.num = item.num
+              v.volume = item.volume
+              v.weight = item.weight
+              v.warehouseInInfoVO = item.warehouseInInfoVO
+            }
+          })
+        }else{
+          this.form.batchApplyOrderItemDetailVOList = []
+          var list = []
+          console.log(this.ids)
+          volist.map(v=>{
+            console.log(v.orderItemId)
+            if(this.ids.indexOf(v.orderItemId)>-1){
+              var item = this.order.orderItemVOList.find(vs=>vs.orderItemId==v.orderItemId)
+              if(item){
+                v.brandType = item.brandType
+                v.num = item.num
+                v.volume = item.volume
+                v.weight = item.weight
+                v.warehouseInInfoVO = item.warehouseInInfoVO
+              }
+              list.push(v)
+            }
+          })
+          console.log(list)
+          this.$set(this.form,'batchApplyOrderItemDetailVOList',list)
+        }
       })
     },
     /* getProductTypeNameById(id){

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

@@ -5,8 +5,8 @@
       <!-- 列表 -->
       <div class="order-header">
         <span style="font-size: 15px;">{{$t('订单号')}}：{{ order.orderNo }}</span>
-        <el-button v-hasPermi="['ecw:order:reduce']" type="primary" @click="showDiscountsIds=order.orderId" >{{$t('批量特价申请')}}</el-button>
-        <el-button v-hasPermi="['ecw:order:commission']" type="primary" @click="showAllowanceIds=order.orderId" >{{$t('批量管理折扣')}}</el-button>
+        <el-button v-hasPermi="['ecw:order:reduce']" type="primary" @click="moreApply(1)" >{{$t('批量特价申请')}}</el-button>
+        <el-button v-hasPermi="['ecw:order:commission']" type="primary" @click="moreApply(2)" >{{$t('批量管理折扣')}}</el-button>
       </div>
 
       <el-table v-loading="loading" :data="order.orderItemVOList" @selection-change="handleSelectionChange">
@@ -128,9 +128,9 @@
     <!-- 重泡货优惠 -->
     <preferential v-if="!!showPreferentialType" :applyType="showPreferentialType" :order="order" @close="showPreferentialType=null" @success="onPreferentialSuccess" />
   <!-- 批量优惠申请 -->
-  <discounts v-if="!!showDiscountsIds" :order="order"  @close="showDiscountsIds=null" @success="onDiscountsSuccess" />
+  <discounts v-if="!!showDiscountsIds" :order="order" :ids="ids"  @close="showDiscountsIds=null" @success="onDiscountsSuccess" />
   <!-- 批量管理折扣 -->
-  <discounts v-if="!!showAllowanceIds" :order="order"  @close="showAllowanceIds=null" :applyType="32" @success="onDiscountsSuccess" />
+  <discounts v-if="!!showAllowanceIds" :order="order" :ids="ids" @close="showAllowanceIds=null" :applyType="32" @success="onDiscountsSuccess" />
   <!-- 佣金规则 -->
   </div>
 </template>
@@ -243,6 +243,17 @@ export default {
       this.multipleSelection = selection
       this.ids = selection.map(item => item.orderItemId)
     },
+    moreApply(type){
+      if(!this.ids||this.ids.length==0){
+        this.$message.error(this.$t('请选择商品'))
+        return
+      }
+      if(type==1){
+        this.showDiscountsIds = true
+      }else{
+        this.showAllowanceIds = true
+      }
+    }
   },
   computed: {
     currencyMap(){

src/views/ecw/supplier/edit.vue

@@ -950,9 +950,9 @@ export default {
         }
         
         let data = JSON.parse(JSON.stringify(this.formData))
+        data.dockIds = data.dockIds?.toString()
         if(this.formData.areaType == 0) {
           data.resourceVO.shipCompany = data.resourceVO.shipCompany?.toString()
-          data.dockIds = data.dockIds?.toString()
           data.resourceVO.ports = data.resourceVO.ports?.toString()
           data.resourceVO.bookCompany = data.resourceVO.bookCompany?.toString()
           data.resourceVO.trailerCompany = data.resourceVO.trailerCompany?.toString()