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

src/views/ecw/customerComplaint/index.vue

@@ -31,6 +31,12 @@
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
+      <el-form-item label="登记客服">
+        <el-select v-model="queryParams.adminId" :placeholder="$t('请选择客户经理')">
+          <el-option v-for="item in serviceUserList"
+                     :key="item.id" :label="item.nickname" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -299,6 +305,7 @@ import { DICT_TYPE, getDictDataLabel, getDictDatas } from '@/utils/dict'
 import { getBillNoSearch, getOrderNoSearch } from '@/api/ecw/order'
 import customerSelect from '@/views/ecw/customer/customerSelect'
 import { getCurrencyPage } from "@/api/ecw/currency";
+import {listServiceUser} from "@/api/system/user";
 
 export default {
   name: "CustomerComplaint",
@@ -376,10 +383,14 @@ export default {
         page: 1,
         rows: 20,
       },
-      currencyList:[]
+      currencyList:[],
+    serviceUserList:[]
     };
   },
   created() {
+    listServiceUser().then(r => {
+      this.serviceUserList = r.data
+    })
     this.getList();
      getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
 
@@ -459,6 +470,7 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams.adminId = null;
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/productAttr/edit.vue

@@ -180,7 +180,7 @@ export default {
           type: 'warning'
         }).then(() => {
           this.form.priceLineCount = val.id;
-          this.lineNum = val.priceStepClearanceCount;
+          this.lineNum = val.priceLineCount;
           this.form.productTemplateId = val.id;
           this.isCopyProductPriceTemplate = true;
           copy()

src/views/member/user/index.vue

@@ -31,7 +31,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
-        <el-button :loading="exportLoading" type="primary" @click="exportFn">{{$t('导 出')}}</el-button>
+        <el-button v-has-permi="['member:export']" :loading="exportLoading" type="primary" @click="exportFn">{{$t('导 出')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -88,11 +88,11 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope" >
-          <el-button size="mini" type="text"  @click="guarantee(scope.row)">{{$t('保函/证书')}}</el-button>
-          <el-button size="mini" type="text"  @click="operationLogFn(scope.row)">{{$t('操作日志')}}</el-button>
-          <el-button size="mini" type="text"  @click="identityFn(scope.row , '1')">{{$t('身份证')}}</el-button>
-          <el-button  size="mini" type="text"  @click="identityFn(scope.row, '2')">{{$t('营业执照')}}</el-button>
-          <el-button  size="mini" type="text" @click="deleteFn(scope.row)">{{$t('删 除')}}</el-button>
+          <el-button v-has-permi="['member:certificate']" size="mini" type="text"  @click="guarantee(scope.row)">{{$t('保函/证书')}}</el-button>
+            <el-button v-has-permi="['member:log']" size="mini" type="text"  @click="operationLogFn(scope.row)">{{$t('操作日志')}}</el-button>
+          <el-button v-has-permi="['member:id-card']" size="mini" type="text"  @click="identityFn(scope.row , '1')">{{$t('身份证')}}</el-button>
+          <el-button v-has-permi="['member:business-license']"  size="mini" type="text"  @click="identityFn(scope.row, '2')">{{$t('营业执照')}}</el-button>
+          <el-button v-has-permi="['member:delete']" size="mini" type="text" @click="deleteFn(scope.row)">{{$t('删 除')}}</el-button>
         </template>
       </el-table-column>
     </el-table>