From 565d0532247e825294cd21940b7af93f74a4480d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 11 Jan 2023 09:40:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
index f9c7e1af..8c4d5273 100644
--- a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
+++ b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
@@ -31,6 +31,7 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center" width="300">
             <template slot-scope="{row}">
               <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
               <el-button type="text" @click="handleZip(row)" v-if="row.count==0">打包</el-button>
               <el-button type="text" @click="handleCancelZip(row)" v-else>停止</el-button>
               <el-button type="text" v-if="/^打包时间/.test(row.error)" @click="handleDownload(row)">下载</el-button>
@@ -214,7 +215,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除该项目/系统?").then(() => {
-        this.instance.post("/node/autodeploy/delete", null, {
+        this.instance.post("/node/wxmp/delete", null, {
           params: {ids}
         }).then(res => {
           if (res?.code == 0) {

From 5aff9d6bc24ce9372dce8645d27ddac04b9d0c1a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 11 Jan 2023 10:20:14 +0800
Subject: [PATCH 2/2] BUG 26

---
 .../AppHomesteadManagement/components/Add.vue  |  4 ++--
 ui/lib/js/modules.js                           | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/grid/AppHomesteadManagement/components/Add.vue b/packages/grid/AppHomesteadManagement/components/Add.vue
index 6827200f..4f9d6d04 100644
--- a/packages/grid/AppHomesteadManagement/components/Add.vue
+++ b/packages/grid/AppHomesteadManagement/components/Add.vue
@@ -32,7 +32,7 @@
                 </el-form-item>
               </div>
               <el-form-item label="所属村" prop="areaId">
-                <ai-area-get :instance="instance" v-model="formData.areaId" :name.sync="formData.areaName" />
+                <ai-area-get :root="sys.areaId" :instance="instance" v-model="formData.areaId" :name.sync="formData.areaName" />
               </el-form-item>
             </template>
           </ai-card>
@@ -203,7 +203,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(['user','sys']),
 
     isEdit() {
       return !!this.params.id
diff --git a/ui/lib/js/modules.js b/ui/lib/js/modules.js
index 8c854ddf..874c5fe1 100644
--- a/ui/lib/js/modules.js
+++ b/ui/lib/js/modules.js
@@ -5,7 +5,10 @@ import Vue from "vue"
 export const sys = {
   state: () => ({
     info: {},
-    theme: {}
+    theme: {},
+    location: {},
+    areaId: "",
+    areaName: ""
   }),
   mutations: {
     setSysInfo(state, info) {
@@ -13,17 +16,26 @@ export const sys = {
     },
     setTheme(state, theme) {
       state.theme = theme
+    },
+    setLocation(state, location) {
+      state.location = location
+    },
+    setArea(state, area) {
+      state.areaId = area.areaId
+      state.areaName = area.areaName
     }
   },
   actions: {
     getSystem({commit}, info) {
       return http.post("/app/appdvcpconfig/getSystemInfo", null, {withoutToken: true}).then(res => {
         if (res?.data) {
-          let {systemInfo, colorScheme, enableGreyFilter} = res.data
+          let {systemInfo, colorScheme, enableGreyFilter, location, areaId, areaName} = res.data
           systemInfo = JSON.parse(systemInfo || null) || {}
           colorScheme = JSON.parse(colorScheme || null) || {}
           commit("setSysInfo", {...info, ...systemInfo})
           commit("setTheme", {colorScheme, enableGreyFilter})
+          commit("setLocation", location)
+          commit("setArea", {areaId, areaName})
           return res.data
         } else return Promise.reject()
       }).catch(() => commit("setSysInfo", info))
@@ -53,7 +65,7 @@ export const user = {
     setUserExtra(state, extra = {}) {
       Object.keys(extra).map(e => Vue.set(state, e, extra[e]))
     },
-    setRoutes(state,routes){
+    setRoutes(state, routes) {
       state.routes = routes
     }
   },