From 9d5b8d229c60493e5866381bcb5b1a8e670fdca5 Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Fri, 30 Jun 2023 16:49:45 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1]=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/commonDemand/index.vue   | 16 ++++++------
 .../communityService/fuwuzhaoren/index.vue    | 26 +++++++++----------
 .../modules/shequzhili/welfare/welfare.vue    | 11 +++-----
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index 27ec6d46b..0c18a0ebe 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -245,7 +245,10 @@
                            type="text"
                            size="small"
                            >人员名单</el-button> -->
-                <el-button v-if="scope.row.serviceStatus==='in_service'"
+                           
+                <!-- 产品说：不限制太多，不要求状态,都能删除 -->
+                <!-- v-if="scope.row.serviceStatus==='in_service'" -->
+                <el-button 
                            @click="handleDel(scope.row)"
                            type="text"
                            size="small"
@@ -686,7 +689,7 @@
           type: "warning"
         })
           .then(() => {
-            this.cancelFuwu()
+            this.cancelFuwu([row.serviceRecordId])
           })
           .catch(err => {
             if (err == "cancel") {
@@ -700,14 +703,11 @@
 
       },
 
-      async cancelFuwu () {
+      async cancelFuwu (serviceRecordIds) {
 
-        const url = '/governance/icServiceRecordV2/cancel';
-        let params = {
-          serviceRecordId: this.serviceRecordId
-        }
+        const url = '/governance/icServiceRecordV2/delete';
 
-        const { data, code, msg } = await requestPost(url, params);
+        const { data, code, msg } = await requestPost(url, serviceRecordIds);
 
         if (code === 0) {
           this.$message.success("取消成功！");
diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index 9f44cef96..e31324f9f 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/index.vue
@@ -191,7 +191,7 @@
                            :show-overflow-tooltip="true">
 
           </el-table-column>
-          <el-table-column prop="serviceOrgName"
+          <el-table-column prop="sourceName"
                            align="center"
                            min-width="150"
                            label="来自"
@@ -218,14 +218,14 @@
           <el-table-column prop="serviceStatus"
                            align="center"
                            width="100"
-                           label="服务人数"
+                           label="服务状态"
                            :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column prop="servicePeopleNumber"
+          <el-table-column prop="servedPersonQty"
                            align="center"
                            width="110"
                            label="服务人数"
@@ -241,7 +241,7 @@
                          type="text"
                          size="small"
                         >查看</el-button>
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
+              <el-button 
                          @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
@@ -257,7 +257,10 @@
                          type="text"
                          size="small"
                          >人员名单</el-button> -->
-              <el-button v-if="scope.row.serviceStatus==='in_service'"
+                         
+            <!-- 暂时不限制删除按钮，任何状态都允许删除，产品要求的 -->
+            <!-- v-if="scope.row.serviceStatus==='in_service'" -->
+              <el-button 
                          @click="handleDel(scope.row)"
                          type="text"
                          size="small"
@@ -676,7 +679,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.cancelFuwu()
+          this.cancelFuwu([row.serviceRecordId])
         })
         .catch(err => {
           if (err == "cancel") {
@@ -690,20 +693,17 @@ export default {
 
     },
 
-    async cancelFuwu () {
+    async cancelFuwu (serviceRecordIds) {
 
-      const url = '/governance/icServiceRecordV2/cancel';
-      let params = {
-        serviceRecordId: this.serviceRecordId
-      }
+      const url = '/governance/icServiceRecordV2/searchDeleteBatch';
 
-      const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, serviceRecordIds);
 
       if (code === 0) {
         this.$message.success("取消成功！");
         this.getTableData();
       } else {
-        this.$message.error("操作失败！");
+        this.$message.error(msg);
       }
     },
 
diff --git a/src/views/modules/shequzhili/welfare/welfare.vue b/src/views/modules/shequzhili/welfare/welfare.vue
index d07a0abed..22e8e7c12 100644
--- a/src/views/modules/shequzhili/welfare/welfare.vue
+++ b/src/views/modules/shequzhili/welfare/welfare.vue
@@ -566,7 +566,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.cancelFuwu();
+          this.cancelFuwu([row.serviceRecordId]);
         })
         .catch((err) => {
           if (err == "cancel") {
@@ -578,13 +578,10 @@ export default {
         });
     },
     //删除
-    async cancelFuwu() {
-      const url = "/governance/icServiceRecordV2/cancel";
-      let params = {
-        serviceRecordId: this.serviceRecordId,
-      };
+    async cancelFuwu(serviceRecordIds) {
+      const url = "/governance/icServiceRecordV2/delete";
 
-      const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, serviceRecordId);
 
       if (code === 0) {
         this.$message.success("取消成功！");