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

src/router/index.js

@@ -255,7 +255,7 @@ export const constantRoutes = [
         path: '/customerCommissionInfo/:dictId(\\d+)',
         component: (resolve) => require(['@/views/ecw/customerCommissionInfo/index'], resolve),
         name: 'customerCommissionInfo',
-        meta: {title: '佣金详情', icon: '', activeMenu: '/customer/customerCommissionInfo'}
+        meta: {title: '佣金设置', icon: '', activeMenu: '/customer/customerCommissionInfo'}
       },
       {
         path: 'edit/:customerId(\\d+)',
@@ -306,7 +306,7 @@ export const constantRoutes = [
         props: true,
         name: 'discount1',
         meta: {title: '订单折扣申请', icon: '', activeMenu: '/order/index'}
-      }, 
+      },
       {
         path: 'speciallight/:orderId(\\d+)',
         component: (resolve) => import('@/views/ecw/order/special/light'),

src/views/ecw/customer/index.vue

@@ -19,7 +19,7 @@
         <el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
       </el-form-item>
       <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  multiple v-model="queryParams.type"></dict-selector>
+        <dict-selector  :type="DICT_TYPE.CUSTOMER_TYPE"   v-model="queryParams.type"></dict-selector>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" prop="customerService">
         <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
@@ -34,7 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('国家')" prop="source">
-        <el-select clearable  v-model="form.country" :placeholder="$t('请选择国家')">
+        <el-select clearable  v-model="queryParams.country" :placeholder="$t('请选择国家')">
           <el-option v-for="dict in countryList"
                      :key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
         </el-select>
@@ -50,7 +50,7 @@
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
-        <el-select clearable  v-model="form.level" >
+        <el-select clearable  v-model="queryParams.creditLevel" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
         </el-select>
       </el-form-item>
@@ -71,7 +71,7 @@
                    v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
       </el-col>
       <el-col :span="1.5" >
-        <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="transferShow = true;" :loading="exportLoading"
+        <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="transferShow = true;"
                    v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -529,6 +529,8 @@ export default {
         customerService: null,
         status: null,
         department: null,
+        creditLevel:null,
+        country:null,
       },
       // 表单参数
       form: {},
@@ -651,6 +653,19 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        number: null,
+        name: null,
+        level: null,
+        source: null,
+        customerService: null,
+        status: null,
+        department: null,
+        creditLevel:null,
+        country:null,
+      }
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/customerCommissionInfo/index.vue

@@ -4,7 +4,7 @@
       <el-card class="box-card" style="padding: 10px">
         <div slot="header" class="clearfix">
           <el-row>
-            <el-col :span="5">
+            <el-col :span="8">
               <el-form-item :label="$t('客户名称')" prop="customerId">
               <div style="display: flex">
                 <el-input readonly="readonly"   :placeholder="$t('请输入选择客户')" v-model="customerName"></el-input>

src/views/ecw/customerConfirm/index.vue

@@ -19,7 +19,7 @@
         <el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
       </el-form-item>
       <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  multiple v-model="queryParams.type"></dict-selector>
+        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"   v-model="queryParams.type"></dict-selector>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" prop="customerService">
         <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
@@ -50,7 +50,7 @@
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
-        <el-select clearable  v-model="form.level" >
+        <el-select clearable  v-model="queryParams.creditLevel" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
         </el-select>
       </el-form-item>
@@ -368,6 +368,8 @@ export default {
         customerService: null,
         status: null,
         department: null,
+        creditLevel:null,
+        country:null,
       },
       // 表单参数
       form: {},
@@ -483,6 +485,19 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        number: null,
+        name: null,
+        level: null,
+        source: null,
+        customerService: null,
+        status: null,
+        department: null,
+        creditLevel:null,
+        country:null,
+      }
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/customerToBeAssigned/index.vue

@@ -20,7 +20,7 @@
         <el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
       </el-form-item>
       <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  multiple v-model="queryParams.type"></dict-selector>
+        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  v-model="queryParams.type"></dict-selector>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" prop="customerService">
         <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
@@ -35,7 +35,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('国家')" prop="source">
-        <el-select clearable  v-model="form.country" :placeholder="$t('请选择国家')">
+        <el-select clearable  v-model="queryParams.country" :placeholder="$t('请选择国家')">
           <el-option v-for="dict in countryList"
                      :key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
         </el-select>
@@ -51,7 +51,7 @@
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
-        <el-select clearable  v-model="form.level" >
+        <el-select clearable  v-model="queryParams.creditLevel" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
         </el-select>
       </el-form-item>
@@ -73,7 +73,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-col :span="1.5" >
-          <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="batchTransferShow = true;" :loading="exportLoading"
+          <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="batchTransferShow = true;"
                      v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
         </el-col>
       </el-col>
@@ -193,6 +193,8 @@ export default {
         customerService: null,
         status: null,
         department: null,
+        creditLevel:null,
+        country:null,
       },
       // 表单参数
       form: {},
@@ -312,6 +314,19 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        number: null,
+        name: null,
+        level: null,
+        source: null,
+        customerService: null,
+        status: null,
+        department: null,
+        creditLevel:null,
+        country:null,
+      }
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/myCustomerService/index.vue

@@ -20,7 +20,7 @@
         <el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
       </el-form-item>
       <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  multiple v-model="queryParams.type"></dict-selector>
+        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  v-model="queryParams.type"></dict-selector>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" prop="customerService">
         <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
@@ -35,7 +35,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('国家')" prop="source">
-        <el-select clearable  v-model="form.country" :placeholder="$t('请选择国家')">
+        <el-select clearable  v-model="queryParams.country" :placeholder="$t('请选择国家')">
           <el-option v-for="dict in countryList"
                      :key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
         </el-select>
@@ -51,7 +51,7 @@
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
-        <el-select clearable  v-model="form.level" >
+        <el-select clearable  v-model="queryParams.creditLevel" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
         </el-select>
       </el-form-item>
@@ -179,6 +179,8 @@ export default {
         customerService: null,
         status: null,
         department: null,
+        creditLevel:null,
+        country:null,
       },
       // 表单参数
       form: {},
@@ -299,6 +301,19 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        number: null,
+        name: null,
+        level: null,
+        source: null,
+        customerService: null,
+        status: null,
+        department: null,
+        creditLevel:null,
+        country:null,
+      }
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/oceanCustomer/index.vue

@@ -20,7 +20,7 @@
         <el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
       </el-form-item>
       <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  multiple v-model="queryParams.type"></dict-selector>
+        <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"   v-model="queryParams.type"></dict-selector>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" prop="customerService">
         <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
@@ -35,7 +35,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('国家')" prop="source">
-        <el-select clearable  v-model="form.country" :placeholder="$t('请选择国家')">
+        <el-select clearable  v-model="queryParams.country" :placeholder="$t('请选择国家')">
           <el-option v-for="dict in countryList"
                      :key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
         </el-select>
@@ -51,7 +51,7 @@
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
-        <el-select clearable  v-model="form.level" >
+        <el-select clearable  v-model="queryParams.creditLevel" >
           <el-option  v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
         </el-select>
       </el-form-item>
@@ -295,6 +295,19 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        number: null,
+        name: null,
+        level: null,
+        source: null,
+        customerService: null,
+        status: null,
+        department: null,
+        creditLevel:null,
+        country:null,
+      }
       this.handleQuery();
     },
     /** 新增按钮操作 */

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

@@ -586,7 +586,7 @@ export default {
             }
             return orderWarehouseIn({
               ...this.form1,
-              brandType: this.form1.brand ? 1 : 0,
+              brandType: this.warehousing.brandType,
               orderId: this.warehousing.orderId,
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
@@ -616,7 +616,7 @@ export default {
               // 入仓修改
               return orderWarehouseInUpdateApply({
                 ...this.form,
-                brandType: this.form.brand ? 1 : 0,
+                brandType: this.warehousing.brandType,
                 orderId: this.warehousing.orderId,
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,
@@ -643,7 +643,7 @@ export default {
               // 首次入仓
               return orderWarehouseIn({
                 ...this.form,
-                brandType: (this.form.brand && this.form.brand !== '0') ? 1 : 0,
+                brandType: this.warehousing.brandType,
                 orderId: this.warehousing.orderId,
                 orderItemId: this.warehousing.orderItemId,
                 orderNo: this.warehousing.orderNo,