add

src/api/qywx/app.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询企业微信三方应用授权公司列表
+export function listApp(query) {
+  return request({
+    url: '/qywx/app/alist',
+    method: 'get',
+    params: query
+  })
+}

src/views/qywx/company/index.vue

@@ -13,7 +13,6 @@
               </el-select>
        </el-form-item>
 
-
       <el-form-item label="主体名称" prop="corpName">
         <el-input
           v-model="queryParams.corpName"
@@ -93,14 +92,16 @@
       <el-table-column label="所属公司id" align="center" prop="companyId" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
 
-      <el-table-column label="企业永久授权码" align="center" prop="permanentCode" />
+     
+      <!-- <el-table-column label="企业类型" align="center" prop="subjectType" /> -->
+      <!-- <el-table-column label="认证到期时间" align="center" prop="verifiedEndTime" /> -->
+      <el-table-column label="授权应用" align="center" prop="agentName" />
+
+       <el-table-column label="企业永久授权码" align="center" prop="permanentCode" />
     
-      <el-table-column label="企业类型" align="center" prop="subjectType" />
-      <el-table-column label="认证到期时间" align="center" prop="verifiedEndTime" />
-      <el-table-column label="授权应用id" align="center" prop="agentId" />
 
-      <el-table-column label="授权方" align="center" prop="accessToken" />
-      <el-table-column label="token超时时间(秒)" align="center" prop="expiresIn" />
+      <el-table-column label="accessToken" width="240px" align="center" prop="accessToken" />
+      <!-- <el-table-column label="token到期时间(秒)" align="center" prop="expiresIn" /> -->
   
       <el-table-column label="主体状态" align="center" prop="status" >
           <template slot-scope="scope" >
@@ -139,24 +140,30 @@
     <!-- 添加或修改企业微信三方应用授权公司对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="企业永久授权码" prop="permanentCode">
-          <el-input readonly  v-model="form.permanentCode" type="text" placeholder="请输入内容" />
-        </el-form-item>
+       
         <el-form-item label="企业名称" prop="corpName">
           <el-input v-model="form.corpName" placeholder="请输入企业名称" />
         </el-form-item>
         <el-form-item label="企业全称" prop="corpFullName">
           <el-input v-model="form.corpFullName" placeholder="请输入企业全称" />
         </el-form-item>
-        <el-form-item label="企业类型" prop="subjectType">
+
+        <!-- <el-form-item label="企业类型" prop="subjectType">
           <el-select v-model="form.subjectType" placeholder="请选择企业类型">
             <el-option label="请选择字典生成" value="" />
           </el-select>
-        </el-form-item>
-        <el-form-item label="授权应用id" prop="agentId">
-          <el-input readonly v-model="form.agentId" placeholder="请输入授权应用id" />
-        </el-form-item>
-   
+        </el-form-item> -->
+
+        <!-- <el-form-item label="授权应用" prop="agentId">
+            <el-select disabled  v-model="form.agentId"  clearable size="small">
+                <el-option 
+                  v-for="item in appList"
+                  :key="item.agentId"
+                  :label="item.name"
+                  :value="item.agentId"/>
+          </el-select>
+        </el-form-item> -->
+
         <el-form-item label="销售公司" prop="companyId">
             <el-select filterable  v-model="form.companyId" placeholder="请选择公司名" clearable size="small">
                 <el-option
@@ -168,12 +175,31 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="授权方" prop="accessToken">
-          <el-input v-model="form.accessToken" type="textarea" placeholder="请输入内容" />
+         <el-form-item label="会话存档私钥" prop="docPrivateKey">  
+          <el-input v-model="form.docPrivateKey" rows="10"  type="textarea" />
+        </el-form-item>
+
+        <el-form-item label="会话存档公钥" prop="docPublicKey">
+          <el-input v-model="form.docPublicKey"  rows="10" type="textarea" />
+        </el-form-item>
+
+        <el-form-item label="会话存档密钥" prop="docPrivateSecret">
+          <el-input v-model="form.docPrivateSecret"  type="text" />
+        </el-form-item>
+
+         <el-form-item label="企业永久授权码" prop="permanentCode">
+          <el-input readonly  v-model="form.permanentCode" type="text" placeholder="请输入企业永久授权码" />
         </el-form-item>
+
+        <el-form-item label="accessToken" prop="accessToken">
+          <el-input v-model="form.accessToken" readonly type="textarea" />
+        </el-form-item>
+
+       
+<!-- 
         <el-form-item label="token超时时间(秒)" prop="expiresIn">
           <el-input v-model="form.expiresIn" placeholder="请输入token超时时间(秒)" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="账户状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择账户状态">
             <el-option
@@ -196,6 +222,8 @@
 <script>
 import { listCompany, getCompany, delCompany, addCompany, updateCompany, exportCompany } from "@/api/qywx/company";
 import { getCompanyList } from "@/api/company/company";
+import { listApp } from "@/api/qywx/app";
+
 export default {
   name: "Company",
   data() {
@@ -221,6 +249,7 @@ export default {
       // 账户状态字典
       statusOptions: [],
         companys:[],
+        appList:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -235,26 +264,41 @@ export default {
         corpId: [
           { required: true, message: "企业id不能为空", trigger: "blur" }
         ],
-        permanentCode: [
-          { required: true, message: "企业永久授权码不能为空", trigger: "blur" }
+        // permanentCode: [
+        //   { required: true, message: "企业永久授权码不能为空", trigger: "blur" }
+        // ],
+
+        companyId: [
+          { required: true, message: "请选择销售公司", trigger: "blur" }
         ],
         corpName: [
           { required: true, message: "企业名称不能为空", trigger: "blur" }
         ],
         corpFullName: [
           { required: true, message: "企业全称不能为空", trigger: "blur" }
+        ],  
+        docPrivateKey: [
+          { required: true, message: "会话存档私钥不能为空", trigger: "blur" }
         ],
+        // docPublicKey: [
+        //   { required: true, message: "会话存档公钥不能为空", trigger: "blur" }
+        // ],
+        docPrivateSecret: [
+          { required: true, message: "会话存档密钥不能为空", trigger: "blur" }
+        ]
       }
     };
   },
   created() {
     this.getList();
+
     this.getDicts("qywx_company_status").then(response => {
       this.statusOptions = response.data;
     });
     getCompanyList().then(response => {
       this.companys = response.data;
     });
+    this.getAppList();
   },
   methods: {
     /** 查询企业微信三方应用授权公司列表 */
@@ -266,6 +310,12 @@ export default {
         this.loading = false;
       });
     },
+   getAppList() {
+      listApp(this.queryParams).then(response => {
+        this.appList = response.data;
+      });
+    },
+
     // 账户状态字典翻译
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
@@ -291,7 +341,10 @@ export default {
         expiresIn: null,
         status: null,
         createTime: null,
-        updateTime: null
+        updateTime: null,
+        docPrivateKey: null,    
+        docPublicKey: null,  
+        docPrivateSecret: null,
       };
       this.resetForm("form");
     },
@@ -315,7 +368,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加企业微信三方应用授权公司";
+      this.title = "添加企业微信公司主体";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -324,7 +377,7 @@ export default {
       getCompany(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改企业微信三方应用授权公司";
+        this.title = "修改企业微信公司主体";
       });
     },
     /** 提交按钮 */