bug#368

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

@@ -197,22 +197,30 @@
         </el-form-item>
 
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch v-model="formData.assignSwitch" @change="handelDisabledRules"> </el-switch>
+          <el-switch
+            v-model="formData.assignSwitch"
+            @change="handelDisabledRules"
+          >
+          </el-switch>
         </el-form-item>
 
         <el-form-item
           label="查找享受服务人员"
           prop="resiSearchTagId"
           :class="{ 'form-item': source === 'visiual' }"
-           label-width="150px"
+          label-width="150px"
           style="display: block"
           v-if="formData.assignSwitch"
         >
-         <input type="text" v-model="formData.resiSearchTagId" v-show="false">
+          <input
-          <template  v-if="formData.resiSearchTagName">
+            type="text"
-            <el-tag   @close="handleCloseTag"  closable  style="margin-right:10px;">
+            v-model="formData.resiSearchTagId"
-            {{ formData.resiSearchTagName }}
+            v-show="false"
-          </el-tag>
+          />
+          <template v-if="formData.resiSearchTagName">
+            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+              {{ formData.resiSearchTagName }}
+            </el-tag>
           </template>
 
           <el-button type="primary" @click="handleClickLabel" size="mini">
@@ -344,7 +352,7 @@
             prop="serviceStatus"
           >
             <span>已完成</span> -->
-            <!-- <el-select class="item_width_1"
+          <!-- <el-select class="item_width_1"
                          v-model="feedbackFormData.serviceStatus"
                          placeholder="全部"
                          clearable>
@@ -384,7 +392,7 @@
             label-width="150px"
             style="display: block"
           >
-          <el-input
+            <el-input
               class="item_width_1"
               type="textarea"
               maxlength="1000"
@@ -392,7 +400,6 @@
               :rows="3"
               v-model="feedbackFormData.serviceGoal"
             ></el-input>
-           
           </el-form-item>
           <!-- <el-form-item label="详细位置" label-width="150px">
              <el-input
@@ -574,11 +581,11 @@ export default {
       if (this.formData.serviceTimeStart) {
         let serviceTimeStart = new Date(this.formData.serviceTimeStart);
         return (
-          time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
+          time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
-          time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
+          time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
         );
       } else {
-        return (time.getTime() > nowData || time.getTime() === nowData) ;
+        return time.getTime() > nowData || time.getTime() === nowData;
       }
     };
     let startDisabledDate = (time) => {
@@ -587,7 +594,6 @@ export default {
       return time.getTime() < nowData;
     };
 
-
     return {
       // 公共服务分类
       serviceTypesLevel1: [],
@@ -613,8 +619,8 @@ export default {
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
         serviceCategoryKey: "",
         assignSwitch: false,
-        resiSearchTagId:"",//查找享受服务人员
+        resiSearchTagId: "", //查找享受服务人员
-        resiSearchTagName:"",//享受服务人员名称
+        resiSearchTagName: "", //享受服务人员名称
         serviceName: "", //服务名称
         serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serviceOrgId: "", //服务组织Id
@@ -689,7 +695,6 @@ export default {
   },
 
   computed: {
-
     feedbackDataRule() {
       return {
         // serviceGoal: [
@@ -711,9 +716,9 @@ export default {
         address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
       };
     },
-    dataRule(){
+    dataRule() {
-        return {
+      return {
-          serviceTypeLevel2Id: [
+        serviceTypeLevel2Id: [
           { required: true, message: "政策类型不能为空", trigger: "change" },
         ],
         serviceName: [
@@ -729,11 +734,14 @@ export default {
         objList: [
           { required: true, message: "服务范围不能为空", trigger: "change" },
         ],
-        resiSearchTagId:[
+        resiSearchTagId: [
-          { required: true, message: "享受服务人员不能为空", trigger: "change"  }
+          {
-        ]
+            required: true,
-        }
+            message: "享受服务人员不能为空",
-     
+            trigger: "change",
+          },
+        ],
+      };
     },
   },
 
@@ -787,12 +795,18 @@ export default {
   },
 
   methods: {
-    handelDisabledRules(v){
+    handelDisabledRules(v) {
-      if(!v){
+      if (!v) {
-        delete this.dataRule.resiSearchTagId
+        delete this.dataRule.resiSearchTagId;
-      }else{
+      } else {
-        var arr = [{ required: true, message: "享受服务人员不能为空", trigger: "change" }]
+        var arr = [
-        this.dataRule.resiSearchTagId = arr
+          {
+            required: true,
+            message: "享受服务人员不能为空",
+            trigger: "change",
+          },
+        ];
+        this.dataRule.resiSearchTagId = arr;
       }
       console.log(this.dataRule);
     },
@@ -840,9 +854,9 @@ export default {
     addFormCancle() {
       this.showLabelForm = false;
     },
-    handleCloseTag(){
+    handleCloseTag() {
-      this.formData.resiSearchTagId ='';
+      this.formData.resiSearchTagId = "";
-      this.formData.resiSearchTagName = '';
+      this.formData.resiSearchTagName = "";
     },
     async iniDefaultData() {
       const { defaultData } = this;
@@ -1062,7 +1076,12 @@ export default {
       } else {
         this.formData.feedback = null;
       }
-
+      this.formData.resiSearchTagId = this.assignSwitch
+        ? this.formData.resiSearchTagId
+        : "";
+      this.formData.resiSearchTagName = this.assignSwitch
+        ? this.formData.resiSearchTagName
+        : "";
       console.log(this.formData);
       // return false
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话