gx

src/router/index.js

@@ -298,43 +298,43 @@ const routes = [
       {
         path: "/livingCircle/category",
         name: "serviceType",
-        meta: ["服务类型管理"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/category.vue"),
       },
       {
         path: "/livingCircle/searchTerms",
         name: "serviceType",
-        meta: ["推荐搜索词管理"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/searchTerms.vue"),
       },
       {
         path: "/livingCircle/serviceInfo",
         name: "serviceType",
-        meta: ["服务信息管理"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/serviceInfo.vue"),
       },
       {
         path: "/livingCircle/enter",
         name: "enter",
-        meta: ["商家入驻审核"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/enter.vue"),
       },
       {
         path: "/livingCircle/report",
         name: "report",
-        meta: ["市民上报审核"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/report.vue"),
       },
       {
         path: "/livingCircle/help",
         name: "help",
-        meta: ["邻里求助审核"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/help.vue"),
       },
       {
         path: "/livingCircle/helpInfo",
         name: "helpInfo",
-        meta: ["邻里求助信息管理"],
+        meta: ["便民生活圈"],
         component: () => import("@/views/livingCircle/helpInfo.vue"),
       },
     ],

src/views/livingCircle/category.vue

@@ -14,10 +14,10 @@
             placeholder="请输入类型名称"
           ></el-input>
         </el-form-item>
-        <el-form-item label="类型">
+        <el-form-item label="所属菜单">
           <el-select
             v-model="searchForm.menuId"
-            placeholder="请选择类型"
+            placeholder="请选择所属菜单"
             clearable
             size="medium"
             @change="init"
@@ -78,6 +78,7 @@
               size="mini"
               class="btn"
               round
+              :disabled="scope.row.delFlag == 0"
               @click="view(scope.row)"
               >编辑</el-button
             >
@@ -178,7 +179,7 @@ export default {
       tableColumns: [
         {
           key: "name",
-          label: "服务名称",
+          label: "类型名称",
         },
         {
           key: "menuName",

src/views/livingCircle/enter.vue

@@ -22,11 +22,12 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item label="需求类型">
+        <el-form-item label="类型">
           <el-cascader
             :options="menuOptions"
             clearable
             filterable
+            placeholder="请选择类型"
             @change="menuChange"
           ></el-cascader>
         </el-form-item>
@@ -257,6 +258,7 @@
           type="success"
           round
           slot="reference"
+          :disabled="detail.state != 0"
           @click="reviewHandle('pass', detail)"
           >通过
         </el-button>
@@ -265,6 +267,7 @@
           type="danger"
           round
           slot="reference"
+          :disabled="detail.state != 0"
           @click="reviewHandle('refuse', detail)"
           >拒绝
         </el-button>
@@ -317,7 +320,7 @@ export default {
         },
         {
           key: "category",
-          label: "经营类型",
+          label: "类型",
         },
         {
           key: "district",

src/views/livingCircle/help.vue

@@ -7,11 +7,11 @@
         class="search_form"
         style="text-align: left"
       >
-        <el-form-item label="需求类型">
+        <el-form-item label="求助类型">
           <el-select
             v-model="searchForm.categoryId"
             clearable
-            placeholder="请选择需求类型"
+            placeholder="请选择求助类型"
             size="medium"
           >
             <el-option
@@ -184,23 +184,23 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-popconfirm
-          title="确定通过此申请吗？"
-          style="margin-left: 10px"
-          @confirm="reviewHandle('pass', detail)"
-          v-if="detail.state == 0 && detail.state != 1"
-        >
-          <el-button type="success" round slot="reference">通过 </el-button>
-        </el-popconfirm>
+        <el-button
+          :disabled="detail.state != 0"
+          type="success"
+          round
+          slot="reference"
+          @click="reviewHandle('pass', detail)"
+          >通过
+        </el-button>
 
-        <el-popconfirm
-          title="确定拒绝此申请吗？"
-          @confirm="reviewHandle('refuse', detail)"
-          v-if="detail.state == 0 && detail.state != 4"
-          style="margin-left: 10px"
-        >
-          <el-button type="danger" round slot="reference">拒绝 </el-button>
-        </el-popconfirm>
+        <el-button
+          type="danger"
+          round
+          :disabled="detail.state != 0"
+          slot="reference"
+          @click="reviewHandle('refuse', detail)"
+          >拒绝
+        </el-button>
       </span>
     </el-dialog>
   </div>
@@ -256,7 +256,7 @@ export default {
         },
         {
           key: "phone",
-          label: "联系电话",
+          label: "电话",
         },
         {
           key: "district",
@@ -330,24 +330,58 @@ export default {
     reviewHandle(type, row) {
       let params = {};
       if (type === "pass") {
+        this.$prompt(`确定通过该申请吗?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          inputPlaceholder: "请输入原因",
+          inputType: "textarea",
+        }).then(({ value }) => {
+          if (!value) {
+            this.$message.error("未输入原因");
+            return;
+          } else {
             params = {
               id: row.id,
               state: 1,
               user: this.userName,
+              reason: value,
             };
+            helpReview(params).then((res) => {
+              if (res.code == 200) {
+                this.$message.success("审核成功");
+                this.init();
+                this.dialogVisible = false;
+              }
+            });
+          }
+        });
+      } else {
+        this.$prompt(`确定拒绝该申请吗?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          inputPlaceholder: "请输入原因",
+          inputType: "textarea",
+        }).then(({ value }) => {
+          if (!value) {
+            this.$message.error("未输入原因");
+            return;
           } else {
             params = {
               id: row.id,
               state: 4,
               user: this.userName,
+              reason: value,
             };
-      }
             helpReview(params).then((res) => {
               if (res.code == 200) {
                 this.$message.success("审核成功");
                 this.init();
+                this.dialogVisible = false;
               }
             });
+          }
+        });
+      }
     },
 
     view(row) {

src/views/livingCircle/searchTerms.vue

@@ -60,6 +60,7 @@
               size="mini"
               class="btn"
               round
+              :disabled="scope.row.delFlag == 0"
               @click="view(scope.row)"
               >编辑</el-button
             >
@@ -194,6 +195,7 @@ export default {
       this.type = "edit";
       this.dataForm.sort = row.sort;
       this.dataForm.keyword = row.keyword;
+      this.dataForm.id = row.id;
       this.dialogVisible = true;
     },
     delFlagHandle(row) {