Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_adminUI

src/api/company/company.js

@@ -9,6 +9,14 @@ export function listCompany(query) {
   })
 }
 
+export function allList(query) {
+  return request({
+    url: '/company/company/allList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询企业详细
 export function getCompany(companyId) {
   return request({
@@ -31,7 +39,7 @@ export function resetPwd(companyId) {
     method: 'post'
   })
 }
- 
+
 
 
 // 修改企业
@@ -80,8 +88,8 @@ export function deduct(data) {
     data: data
   })
 }
- 
- 
+
+
 
 // 查询企业列表
 export function crmDayCountlist(query) {
@@ -90,4 +98,4 @@ export function crmDayCountlist(query) {
     method: 'get',
     params: query
   })
-}
+}

src/api/course/courseRedPacketLog.js

@@ -16,12 +16,12 @@ export function getCourseRedPacketLog(logId) {
     method: 'get'
   })
 }
-export function courseList() {
-  return request({
-    url: '/course/courseRedPacketLog//courseList',
-    method: 'get',
-  })
-}
+// export function courseList() {
+//   return request({
+//     url: '/course/courseRedPacketLog//courseList',
+//     method: 'get',
+//   })
+// }
 export function videoList(id) {
   return request({
     url: '/course/courseRedPacketLog/videoList/' + id,
@@ -62,3 +62,14 @@ export function exportCourseRedPacketLog(query) {
     params: query
   })
 }
+
+/**
+ * 获取课程列表
+ * @returns {*}
+ */
+export function courseList(){
+  return request({
+    url: '/course/courseTrafficLog/courseList',
+    method: 'get',
+  })
+}

src/api/store/user.js

@@ -75,3 +75,11 @@ export function listBySearch(query) {
     params: query
   })
 }
+
+export function getAllUserListLimit(query) {
+  return request({
+    url: '/company/companyUser/getAllUserListLimit',
+    method: 'get',
+    params: query
+  })
+}

src/api/user/approval.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询客户转移审批列表
+export function listApproval(query) {
+  return request({
+    url: '/system/approval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询客户转移审批详细
+export function getApproval(id) {
+  return request({
+    url: '/system/approval/' + id,
+    method: 'get'
+  })
+}
+
+// 新增客户转移审批
+export function addApproval(data) {
+  return request({
+    url: '/system/approval',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改客户转移审批
+export function updateApproval(data) {
+  return request({
+    url: '/system/approval',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户转移审批
+export function delApproval(id) {
+  return request({
+    url: '/system/approval/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出客户转移审批
+export function exportApproval(query) {
+  return request({
+    url: '/system/approval/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/course/courseTrafficLog/index.vue

@@ -6,6 +6,26 @@
           <el-option v-for="(option, index) in companyList" :key="index" :value="option.dictValue" :label="option.dictLabel"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="项目" prop="project">
+        <el-select v-model="form.project" placeholder="请选择项目" filterable clearable size="small">
+          <el-option
+            v-for="dict in projectOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="课程" prop="courseId">
+        <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
+          <el-option
+            v-for="dict in courseLists"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="年月" prop="time">
         <el-date-picker
           v-model="queryParams.time"
@@ -39,17 +59,19 @@
     <el-table border v-loading="loading" :data="courseTrafficLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司名称" align="center" prop="companyName" />
+      <el-table-column label="项目" align="center" prop="projectName" />
+      <el-table-column label="课程" align="center" prop="courseName" />
       <el-table-column label="月份" align="center" prop="month" />
       <el-table-column label="使用流量" align="center">
         <template slot-scope="scope">
           <span>{{ formatTrafficData(scope.row.totalInternetTraffic) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="费用" align="center">
-        <template slot-scope="scope">
-          <span>{{ formatTrafficMoney(scope.row.totalInternetTraffic) }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="费用" align="center">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ formatTrafficMoney(scope.row.totalInternetTraffic) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -65,8 +87,8 @@
 
 <script>
 import { listCourseTrafficLog, getCourseTrafficLog, delCourseTrafficLog, addCourseTrafficLog, updateCourseTrafficLog, exportCourseTrafficLog } from "@/api/course/courseTrafficLog";
-import { allList } from '../../../api/company/company'
-
+import {courseList} from "@/api/course/courseRedPacketLog";
+import {allList}from "@/api/company/company";
 export default {
   name: "CourseTrafficLog",
   data() {
@@ -91,6 +113,8 @@ export default {
       total: 0,
       // 短链课程流量记录表格数据
       courseTrafficLogList: [],
+      projectOptions:[],
+      courseLists:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -117,8 +141,15 @@ export default {
     };
   },
   created() {
+    courseList().then(response => {
+      this.courseLists = response.list;
+    });
+    this.getDicts("sys_course_project").then(response => {
+      this.projectOptions = response.data;
+    });
     this.getList();
     this.getAllCompany();
+
   },
   methods: {
     getAllCompany() {

src/views/course/userCourse/index.vue

@@ -124,6 +124,7 @@
     <el-table height="600" border v-loading="loading" :data="userCourseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="课程ID" align="center" prop="courseId" />
+      <el-table-column label="所属项目" align="center" prop="projectName" />
       <el-table-column label="封面图片" align="center" prop="imgUrl" width="120">
         <template slot-scope="scope">
           <el-popover
@@ -200,6 +201,18 @@
     <!-- 添加或修改课程对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-row>
+          <el-form-item label="所属项目" prop="project">
+            <el-select v-model="form.project" placeholder="请选择项目" filterable clearable size="small">
+              <el-option
+                v-for="dict in projectOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-row>
         <el-row >
           <el-col :span="8">
             <el-form-item label="课堂名称" prop="courseName">
@@ -246,7 +259,7 @@
           </el-col> -->
           <el-col :span="8">
             <el-form-item label="关联达人" prop="talentId" >
-              <el-select v-model="form.talentId" remote filterable reserve-keyword placeholder="输入手机号搜索" :remote-method="talentMethod" >
+              <el-select v-model="form.talentId" remote filterable clearable reserve-keyword placeholder="输入手机号搜索" :remote-method="talentMethod" >
                 <el-option
                   v-for="item in talentList"
                   :key="item.talentId"
@@ -274,18 +287,6 @@
           <ImageUpload v-model="form.secondImg" type="image" :num="10" :width="150" :height="150" />
         </el-form-item>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="所属项目" prop="project">
-              <el-select v-model="form.project" placeholder="请选择项目" filterable clearable size="small">
-                <el-option
-                  v-for="dict in projectOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="标签" prop="tags">
               <el-select v-model="tags" multiple placeholder="请选择标签" filterable clearable size="small">

src/views/store/storeProduct/index.vue

@@ -516,6 +516,16 @@
                   />
             </el-select>
         </el-form-item>
+        <el-form-item label="所属公司">
+          <el-select style="width: 240px" v-model="form.companyIds" multiple placeholder="请选择企业" clearable size="small" >
+            <el-option
+                    v-for="item in companyOptions"
+                    :key="item.companyId"
+                    :label="item.companyName"
+                    :value="item.companyId"
+                  />
+            </el-select>
+        </el-form-item>
         <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
           <el-input v-model="form.prescribeCode" placeholder="请输入国药准字" />
         </el-form-item>
@@ -577,6 +587,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor/wang';
 import Material from '@/components/Material'
 import singleImg from '@/components/Material/single'
+import { getCompanyList } from "@/api/company/company";
 export default {
   name: "StoreProduct",
   components: {
@@ -652,6 +663,8 @@ export default {
       isHotOptions:[],
       isShowOptions:[],
       categoryOptions:[],
+      // 企业列表
+      companyOptions:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -750,6 +763,9 @@ export default {
     getAllStoreProductRule().then(response => {
       this.ruleList =response.data;
     });
+    getCompanyList().then(response => {
+      this.companyOptions = response.data;
+    });
     this.getTreeselect();
     this.getList();
   },
@@ -1003,7 +1019,8 @@ export default {
         prescribeSpec: null,
         prescribeFactory: null,
         prescribeName: null,
-        isDisplay:"1"
+        isDisplay:"1",
+        companyIds:[]
       };
       this.resetForm("form");
       this.oneFormValidate = [
@@ -1078,6 +1095,10 @@ export default {
              that.attrs.push(data);
           });
         }
+        // 组装companyIds
+        if (response.data.companyIds != null) {
+          this.form.companyIds = response.data.companyIds.split(',').map(Number);
+        }
         setTimeout(() => {
           that.generate();
         }, 200);
@@ -1135,6 +1156,10 @@ export default {
           if(this.form.specType === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }
+          // 组装companyIds
+          if (this.form.companyIds.length != 0) {
+            this.form.companyIds = this.form.companyIds.join(',');
+          }
           addOrEdit(this.form).then(response => {
             if (response.code === 200) {
               this.msgSuccess("修改成功");

src/views/system/config/config.vue

@@ -332,6 +332,62 @@
                <el-input-number  v-model="form18.answerIntegral" :min="1"    ></el-input-number>
              </el-tooltip>
            </el-form-item>
+           <el-form-item label="通用看课域名">
+             <el-tooltip class="item" effect="dark" content="看课域名" placement="top-end">
+               <el-input style="width: 300px"  v-model="form18.realLinkDomainName"     ></el-input>
+             </el-tooltip>
+           </el-form-item>
+           <el-form-item label="注册域名">
+             <el-tooltip class="item" effect="dark" content="注册域名" placement="top-end">
+               <el-input style="width: 300px"  v-model="form18.registerDomainName" ></el-input>
+             </el-tooltip>
+           </el-form-item>
+           <el-form-item label="主域名">
+             <el-tooltip class="item" effect="dark" content="所有销售的看课二级域名根据此主域名来发放" placement="top-end">
+               <el-input style="width: 200px"  v-model="form18.courseDomainName" label="看课主域名"></el-input>
+             </el-tooltip>
+           </el-form-item>
+           <el-form-item label="看课默认线路">
+             <el-radio-group v-model="form18.defaultLine">
+               <el-radio label="0">线路一</el-radio>
+               <el-radio label="1">线路二</el-radio>
+             </el-radio-group>
+           </el-form-item>
+           <el-form-item label="网页授权域名">
+             <el-tooltip class="item" effect="dark" content="公众号网页授权域名" placement="top-end">
+               <el-input  v-model="form18.authDomainName"  ></el-input>
+             </el-tooltip>
+           </el-form-item>
+           <el-form-item label="公众号appId">
+             <el-tooltip class="item" effect="dark" content="授权公众号appId" placement="top-end">
+               <el-input  v-model="form18.mpAppId"  ></el-input>
+             </el-tooltip>
+           </el-form-item>
+
+           <el-form-item label="小程序appid">
+             <el-tooltip class="item" effect="dark" content="小程序appid" placement="top-end">
+               <el-input  v-model="form18.miniprogramAppid"  ></el-input>
+             </el-tooltip>
+           </el-form-item>
+           <el-form-item label="小程序page路径">
+             <el-tooltip class="item" effect="dark" content="小程序消息打开后的路径" placement="top-end">
+               <el-input  v-model="form18.miniprogramPage"  ></el-input>
+             </el-tooltip>
+           </el-form-item>
+
+           <el-form-item label="奖励类型">
+             <el-radio-group v-model="form18.rewardType">
+               <el-radio label="1">红包</el-radio>
+               <el-radio label="2">积分</el-radio>
+             </el-radio-group>
+           </el-form-item>
+
+           <el-form-item label="红包模式">
+             <el-radio-group v-model="form18.redPacketMode">
+               <el-radio label="1">总公司</el-radio>
+               <el-radio label="2">分公司</el-radio>
+             </el-radio-group>
+           </el-form-item>
            <div class="line"></div>
            <div style="float:right;margin-right:20px">
              <el-button type="primary" @click="submitForm18">提交</el-button>
@@ -340,9 +396,18 @@
        </el-tab-pane>
        <el-tab-pane label="红包商户配置" name="redPacket.config" >
          <el-form ref="form19" :model="form19"  label-width="150px">
+           <el-form-item   label="红包接口类型" prop="isNew">
+             <el-radio-group v-model="form19.isNew">
+               <el-radio label="0">商家转账到零钱(旧)</el-radio>
+               <el-radio label="1">商家转账(新)</el-radio>
+             </el-radio-group>
+           </el-form-item>
            <el-form-item   label="公众号appid" prop="appId">
              <el-input   v-model="form19.appId"  label="请输入appId"></el-input>
            </el-form-item>
+           <el-form-item   label="小程序appid" prop="appId">
+             <el-input   v-model="form19.miniappId"  label="请输入appId"></el-input>
+           </el-form-item>
            <el-form-item   label="商户号" prop="mchId">
              <el-input   v-model="form19.mchId"  label="请输入mchId"></el-input>
            </el-form-item>
@@ -355,6 +420,12 @@
            <el-form-item   label="apiV3密钥" prop="apiV3Key">
              <el-input   v-model="form19.apiV3Key"  label="请输入apiV3Key"></el-input>
            </el-form-item>
+           <el-form-item   label="公钥ID" prop="publicKeyId">
+             <el-input   v-model="form19.publicKeyId"  label="请输入公钥ID"></el-input>
+           </el-form-item>
+           <el-form-item   label="公钥证书" prop="publicKeyPath">
+             <el-input   v-model="form19.publicKeyPath"  label="请输入publicKeyPath"></el-input>
+           </el-form-item>
            <el-form-item   label="key路径" prop="privateKeyPath">
              <el-input   v-model="form19.privateKeyPath"  label="请输入"></el-input>
            </el-form-item>
@@ -601,14 +672,17 @@ export default {
             }
            if(key=="course.config"){
              this.configId=response.data.configId;
+             this.configKey=response.data.configKey;
              this.form18 =JSON.parse(response.data.configValue);
            }
            if(key=="redPacket.config"){
              this.configId=response.data.configId;
+             this.configKey=response.data.configKey;
              this.form19 =JSON.parse(response.data.configValue);
            }
            if(key=="store.appShow"){
              this.configId=response.data.configId;
+             this.configKey=response.data.configKey;
              this.form10 =JSON.parse(response.data.configValue);
            }
         });
@@ -688,7 +762,7 @@ export default {
       });
     },
     submitForm7(){
-      var param={configId:this.configId,configValue:JSON.stringify(this.form7)}
+      var param={configId:this.configId,configKey:this.configKey,configValue:JSON.stringify(this.form7)}
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
           this.msgSuccess("修改成功");
@@ -696,7 +770,7 @@ export default {
       });
     },
     submitForm18(){
-      var param={configId:this.configId,configValue:JSON.stringify(this.form18)}
+      var param={configId:this.configId,configKey:this.configKey,configValue:JSON.stringify(this.form18)}
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
           this.msgSuccess("修改成功");
@@ -704,7 +778,7 @@ export default {
       });
     },
     submitForm19(){
-      var param={configId:this.configId,configValue:JSON.stringify(this.form19)}
+      var param={configId:this.configId,configKey:this.configKey,configValue:JSON.stringify(this.form19)}
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
           this.msgSuccess("修改成功");
@@ -712,7 +786,7 @@ export default {
       });
     },
     submitForm10(){
-      var param={configId:this.configId,configValue:JSON.stringify(this.form10)}
+      var param={configId:this.configId,configKey:this.configKey,configValue:JSON.stringify(this.form10)}
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
           this.msgSuccess("修改成功");

src/views/user/transfer/index.vue

@@ -0,0 +1,438 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公司名" prop="companyId">
+        <el-select filterable style="width: 220px" v-model="queryParams.corpId" placeholder="请选择公司名" clearable size="small">
+          <el-option
+            v-for="item in companys"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转移类型" prop="transferType">
+        <el-select v-model="queryParams.transferType" placeholder="请选择转移类型" clearable size="small">
+          <el-option
+            v-for="item in transferTypeList"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="目标接收销售" prop="targetUserId">
+        <el-select v-model="queryParams.targetUserId" remote
+                   placeholder="请选择" filterable clearable
+                   style="width: 100%;" @keyup.enter.native="handleQuery" :remote-method="getAllUserListLimitQuery">
+          <el-option
+            v-for="dict in companyUserList"
+            :key="`${dict.nickName} - ${dict.userName}`"
+            :label="`${dict.nickName} - ${dict.userName}`"
+            :value="dict.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发起人" prop="initiatorUserId">
+        <el-select v-model="queryParams.initiatorUserId" remote placeholder="请选择" filterable clearable
+                   style="width: 100%;" @keyup.enter.native="handleQuery"
+                   :remote-method="getAllUserListLimitQuery3"
+        >
+          <el-option
+            v-for="dict in companyUserList3"
+            :key="`${dict.nickName} - ${dict.userName}`"
+            :label="`${dict.nickName} - ${dict.userName}`"
+            :value="dict.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="approvalStatus">
+        <el-select v-model="queryParams.approvalStatus" placeholder="请选择审批状态" clearable size="small">
+          <el-option
+            v-for="item in approvalStatusList"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审批处理时间" prop="processedAt">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.processedAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择审批处理时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="记录创建时间" prop="createdAt">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择记录创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="记录最后更新时间" prop="updatedAt">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.updatedAt"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择记录最后更新时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:approval:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="approvalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="所属公司" align="center" prop="companyName" />
+      <el-table-column label="转移类型" align="center" prop="transferTypeText" />
+      <el-table-column label="目标接收销售用户" align="center" prop="targetUserName" />
+      <el-table-column label="发起此转移请求的用户" align="center" prop="initiatorUserName" />
+      <el-table-column label="转移提示内容/原因" align="center" prop="content" />
+      <el-table-column label="审批状态" align="center" prop="approvalStatus" >
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.approvalStatus == 1 ? 'success' : scope.row.approvalStatus == 2 ? 'danger' : ''">{{ scope.row.approvalStatusText }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批意见/备注" align="center" prop="approvalRemark" />
+      <el-table-column label="记录创建时间" align="center" prop="createdAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="记录最后更新时间" align="center" prop="updatedAt" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.approvalStatus == 0"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="viewMode=false;handleUpdate(scope.row)"
+            v-hasPermi="['system:approval:edit']"
+          >审批</el-button>
+          <el-button
+            v-if="scope.row.approvalStatus != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="viewMode=true;handleUpdate(scope.row)"
+            v-hasPermi="['system:approval:edit']"
+          >查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改客户转移审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="企业" prop="corpId">
+          <el-input v-model="form.companyName" placeholder="企业" disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="转移类型" prop="transferType">
+          <el-input v-model="form.transferTypeText" placeholder="转移类型" disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="转移矩阵" prop="customerIds">
+          <el-table :data="form.customerList" border>
+            <el-table-column label="客户" align="center" prop="userName" />
+            <el-table-column label="转移前销售" align="center" prop="beforeCompanyUserName" />
+            <el-table-column label="转移后销售" align="center" prop="afterCompanyUserName" />
+          </el-table>
+        </el-form-item>
+        <el-form-item label="目标接收销售用户" prop="targetUserId">
+          <el-input v-model="form.targetUserName" placeholder="请输入目标接收销售用户 ID" disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="发起此转移请求的用户" prop="initiatorUserId">
+          <el-input v-model="form.initiatorUserName" placeholder="请输入发起此转移请求的用户 ID" disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="转移提示内容/原因">
+          <el-input v-model="form.content" :min-height="192" disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="form.approvalStatus">
+            <el-tag>{{form.approvalStatusText}}</el-tag>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批意见/备注" prop="approvalRemark">
+          <el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="success" @click="submitForm(1)" v-if="!viewMode">通过</el-button>
+        <el-button type="danger" @click="submitForm(2)" v-if="!viewMode">拒绝</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listApproval, getApproval, delApproval, addApproval, updateApproval, exportApproval } from "@/api/user/approval";
+import Editor from '@/components/Editor';
+import {getDicts} from "@/api/system/dict/data";
+import {getCompanyList} from "@/api/company/company";
+import {getAllUserListLimit} from "@/api/store/user";
+
+export default {
+  name: "Approval",
+  components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户转移审批表格数据
+      approvalList: [],
+      companys:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 转移类型
+      transferTypeList: [],
+      companyUserList: [],
+      companyUserList3: [],
+      // 审批状态
+      approvalStatusList: [],
+      viewMode: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        corpId: null,
+        transferType: null,
+        customerIds: null,
+        originalUserId: null,
+        targetUserId: null,
+        initiatorUserId: null,
+        content: null,
+        approvalStatus: null,
+        approverUserId: null,
+        approvalRemark: null,
+        processedAt: null,
+        createdAt: null,
+        updatedAt: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        corpId: [
+          { required: true, message: "企业不能为空", trigger: "blur" }
+        ],
+        transferType: [
+          { required: true, message: "转移类型不能为空", trigger: "change" }
+        ],
+        customerIds: [
+          { required: true, message: "客户 ID 列表不能为空", trigger: "blur" }
+        ],
+        targetUserId: [
+          { required: true, message: "目标接收销售用户不能为空", trigger: "blur" }
+        ],
+        initiatorUserId: [
+          { required: true, message: "发起此转移请求的用户不能为空", trigger: "blur" }
+        ],
+        approvalStatus: [
+          { required: true, message: "审批状态不能为空", trigger: "blur" }
+        ],
+        createdAt: [
+          { required: true, message: "记录创建时间不能为空", trigger: "blur" }
+        ],
+        updatedAt: [
+          { required: true, message: "记录最后更新时间不能为空", trigger: "blur" }
+        ],
+        approvalRemark: [
+          { required: true, message: "审批意见不能为空!", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    getDicts('transfer_type').then(response => {
+      this.transferTypeList = response.data;
+    })
+    getDicts('transfer_approval_status').then(response => {
+      this.approvalStatusList = response.data;
+    })
+    getAllUserListLimit().then(res=>{
+      if(res.code === 200) {
+        this.companyUserList = res.data
+      }
+    });
+    getAllUserListLimit().then(res=>{
+      if(res.code === 200) {
+        this.companyUserList3 = res.data
+      }
+    });
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    getAllUserListLimitQuery(keywords){
+      getAllUserListLimit({
+        keywords: keywords
+      }).then(res=>{
+        if(res.code === 200) {
+          this.companyUserList = res.data
+        }
+      });
+    },
+    getAllUserListLimitQuery3(keywords){
+      getAllUserListLimit({
+        keywords: keywords
+      }).then(res=>{
+        if(res.code === 200) {
+          this.companyUserList3 = res.data
+        }
+      });
+    },
+    /** 查询客户转移审批列表 */
+    getList() {
+      this.loading = true;
+      listApproval(this.queryParams).then(response => {
+        this.approvalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        corpId: null,
+        transferType: null,
+        customerIds: null,
+        originalUserId: null,
+        targetUserId: null,
+        initiatorUserId: null,
+        content: null,
+        approvalStatus: 0,
+        approverUserId: null,
+        approvalRemark: null,
+        processedAt: null,
+        createdAt: null,
+        updatedAt: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户转移审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getApproval(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户转移审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm(type) {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateApproval({...this.form,approvalStatus: type}).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess(response.msg);
+                this.open = false;
+                this.getList();
+              }
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除客户转移审批编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delApproval(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(function() {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有客户转移审批数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportApproval(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        }).catch(function() {});
+    }
+  }
+};
+</script>