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

src/api/ecw/customer.js

 import request from '@/utils/request'
+import query from "@/views/ecw/customer/query";
 
 // 创建客户
 export function createCustomer(data) {
@@ -104,9 +105,6 @@ export function handOverCustomer(data) {
     url: '/ecw/customer/handOver',
     method: 'put',
     data: data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-    }
     })
 }
 
@@ -120,10 +118,14 @@ export function getPublicList(query) {
 }
 
 //捞取
-export function setFishing(data){
+export function setFishing(query){
   return request({
-    url:'/ecw/customer/catch-open-sea-customer?id='+data.id,
+    url:'/ecw/customer/catch-open-sea-customer',
     method:'put',
+    params:query,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
   })
 }
 //待分配 客户列表

src/components/Ueditor/index.vue

@@ -30,7 +30,7 @@
                     autoHeightEnabled: false,
                     initialFrameHeight: 300,
                     initialFrameWidth: '100%',
-                    serverUrl: process.env.VUE_APP_BASE_API + "/admin-api/ecw/lading-template/editor?api_token=" +getToken().replace("Bearer ",""),
+                    serverUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/editor?api_token=" +getToken().replace("Bearer ",""),
                 }
             }
         },

src/views/ecw/customer/index.vue

@@ -73,17 +73,18 @@
           <dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
         </template>
       </el-table-column>
-      <el-table-column label="跟进客服" align="center" prop="customerService">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.customerService" />
-        </template>
+      <el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
       <el-table-column label="客户状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="部门" align="center" prop="department" />
+      <el-table-column label="部门" align="center" prop="department">
+        <template v-slot:default="scope">
+          {{scope.row.department}}
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -468,6 +469,7 @@ import upload from '@/components/ImageUpload'
 import {getNodeList} from "@/api/ecw/node"
 import CustomerFollowList from "@/components/CustomerFollowList"
 import customerComplaints from "@/components/customerComplaints"
+import {listServiceUser} from "@/api/system/user";
 
 export default {
   name: "Customer",
@@ -525,6 +527,7 @@ export default {
       nodeList: [],
       showLine: false,
       customerId:undefined,
+      customerServiceList:[]
     };
   },
   created() {
@@ -532,8 +535,20 @@ export default {
     // getNodeList().then(r => {
     //   this.nodeList = r.data
     // })
+    listServiceUser().then(r=>{
+      console.log(r,'客服');
+      this.customerServiceList = r.data;
+    })
   },
   methods: {
+    customerServiceFn(val){
+      if(this.customerServiceList.length > 0){
+        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
+        return index !== -1  ? this.customerServiceList[index]?.nickname :''
+      }else {
+        return ''
+      }
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/offer/special.vue

@@ -49,7 +49,7 @@
           prop="address"
           label="操作">
           <template v-slot="{row}">
-          <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']" @click="$router.push(`'/offer/discount?offerId=${row.offerId}&offerProdId=${row.offerProdId}`)">优惠申请</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']" @click="$router.push(`/offer/discount?offerId=${row.offerId}&offerProdId=${row.offerProdId}`)">优惠申请</el-button>
 <!--            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']">佣金规则</el-button>-->
 <!--            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']">管理折扣</el-button>-->
           </template>

src/views/system/myInternalMessage/index.vue

@@ -71,7 +71,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
 
     <el-dialog
@@ -132,8 +132,8 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         fromId: null,
         title: null,
         content: null,