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

src/api/ecw/customerFollow.js

@@ -37,7 +37,7 @@ export function getCustomerFollow(id) {
 // 获得跟进分页
 export function getCustomerFollowPage(query) {
   return request({
-    url: '/ecw/customer-follow/page',
+    url: '/customer/detail/infoList/followPage',
     method: 'get',
     params: query
   })

src/components/CustomerFollow/index.vue

@@ -53,7 +53,8 @@
       >
       </el-table-column>
     </el-table>
-
+    <pagination  :total="total" :page.sync="pageNo" :limit.sync="pageSize"
+                @pagination="getCustomerFollowList"/>
     <el-dialog
       append-to-body
       title="客户跟进"
@@ -154,6 +155,9 @@ export default {
         dialogVisible: false,
         form: {}
       },
+      pageNo:1,
+      pageSize:10,
+      total:10,
     }
   },
 
@@ -231,7 +235,7 @@ export default {
        this.$refs.dictMethod.changeValue(this.customerFollow.form.followMethod);
     },
     getCustomerFollowList() {
-      getCustomerFollowPage({bizId: this.id}).then(r => {
+      getCustomerFollowPage({customerId: this.customerId,pageNo:this.pageNo,pageSize:this.pageSize}).then(r => {
         this.customerFollowList = r.data.list
       })
     }

src/views/ecw/order/batchSingleApplication.vue

@@ -79,13 +79,14 @@
       <el-row style="margin-top: 30px">
         <el-col :span="8">
           <div style="text-align: right;">
-            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] && list[0].startWarehouseName ? list[0].startWarehouseName : '' }}
+            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] ? [14,16].includes(this.list[0].status) ? list[0].dstWarehouseName : list[0].startWarehouseName : '' }}
           </div>
         </el-col>
         <el-col :span="3"><div style="text-align:center">
           {{$t('调至')}}
         </div></el-col>
-        <el-col :span="8"><el-select clearable v-model="params.warehouseInId">
+        <el-col :span="8">
+          <el-select clearable v-model="params.warehouseInId">
           <el-option  v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1"  :value="item.id" :label="item.titleZh"
                      :key="index"></el-option>
         </el-select></el-col>
@@ -223,7 +224,7 @@ export default {
       getOrderPage({orderIdList: this.orderList}).then(r => {
         this.list = r.data.list
         console.log(this.list,'this.list[0].startWarehouseId');
-        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : this.list[0].startWarehouseId}).then(r => this.availableWarehouse = r.data)
+        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId :[14,16].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId }).then(r => this.availableWarehouse = r.data)
         adjustLastWithStatus({orderId:this.list[0].orderId,lang:0}).then(r =>{
           this.applyStatus = r.data
           if(r.data?.orderWarehouseAdjustBackVO?.status === 1){

src/views/ecw/order/edit.vue

@@ -783,10 +783,10 @@ export default {
 
         this.calculationPrice()
     },
-    'form.packageTypeArr'(val){
+    /* 'form.packageTypeArr'(val){
         console.log('packageType', val, val.length)
         this.$set(this.form, 'packageType', val ? val.join(',') : '')
-    },
+    }, */
     'form.isExternalWarehouse'(isExternalWarehouse){
         // 勾选外部仓则添加一个默认的，取消则删除默认的空的
         if(!isExternalWarehouse){
@@ -1067,6 +1067,7 @@ export default {
                 item.channelIds = Array.from(item.channelIdSet).join(',')
             }
         })
+        this.form.packageType = this.form.packageTypeArr.join(',')
         // 修改的提交
         if (this.form.orderNo != null) {
             let data = Object.assign({}, this.form, {

src/views/ecw/order/withdrawal.vue

@@ -21,7 +21,7 @@
       </div>
       <div>
         <el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('确定退仓')}}</el-button>
-        <el-button v-if="!isExamine" @click="$router.push({query:{id:details.formId},path:'/bpm/process-instance/detail'})" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
+        <el-button v-if="!isExamine" @click="goBpm" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
         <el-button  v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button>
         <el-button @click="$parent.show = false;">{{$t('不，再考虑考虑')}}</el-button>
       </div>
@@ -75,6 +75,10 @@ export default {
     })
   },
   methods:{
+    goBpm(){
+      this.$parent.show = false
+      this.$router.push({query:{id:this.details.formId},path:'/bpm/process-instance/detail'})
+    },
     submit(){
       this.params.orderId =  this.orderDetails.orderId;
       this.params.orderNo =this.orderDetails.orderNo;

src/views/ecw/productPrice/edit.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="readonly">
 
       <el-form-item :label="$t('商品类型')" prop="productType">
-        <el-select v-model="form.productType" :disabled="!!$route.query.ids">
+        <el-select v-model="form.productType" :disabled="!!$route.query.action">
           <el-option
             v-for="type in productTypeList"
             :key="type.id"
@@ -14,7 +14,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('商品名称')" prop="titleZh">
-        <product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.ids" />
+        <product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.action" />
       </el-form-item>
 
       <el-form-item :label="$t('英文名称')" prop="titleEn">