From 26f890142299e7da8b318818f7c6a33b0b298af7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 11 Jun 2024 10:18:35 +0800
Subject: [PATCH 1/5] =?UTF-8?q?finishAttachments=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/measure/index.vue     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 8655c0558..15ef9124d 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -201,7 +201,7 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
-            <template v-if="filterEdit(scope.row.agencyId)">
+            <template >
               <el-button
                 v-if="
                   scope.row.status === 'pending' ||
@@ -573,16 +573,16 @@
               label="上传图片"
               label-width="150px"
               style="display: block"
-              prop="attachments"
+              prop="finishAttachments"
               v-if="addType != 'finishNoEvaluate'"
           >
-            <UploadImages :fileList="form.attachments" @change="(val) => form.attachments = val" :limit="3"/>
+            <UploadImages :fileList="form.finishAttachments" @change="(val) => form.finishAttachments = val" :limit="3"/>
           </el-form-item>
           <el-form-item
               label="上传图片"
               label-width="150px"
               style="display: block"
-              prop="attachments"
+              prop="finishAttachments"
               v-else
           >
             <el-image :src="item.url" v-for="(item,index) in form.finishAttachments" :key="index" ></el-image>
@@ -857,7 +857,7 @@ export default {
         demandUserId: "",
         demandUserName: "",
         demandUserMobile: "",
-        attachments:[]
+        finishAttachments:[]
       },
       rules: {
         gridId: [
@@ -1131,7 +1131,7 @@ export default {
         ...this.form,
       };
       // 需求上去掉了图片，但是我又不会改代码，先赋值为[]
-      _form.attachments = [];
+      _form.finishAttachments = [];
       await this.$http
         .post("/governance/userdemand/add", _form)
         .then(({ data: res }) => {
@@ -1178,7 +1178,7 @@ export default {
         finishDesc: reportType == "self_help" ? "" : this.form.finishDesc,
         serviceId: this.form.serviceId,
         score: reportType == "self_help" ? 0 : this.form.score,
-        attachments: this.form.attachments
+        finishAttachments: this.form.finishAttachments
       };
       // console.log(_form,'_form')
       // return

From a39733b96515f14c6d178d4c024bc7c22e7f22d5 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 11 Jun 2024 10:19:47 +0800
Subject: [PATCH 2/5] no message

---
 src/views/modules/communityService/measure/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 15ef9124d..f0e23599f 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -201,7 +201,7 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
-            <template >
+            <template v-if="filterEdit(scope.row.agencyId)">
               <el-button
                 v-if="
                   scope.row.status === 'pending' ||

From 48fbc8109d8790465e662778800c8aba393b2239 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 12 Jun 2024 17:45:49 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=8EH5=E6=9D=A5=E7=9A=84=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E6=98=AF=E5=90=A6=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?,=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index f0e23599f..1769538e8 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -235,6 +235,7 @@
                   >评价</el-button
                 >
               </template>
+            
               <template v-if="scope.row.reportType != 'self_help'">
                 <el-button
                   v-if="scope.row.status === 'pending'"
@@ -553,13 +554,13 @@
             <el-radio
               v-model.trim="form.finishResult"
               label="resolved"
-              :disabled="disabled && addType != 'finish'"
+              :disabled="disabled && addType != 'finish' && addType != 'finishNoEvaluate'"
               >已解决</el-radio
             >
             <el-radio
               v-model.trim="form.finishResult"
               label="unresolved"
-              :disabled="disabled && addType != 'finish'"
+              :disabled="disabled && addType != 'finish' && addType != 'finishNoEvaluate'"
               >未解决</el-radio
             >
           </el-form-item>
@@ -591,7 +592,7 @@
             <el-input
               v-model.trim="form.finishDesc"
               :autosize="{ minRows: 2, maxRows: 10 }"
-              :disabled="disabled && addType != 'finish'"
+              :disabled="disabled && addType != 'finish' && addType != 'finishNoEvaluate'"
               type="textarea"
               clearable
               class="input-width-textarea"

From 1beee8d0d59bd28fa28b014b00643b5a23536a2d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 13 Jun 2024 10:34:14 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=B2=A1=E8=B0=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 1769538e8..d3f34fa62 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1231,6 +1231,7 @@ export default {
           else if (this.addType == "edit") this.editCate();
           else if (this.addType == "appoint") this.appointAjax();
           else if (this.addType == "finish") this.finishAjax();
+          else if (this.addType == "finishNoEvaluate") this.finishAjax();
         } else {
           console.log("error submit!!");
           return false;

From 5be2c5c3578a587c625d364f32a9b84332bacf89 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 13 Jun 2024 14:06:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/measure/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index 21aaa89ec..e0bcf4172 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -15,7 +15,7 @@
 
         <div class="m-info-prop">
           <span class="u-info-title-3">需求类型：</span>
-          <span>{{ dataForm.categoryAllName ?dataForm.categoryAllName :'--' }}</span>
+          <span>{{ dataForm.parentCategoryName +'-'+dataForm.firstCategoryName }}</span>
         </div>
 
         <div class="m-info-prop">