From 0f03dc9d04d986a5635ca891c10a37b6e7685c71 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 14 Jul 2022 11:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E6=9D=91=E5=85=A5=E5=BA=93,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E5=88=B6=E6=96=B9=E6=A1=88=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../develop/AppDeployCustom/AiLibTable.vue     |  2 +-
 .../oms/apps/develop/AppDeployCustom/add.vue   | 18 +++++++++++-------
 .../oms/apps/develop/AppDeployCustom/list.vue  | 10 ++++++----
 .../develop/AppDeployWxmp/AppDeployWxmp.vue    | 14 +++++++-------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue b/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
index d4103333..a4f5a6c5 100644
--- a/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
+++ b/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
@@ -107,7 +107,7 @@ export default {
       const {nodeKey} = this
       if (this.multiple) {
         let selected = this.$copy(this.selected),
-            choose = this.$copy(this.choose)
+            choose = this.$copy(this.choose) || []
         if (row.checked) {
           selected.push(row[nodeKey])
           choose.push(row)
diff --git a/project/oms/apps/develop/AppDeployCustom/add.vue b/project/oms/apps/develop/AppDeployCustom/add.vue
index e7163a40..35b71e8b 100644
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -41,6 +41,9 @@
               <ai-card title="扩展设置">
                 <template #content>
                   <template v-if="form.type=='mp'">
+                    <el-form-item label="小程序AppId">
+                      <el-input v-model="form.appId" clearable placeholder="小程序appId"/>
+                    </el-form-item>
                     <ai-title title="底部导航栏">
                       <template #rightBtn>
                         <ai-dialog-btn text="更换定制页" dialogTitle="选择应用">
@@ -90,7 +93,7 @@ export default {
           e.project = "core"
         } else e.project = "standard"
         return e
-      })
+      }) || []
     },
     tabBar: v => ({
       color: "#666666",
@@ -114,7 +117,7 @@ export default {
         }
       },
       get() {
-        const {id} = this.form.customTabbar
+        const {id} = this.form.customTabbar || {}
         return {id}
       }
     }
@@ -153,9 +156,9 @@ export default {
     submit() {
       this.$refs.AddForm.validate(v => {
         if (v) {
-          const {tabBar, form: {type}} = this
+          const {tabBar, appId, form: {type}} = this
           if (type == 'mp') {
-            this.form.extra = {tabBar}
+            this.form.extra = {tabBar, appId}
           }
           this.instance.post("/node/custom/addOrUpdate", this.form).then(res => {
             if (res?.code == 0) {
@@ -168,9 +171,10 @@ export default {
     },
     handleSysTypeChange(v, data) {
       if (v == 'mp') {
-        const {tabBar: {list}} = data
-        this.$set(this.form, 'customTabbar', list?.[2] || {
-          pagePath: "pages/enteringVillage/enteringVillage",
+        this.form.appId = data.appId
+        const customTabbar = data?.tabBar?.list?.[2]
+        this.$set(this.form, 'customTabbar', customTabbar || {
+          pagePath: "pages/AppEnteringVillage/AppEnteringVillage",
           text: "进村",
           iconPath: "TabBar/village.png",
           selectedIconPath: "TabBar/village_selected.png"
diff --git a/project/oms/apps/develop/AppDeployCustom/list.vue b/project/oms/apps/develop/AppDeployCustom/list.vue
index 443fd17c..72f9797a 100644
--- a/project/oms/apps/develop/AppDeployCustom/list.vue
+++ b/project/oms/apps/develop/AppDeployCustom/list.vue
@@ -19,13 +19,15 @@
               <el-progress v-else :percentage="row.count"/>
             </template>
           </el-table-column>
-          <el-table-column slot="options" label="操作" fixed="right" align="center" width="300">
+          <el-table-column slot="options" label="操作" fixed="right" width="300" header-align="center">
             <template slot-scope="{row}">
               <el-button type="text" @click="handleAdd(row.id)">编辑</el-button>
-              <el-button type="text" @click="handleUpdate(row)" v-if="row.count==0">打包更新</el-button>
-              <el-button type="text" @click="handleCancelUpdate(row)" v-else>停止</el-button>
-              <el-button type="text" @click="handleDownload(row)" v-if="row.dist">下载</el-button>
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+              <template v-if="!!row.dist">
+                <el-button type="text" @click="handleUpdate(row)" v-if="row.count==0">打包更新</el-button>
+                <el-button type="text" @click="handleCancelUpdate(row)" v-else>停止</el-button>
+                <el-button type="text" @click="handleDownload(row)" v-if="row.dist">下载</el-button>
+              </template>
             </template>
           </el-table-column>
         </ai-table>
diff --git a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
index 376b9666..54430373 100644
--- a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
+++ b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
@@ -44,15 +44,15 @@
         <el-form-item label="项目/系统" prop="name">
           {{ form.name }}(appid:<b v-text="form.miniapp_appid"/>)
         </el-form-item>
+        <el-form-item label="版本号" prop="version">
+          <ai-select v-model="form.version" :instance="instance" action="/node/custom/list?type=mp" :prop="{label:'name'}"/>
+        </el-form-item>
         <el-form-item label="小程序上传私钥" prop="privateKey">
           <el-input v-model="form.privateKey" clearable placeholder="请输入"/>
         </el-form-item>
         <el-form-item label="项目地址" prop="projectPath">
           <el-input v-model="form.projectPath" clearable placeholder="请输入"/>
         </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" clearable placeholder="请输入"/>
-        </el-form-item>
         <el-form-item label="npm构建脚本" prop="npmScript">
           <el-input v-model="form.npmScript" clearable placeholder="请输入"/>
         </el-form-item>
@@ -77,6 +77,7 @@ export default {
     desConfigs() {
       let isLine = true
       return [
+        {prop: "corp_id", label: "企业微信corpId"},
         {prop: "corp_address_book_secret", label: "企业微信通讯录SECRET", width: 200},
         {prop: "corp_agent_id", label: "企业微信AGENTID", width: 150},
         {prop: "corp_secret", label: "企业微信SECRET", isLine},
@@ -100,10 +101,9 @@ export default {
       colConfigs: [
         {slot: "expand"},
         {label: "项目/系统名称", prop: "name", width: 300},
-        {label: "corpId", prop: "corp_id", width: 180},
-        {label: "管理后台", prop: "web_url"},
         {label: "appId", prop: "miniapp_appid", width: 180},
-        {label: "上传版本", prop: "version"},
+        {label: "管理后台", prop: "web_url"},
+        {label: "上传版本", render: (h, {row}) => h('p', row.versionName || row.version)},
         {slot: "process"},
         {slot: "options"}
       ],
@@ -112,7 +112,7 @@ export default {
       rules: {
         // privateKey: {required: true, message: "请输入 小程序上传私钥"},
         // projectPath: {required: true, message: "请输入 项目地址"},
-        version: {required: true, message: "请输入 版本号"},
+        version: {required: true, message: "请选择 定制方案"},
       }
     }
   },