Merge branch '个性需求' into feature

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">

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>
@@ -573,16 +574,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>
@@ -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"
@@ -857,7 +858,7 @@ export default {
         demandUserId: "",
         demandUserName: "",
         demandUserMobile: "",
-        attachments:[]
+        finishAttachments:[]
       },
       rules: {
         gridId: [
@@ -1131,7 +1132,7 @@ export default {
         ...this.form,
       };
       // 需求上去掉了图片，但是我又不会改代码，先赋值为[]
-      _form.attachments = [];
+      _form.finishAttachments = [];
       await this.$http
         .post("/governance/userdemand/add", _form)
         .then(({ data: res }) => {
@@ -1178,7 +1179,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
@@ -1230,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;