bug#342公共服务编辑查看添加服务类别

src/views/modules/communityService/commonDemand/addForm.vue

@@ -832,8 +832,7 @@ export default {
     },
     // 如果服务方有选择第一个的话让它更新一下
     handleChangeServiceTypeLevel2() {
-      console.log(this.formData.serviceTypeLevel1Id);
+      console.log(this.formData.serviceOrgType);
-      console.log(this.formData.serviceTypeLevel2Id);
       if (this.formData.serviceOrgType) {
         this.getServiceuserList(this.formData.serviceOrgType);
       } else {

src/views/modules/communityService/commonDemand/detailForm.vue

@@ -17,7 +17,10 @@
               <span class="info-title-2">服务范围：</span>
               <span>{{ formData.gridIdListName || "--" }}</span>
             </div>
-
+            <div class="info-prop">
+              <span class="info-title-2">服务类别：</span>
+              <span>{{ serviceTypeLevel1IdText}}</span>
+            </div>
             <div class="info-prop">
               <span class="info-title-2">政策依据：</span>
               <span>{{ formData.policyTitle || "--" }}</span>
@@ -172,6 +175,8 @@
         showPersonList: false,
         ruleList: [],
         policyList: [],
+        serviceTypesLevel1:[],
+        serviceTypesLevel2:[]
       };
     },
     components: { fileList },
@@ -179,6 +184,8 @@
       await this.getPolicyList();
       // if (this.serviceRecordId) {//详情
       await this.loadInfo();
+      this.getserverType()
+      this.handleChangeServiceTypeLevel1()
       this.initLoading = true;
 
       if (
@@ -322,7 +329,42 @@
         this.resetData();
         this.$emit("diaDetailClose");
       },
-
+      getserverType() {
+      this.$http
+        .get("/governance/commonServiceType/selectList/0")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel1 = res.data;
+            console.log(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      // this.formData.serviceTypeLevel2Id = "";
+      console.log(this.formData);
+      let str = this.formData.serviceTypeLevel1Id
+      this.$http
+        .get(
+          "/governance/commonServiceType/selectList/" +
+          str
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
       // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
       initMap() {
         let { latitude, longitude } = this.feedbackFormData;
@@ -372,15 +414,13 @@
           ],
         };
       },
-      // resiSearchTagNameText(){
+  
-      //   let text = ""
+      serviceTypeLevel1IdText() {
-      //   if(this.resiSearchTagName){
+          const item = this.serviceTypesLevel1.find(entry => entry.id === this.formData.serviceTypeLevel1Id);
-      //     text = this.resiSearchTagName
+          const item2 = this.serviceTypesLevel2.find(entry => entry.id === this.formData.serviceTypeLevel2Id);
-      //   }else {
+          return item2 ? item.name +'-' + item2.name : '--'; // 返回对应的 label，如果找不到则返回空字符串
-      //     text = '--'
+        }
-      //   }
+
-      //   return text
-      // },
     },
     props: {
       serviceRecordId: {

src/views/modules/communityService/commonDemand/editForm.vue

@@ -1,19 +1,8 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
+      <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="div_form">
-        ref="ref_form"
+        <el-form-item label="服务名称" prop="serviceName" label-width="150px" style="display: block">
-        :inline="true"
-        :model="formData"
-        :rules="dataRule"
-        class="div_form"
-      >
-        <el-form-item
-          label="服务名称"
-          prop="serviceName"
-          label-width="150px"
-          style="display: block"
-        >
           <span>{{ formData.serviceName }}</span>
           <!-- <el-select class="item_width_1"
                        v-model="formData.serviceProjectId"
@@ -28,12 +17,7 @@
               </el-option>
             </el-select> -->
         </el-form-item>
-        <el-form-item
+        <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px" style="display: block">
-          label="服务组织"
-          prop="serviceOrgId"
-          label-width="150px"
-          style="display: block"
-        >
           <span>{{ serviceOrgName }}</span>
           <!-- <el-select class="item_width_1"
                        v-model="formData.serviceOrgId"
@@ -48,12 +32,7 @@
             </el-select> -->
         </el-form-item>
 
-        <el-form-item
+        <el-form-item label="服务范围" prop="gridIdList" label-width="150px" style="display: block">
-          label="服务范围"
-          prop="gridIdList"
-          label-width="150px"
-          style="display: block"
-        >
           <div v-for="item in formData.gridIdList" :key="item.objectId">
             <div>{{ item.objectName }}</div>
           </div>
@@ -66,26 +45,23 @@
                          :show-all-levels="false"
                          @change="handleChangeScope"></el-cascader> -->
         </el-form-item>
-
+        <el-form-item label="服务类别" style="display: block" label-width="150px" prop="serviceTypeLevel2Id">
-        <el-form-item
+          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel1Id" placeholder="请选择"
-          label="政策依据"
+            clearable @change="handleChangeServiceTypeLevel1">
-          prop="policyId"
+            <el-option v-for="item in serviceTypesLevel1" :key="item.id" :label="item.name" :value="item.id">
-          label-width="150px"
+            </el-option>
-          style="display: block"
+          </el-select>
-        >
+          -
-          <el-select
+          <el-select class="u-item-width-communitycascader" v-model="formData.serviceTypeLevel2Id" placeholder="请选择"
-            :disabled="formType === 'detail'"
+            clearable>
-            v-model="formData.policyId"
+            <el-option v-for="item in serviceTypesLevel2" :key="item.id" :label="item.name" :value="item.id">
-            class="input-width-small"
+            </el-option>
-            placeholder="请选择"
+          </el-select>
-            clearable
+        </el-form-item>
-          >
+        <el-form-item label="政策依据" prop="policyId" label-width="150px" style="display: block">
-            <el-option
+          <el-select :disabled="formType === 'detail'" v-model="formData.policyId" class="input-width-small"
-              v-for="item in policyList"
+            placeholder="请选择" clearable>
-              :key="item.id"
+            <el-option v-for="item in policyList" :key="item.id" :label="item.title" :value="item.id">
-              :label="item.title"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
           <!-- 
@@ -95,50 +71,23 @@
                        @click="handlePersonList">预览</el-button> -->
         </el-form-item>
 
-        <el-form-item
+        <el-form-item label="经办人" prop="principalName" label-width="150px" style="display: block">
-          label="经办人"
+          <el-input :disabled="formType === 'detail'" class="item_width_1" placeholder="请输入经办人姓名"
-          prop="principalName"
+            v-model="formData.principalName">
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            :disabled="formType === 'detail'"
-            class="item_width_1"
-            placeholder="请输入经办人姓名"
-            v-model="formData.principalName"
-          >
           </el-input>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="联系方式" prop="principalContact" label-width="150px" style="display: block">
-          label="联系方式"
+          <el-input :disabled="formType === 'detail'" class="item_width_1" placeholder="请输入联系方式"
-          prop="principalContact"
+            v-model="formData.principalContact">
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            :disabled="formType === 'detail'"
-            class="item_width_1"
-            placeholder="请输入联系方式"
-            v-model="formData.principalContact"
-          >
           </el-input>
         </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
           <el-switch v-model="formData.assignFlag"> </el-switch>
         </el-form-item>
 
-        <el-form-item
+        <el-form-item label="查找享受服务人员" prop="resiSearchTagId" label-width="150px" style="display: block"
-          label="查找享受服务人员"
+          v-if="this.formData.assignFlag">
-          prop="resiSearchTagId"
+          <input type="text" v-model="formData.resiSearchTagId" v-show="false" />
-          label-width="150px"
-          style="display: block"
-          v-if="this.formData.assignFlag"
-        >
-          <input
-            type="text"
-            v-model="formData.resiSearchTagId"
-            v-show="false"
-          />
           <template v-if="this.resiSearchTagName">
             <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
               {{ this.resiSearchTagName }}
@@ -149,121 +98,44 @@
             <span> <i class="el-icon-plus"></i> 按标签查找 </span>
           </el-button>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="服务时间" label-width="150px" prop="serviceTimeStart" style="display: block">
-          label="服务时间"
+          <el-date-picker :disabled="formType === 'detail'" v-model="formData.serviceTimeStart"
-          label-width="150px"
+            :picker-options="startPickerOptions" class="item_width_2" type="date" value-format="yyyy-MM-dd"
-          prop="serviceTimeStart"
+            value="yyyy-MM-dd" placeholder="开始时间">
-          style="display: block"
-        >
-          <el-date-picker
-            :disabled="formType === 'detail'"
-            v-model="formData.serviceTimeStart"
-            :picker-options="startPickerOptions"
-            class="item_width_2"
-            type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
-            placeholder="开始时间"
-          >
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker
+          <el-date-picker :disabled="formType === 'detail'" v-model="formData.serviceTimeEnd"
-            :disabled="formType === 'detail'"
+            :picker-options="endPickerOptions" class="item_width_2 u-data-tag" type="date" value-format="yyyy-MM-dd"
-            v-model="formData.serviceTimeEnd"
+            value="yyyy-MM-dd" placeholder="结束时间">
-            :picker-options="endPickerOptions"
-            class="item_width_2 u-data-tag"
-            type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
-            placeholder="结束时间"
-          >
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
+        <el-form-item label="服务内容" prop="remark" label-width="150px" style="display: block">
-          label="服务内容"
+          <el-input :disabled="formType === 'detail'" class="item_width_1" type="textarea" maxlength="500" show-word-limit
-          prop="remark"
+            :rows="3" placeholder="请输入服务内容，不超过500字" v-model="formData.remark"></el-input>
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            :disabled="formType === 'detail'"
-            class="item_width_1"
-            type="textarea"
-            maxlength="500"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入服务内容，不超过500字"
-            v-model="formData.remark"
-          ></el-input>
         </el-form-item>
       </el-form>
 
       <div v-show="formData.serviceStatus === 'completed'">
         <h3 class="d-h3">反馈内容</h3>
 
-        <el-form
+        <el-form ref="ref_form_feedback" :inline="true" :disabled="true" :model="feedbackFormData" class="div_form">
-          ref="ref_form_feedback"
+          <el-form-item label="服务目标" prop="serviceGoal" label-width="150px" style="display: block">
-          :inline="true"
+            <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
-          :disabled="true"
+              placeholder="请输入服务目标，不超过1000字" v-model="feedbackFormData.serviceGoal"></el-input>
-          :model="feedbackFormData"
-          class="div_form"
-        >
-          <el-form-item
-            label="服务目标"
-            prop="serviceGoal"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务目标，不超过1000字"
-              v-model="feedbackFormData.serviceGoal"
-            ></el-input>
           </el-form-item>
 
-          <el-form-item
+          <el-form-item label="服务效果" prop="serviceEffect" label-width="150px" style="display: block">
-            label="服务效果"
+            <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
-            prop="serviceEffect"
+              placeholder="请输入服务效果，不超过1000字" v-model="feedbackFormData.serviceEffect"></el-input>
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="1000"
-              show-word-limit
-              :rows="3"
-              placeholder="请输入服务效果，不超过1000字"
-              v-model="feedbackFormData.serviceEffect"
-            ></el-input>
           </el-form-item>
 
-          <el-form-item
+          <el-form-item label="服务人数" style="display: block" prop="servicePeopleNumber" label-width="150px">
-            label="服务人数"
+            <el-input-number class="item_width_2" v-model="feedbackFormData.servicePeopleNumber" :min="0" :max="9999"
-            style="display: block"
+              label="服务人数"></el-input-number>
-            prop="servicePeopleNumber"
-            label-width="150px"
-          >
-            <el-input-number
-              class="item_width_2"
-              v-model="feedbackFormData.servicePeopleNumber"
-              :min="0"
-              :max="9999"
-              label="服务人数"
-            ></el-input-number>
           </el-form-item>
 
-          <el-form-item
+          <el-form-item label="服务状态" label-width="150px" style="display: block" prop="serviceStatus">
-            label="服务状态"
-            label-width="150px"
-            style="display: block"
-            prop="serviceStatus"
-          >
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
                          v-model="feedbackFormData.serviceStatus"
@@ -276,37 +148,14 @@
                 </el-option>
               </el-select> -->
           </el-form-item>
-          <el-form-item
+          <el-form-item label="满意度" style="display: block" label-width="150px" prop="satisfaction">
-            label="满意度"
+            <el-select class="item_width_2" v-model="feedbackFormData.satisfaction" placeholder="全部" clearable>
-            style="display: block"
+              <el-option v-for="item in satisfyArray" :key="item.value" :label="item.label" :value="item.value">
-            label-width="150px"
-            prop="satisfaction"
-          >
-            <el-select
-              class="item_width_2"
-              v-model="feedbackFormData.satisfaction"
-              placeholder="全部"
-              clearable
-            >
-              <el-option
-                v-for="item in satisfyArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+          <el-form-item label="地址" prop="address" label-width="150px" style="display: block">
-            label="地址"
+            <el-input class="item_width_1" v-model="feedbackFormData.address"></el-input>
-            prop="address"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              v-model="feedbackFormData.address"
-            ></el-input>
           </el-form-item>
           <!-- <el-form-item label="地图位置"
                           label-width="150px"
@@ -333,12 +182,7 @@
               </div>
             </el-form-item> -->
 
-          <el-form-item
+          <el-form-item class="block" label="附件" label-width="150px" prop="attach">
-            class="block"
-            label="附件"
-            label-width="150px"
-            prop="attach"
-          >
             <!-- <el-upload :headers="$getElUploadHeaders()"  v-if="feedbackFormData.fileList&&feedbackFormData.fileList.length>0"
                          class="upload-demo"
                          :on-preview="handleFileDownload"
@@ -347,19 +191,10 @@
                          :file-list="fileList">
 
               </el-upload> -->
-            <div
+            <div v-if="feedbackFormData.fileList &&
-              v-if="
+              feedbackFormData.fileList.length > 0
-                feedbackFormData.fileList &&
+              " class="attachement-list">
-                feedbackFormData.fileList.length > 0
+              <a :href="att.url" target="_blank" :key="att.url" v-for="att in feedbackFormData.fileList">
-              "
-              class="attachement-list"
-            >
-              <a
-                :href="att.url"
-                target="_blank"
-                :key="att.url"
-                v-for="att in feedbackFormData.fileList"
-              >
                 <i class="el-icon-folder-opened"></i>
                 {{ att.name }}
               </a>
@@ -372,56 +207,22 @@
 
     <div class="div_btn">
       <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
+      <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确
-        size="small"
+        定</el-button>
-        v-if="formType != 'detail'"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
     </div>
 
-    <el-dialog
+    <el-dialog v-if="showPersonList" :visible.sync="showPersonList" :append-to-body="true" :close-on-click-modal="false"
-      v-if="showPersonList"
+      :close-on-press-escape="false" :title="'标签查找'" width="1150px" top="5vh" class="dialog-h"
-      :visible.sync="showPersonList"
+      @closed="showPersonList = false">
-      :append-to-body="true"
+      <person-list ref="ref_detail_form" :policyId="policyId" :ruleList="ruleList" @handleOk="handleOk"
-      :close-on-click-modal="false"
+        @handleClose="handleClose">
-      :close-on-press-escape="false"
-      :title="'标签查找'"
-      width="1150px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showPersonList = false"
-    >
-      <person-list
-        ref="ref_detail_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @handleOk="handleOk"
-        @handleClose="handleClose"
-      >
       </person-list>
     </el-dialog>
-    <el-dialog
+    <el-dialog v-if="showLabelForm" :visible.sync="showLabelForm" :append-to-body="true" :close-on-click-modal="false"
-      v-if="showLabelForm"
+      :close-on-press-escape="false" :title="'标签配置'" width="900px" top="5vh" class="dialog-h"
-      :visible.sync="showLabelForm"
+      @closed="showLabelForm = false">
-      :append-to-body="true"
+      <label-form ref="ref_label_form" :policyId="policyId" :ruleList="ruleList" @dialogCancle="addFormCancle"
-      :close-on-click-modal="false"
+        @dialogOk="addFormOk">
-      :close-on-press-escape="false"
-      :title="'标签配置'"
-      width="900px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showLabelForm = false"
-    >
-      <label-form
-        ref="ref_label_form"
-        :policyId="policyId"
-        :ruleList="ruleList"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      >
         <!--    @handleOk="handleOk"
         @handleClose="handleClose" -->
       </label-form>
@@ -429,7 +230,7 @@
   </div>
 </template>
 
-  <script>
+<script>
 import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
@@ -485,8 +286,10 @@ export default {
         latitude: "", //	维度
         address: "",
         fileList: [], //	附件列表
+        serviceTypeLevel1Id: '',
+        serviceTypeLevel2Id: ''
+
       },
-      serviceList: [], //服务list
 
       endPickerOptions: {
         disabledDate: endDisabledDate,
@@ -502,14 +305,20 @@ export default {
       policyId: "",
       showPersonList: false,
       ruleList: [],
+
+      serviceTypesLevel1: [],
+      serviceTypesLevel2: [],
     };
   },
   components: { labelForm },
-  mounted() {
+  async mounted() {
     this.getPolicyList();
+    this.getserverType()
+
     if (this.serviceRecordId) {
       //详情
-      this.loadInfo();
+      await this.loadInfo();
+      this.handleChangeServiceTypeLevel1()
     }
     // this.initMap()
   },
@@ -567,16 +376,49 @@ export default {
         this.$message.error(msg);
       }
     },
+    getserverType() {
+      this.$http
+        .get("/governance/commonServiceType/selectList/0")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel1 = res.data;
+            console.log(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      // this.formData.serviceTypeLevel2Id = "";
+      console.log(this.formData);
+      let str = this.formData.serviceTypeLevel1Id
+      this.$http
+        .get(
+          "/governance/commonServiceType/selectList/" +
+          str
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
     //加载组织
     async loadInfo() {
       const url = "/governance/icServiceRecordV2/detail";
-
       let params = {
         serviceRecordId: this.serviceRecordId,
       };
-
       const { data, code, msg } = await requestPost(url, params);
-
       if (code === 0) {
         this.formData = { ...data };
         this.formData.serviceRecordId = this.serviceRecordId;
@@ -874,10 +716,11 @@ export default {
 </script>
 
 
-  <style lang="scss" scoped >
+<style lang="scss" scoped >
 @import "@/assets/scss/modules/management/form-main.scss";
 
 .attachement-list {
+
   // padding-left: 20px;
   a {
     display: block;