客户添加操作日志，以及客户列表修改

src/views/ecw/customer/customerLog.vue

 <template>
- <div style="padding: 20px">
-   <el-card :title="'客户操作日志'">
+ <div :style="{padding:customerId ? '0px' : '20px'}">
+   <el-card style="margin-bottom: 30px"  v-show="!customerId" :title="'客户操作日志'">
      <el-descriptions border :column="3">
-       <el-descriptions-item label="订单编号"><el-input v-model="queryForm.orderNo"></el-input></el-descriptions-item>
-       <el-descriptions-item label="操作人"><el-input v-model="queryForm.operator"></el-input></el-descriptions-item>
-       <el-descriptions-item label="老客户经理"><el-input v-model="queryForm.oldCustomerService"></el-input></el-descriptions-item>
-       <el-descriptions-item label="客户编号"><el-input v-model="queryForm.number"></el-input></el-descriptions-item>
-       <el-descriptions-item label="新客户经理"><el-input v-model="queryForm.newCustomerService"></el-input></el-descriptions-item>
-       <el-descriptions-item label="客户名称"><el-input v-model="queryForm.name"></el-input></el-descriptions-item>
+       <el-descriptions-item label="订单编号"><el-input :placeholder="$t('请输入订单编号')" v-model="queryForm.orderNo"></el-input></el-descriptions-item>
+       <el-descriptions-item label="操作人">
+         <el-select filterable  v-model="queryForm.operator">
+           <el-option v-for="(item) in allSimplList" :value="item.id" :label="item.nickname" :key="item.id"></el-option>
+         </el-select>
+       </el-descriptions-item>
+       <el-descriptions-item label="老客户经理">
+         <el-select filterable  v-model="queryForm.oldCustomerService">
+           <el-option v-for="(item) in customerServiceList" :value="item.id" :label="item.nickname" :key="item.id"></el-option>
+         </el-select>
+<!--         <el-input v-model="queryForm.oldCustomerService"></el-input>-->
+       </el-descriptions-item>
+       <el-descriptions-item label="客户编号"><el-input :placeholder="$t('请输入客户编号')" v-model="queryForm.number"></el-input></el-descriptions-item>
+       <el-descriptions-item label="新客户经理">
+         <el-select clearable filterable  v-model="queryForm.newCustomerService">
+           <el-option v-for="(item) in customerServiceList" :value="item.id" :label="item.nickname" :key="item.id"></el-option>
+         </el-select>
+<!--         <el-input v-model="queryForm.newCustomerService"></el-input>-->
+       </el-descriptions-item>
+       <el-descriptions-item label="客户名称"><el-input :placeholder="$t('请输入客户名称')" style="width: 45%;" v-model="queryForm.name"></el-input></el-descriptions-item>
        <el-descriptions-item label="操作类型">
          <dict-selector  :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" v-model="queryForm.operateType">
 
@@ -41,18 +55,18 @@
        </el-descriptions-item>
      </el-descriptions>
    </el-card>
-   <el-table style="margin-top: 30px" :data="list">
+   <el-table :data="list">
      <el-table-column label="订单编号" prop="orderNo"></el-table-column>
      <el-table-column label="客户编号" prop="number"></el-table-column>
      <el-table-column label="客户名称" prop="name"></el-table-column>
      <el-table-column label="新客户经理" prop="newCustomerService">
        <template v-slot="{row}">
-         {{row.newCustomerService ? row.newCustomerService : '/'}}
+         {{row.newCustomerService ? operatorFn(row.newCustomerService) : '/'}}
        </template>
      </el-table-column>
      <el-table-column label="老客户经理" prop="oldCustomerService">
        <template v-slot="{row}">
-         {{row.oldCustomerService ? row.oldCustomerService : '/'}}
+         {{row.oldCustomerService ? operatorFn(row.oldCustomerService) : '/'}}
        </template>
      </el-table-column>
      <el-table-column label="操作类型">
@@ -75,7 +89,7 @@
          {{parseTime(row.oldEstimateEnterOpenSeaTime)}}
        </template>
      </el-table-column>
-     <el-table-column label="操作">
+     <el-table-column  label="操作">
        <template v-slot="{row}">
          <el-button type="text" @click="getCustomerLog(row.id)">
            详情
@@ -130,9 +144,16 @@ import {getCustomerOperatelog, getCustomerOperatelogPage} from "@/api/ecw/custom
 import {parseTime} from "../../../utils/ruoyi";
 import Template from "@/views/cms/template/index.vue";
 import {DICT_TYPE} from "@/utils/dict";
-import {listAllSimpl} from "@/api/system/user";
+import {listAllSimpl, listServiceUser} from "@/api/system/user";
+import {number} from "echarts/lib/export";
 export default {
   name: "customerLog",
+  props:{
+    customerId:{
+      type:[Number,String],
+      default:null,
+    }
+  },
   computed: {
     DICT_TYPE() {
       return DICT_TYPE
@@ -150,6 +171,9 @@ export default {
     listAllSimpl().then(r => {
       this.allSimplList = r.data
     })
+    listServiceUser().then(r=>{
+      this.customerServiceList = r.data;
+    })
     },
   data(){
     return {
@@ -160,7 +184,8 @@ export default {
       total:0,
       show:false,
       allSimplList:[],
-      dataLog:{}
+      dataLog:{},
+      customerServiceList:[],
     }
   },
   methods:{
@@ -173,7 +198,6 @@ export default {
         oldCustomerService:null,
         newCustomerService:null,
         operateType:null,
-
         operator:null,
         orderNo:null,
         newEstimateEnterOpenSeaTime:null,
@@ -181,6 +205,7 @@ export default {
         beginOldEstimateEnterOpenSeaTime:null,
         endNewEstimateEnterOpenSeaTime:null,
         endOldEstimateEnterOpenSeaTime:null,
+        customerId:this.customerId
       }
     },
     getList(){

src/views/ecw/customer/query.vue

@@ -427,6 +427,9 @@
            </el-table>
             <pagination @pagination="getCustomerGrade" :page.sync="getCustomerGradeFrom.pageNo" :limit.sync="getCustomerGradeFrom.pageSize"  :total="getCustomerGradeFrom.total" ></pagination>
           </el-tab-pane>
+          <el-tab-pane name="operationLog" v-if="permissions.includes('ecw:customer:operation-log')" :label="$t('操作日志')" >
+            <customer-log  :customerId="id" v-if="'operationLog' === activeName"></customer-log>
+          </el-tab-pane>
         </el-tabs>
       </el-col>
     </el-row>
@@ -485,13 +488,15 @@ import Template from "@/views/cms/template";
 import {getCreditRulePage} from "@/api/customer/creditRule";
 import {getCountry} from "@/api/ecw/country"
 import {getCurrencyList} from "@/api/ecw/currency";
+import customerLog from "@/views/ecw/customer/customerLog.vue";
 
 export default {
   name: 'query',
   components: {
     Template,
     CustomerFollow,
-    CustomerComplaint
+    CustomerComplaint,
+    customerLog,
   },
   created() {
     // 获取币种