bug#465 bug#449

src/views/components/resiForm.vue

@@ -1724,7 +1724,8 @@ export default {
             this.form.gender = sex == 1 ? '1' : '2'
             this.form.oldPeopleFlag = age >= 60 ? 1 : 0
             // this.form.IS_BDHJ = huji == _id ? '1' : ''
-            this.validateIdcard(this.form.idNum)
+              // 身份证前端验证角色方法 因原型没有注释
+            // this.validateIdcard(this.form.idNum)
             console.log('age-----', age, _id)
         }
 

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

@@ -118,77 +118,6 @@
 
         <el-form ref="ref_form_feedback" :inline="true" :model="feedbackFormData" :rules="feedbackDataRule"
           class="div_form">
-          <!-- <el-form-item
-            label="服务目标"
-            prop="serviceGoal"
-            :class="{ 'form-item': source === 'visiual' }"
-            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
-            label="服务效果"
-            prop="serviceEffect"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            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
-            label="服务人数"
-            style="display: block"
-            :class="{ 'form-item': source === 'visiual' }"
-            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
-            label="服务状态"
-            style="display: block"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            prop="serviceStatus"
-          >
-            <span>已完成</span> -->
-          <!-- <el-select class="item_width_1"
-                         v-model="feedbackFormData.serviceStatus"
-                         placeholder="全部"
-                         clearable>
-                <el-option v-for="item in statusArray"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select> -->
-          <!-- </el-form-item> -->
           <el-form-item label="满意度" style="display: block" label-width="150px"
             :class="{ 'form-item': source === 'visiual' }" prop="satisfaction">
             <el-select class="item_width_2" v-model="feedbackFormData.satisfaction" placeholder="全部" clearable>
@@ -201,68 +130,7 @@
             <el-input class="item_width_1" type="textarea" maxlength="1000" show-word-limit :rows="3"
               v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
-          <!-- <el-form-item label="详细位置" label-width="150px">
-             <el-input
-              class="item_width_1"
-              v-model="feedbackFormData.address"
-            ></el-input>
-          </el-form-item> -->
-          <!-- <el-form-item
-            label="地图位置"
-            label-width="150px"
-            :class="{ 'form-item': source === 'visiual' }"
-            style="display: block"
-          >
-            <div style="width: 500px">
-              <div class="div_map">
-                <div id="map_app"></div>
-                <div class="div_searchmap">
-                  <el-input
-                    maxlength="50"
-                    placeholder="请输入关键字"
-                    v-model="keyWords"
-                  >
-                  </el-input>
-                  <el-button
-                    style="margin-left: 10px"
-                    type="primary"
-                    size="mini"
-                    @click="handleSearchMap"
-                    >查询</el-button
-                  >
-                </div>
-              </div>
-            </div>
-          </el-form-item> -->
-
-          <!-- <el-form-item
-            class="block"
-            label="附件"
-            :class="{ 'form-item': source === 'visiual' }"
-            label-width="150px"
-            prop="attach"
-          >
-            <el-upload
-              :headers="$getElUploadHeaders()"
-              class="upload-demo"
-              :action="uploadUlr"
-              accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-              :on-success="handleFileSuccess"
-              :on-remove="handleFileRemove"
-              :limit="3"
-              :before-upload="beforeUpload"
-              :file-list="fileList"
-            >
-              <el-button
-                size="small"
-                :disabled="fileList.length === 3"
-                type="primary"
-                >点击上传</el-button
-              >
-              <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
-            </el-upload>
-          </el-form-item> -->
-        </el-form>
+          </el-form>
       </div>
     </div>
 
@@ -613,6 +481,7 @@ export default {
     },
     addFormOk(val) {
       this.showLabelForm = false;
+      console.log(val);
       this.formData.resiSearchTagId = val.tagId;
       this.formData.resiSearchTagName = val.tagName;
     },
@@ -844,13 +713,11 @@ export default {
       } else {
         this.formData.feedback = null;
       }
-      this.formData.resiSearchTagId = this.assignFlag
-        ? this.formData.resiSearchTagId
-        : "";
-      this.formData.resiSearchTagName = this.assignFlag
-        ? this.formData.resiSearchTagName
-        : "";
-      console.log(this.formData);
+      if(!this.formData.assignFlag){
+        this.formData.resiSearchTagId = ""
+        this.formData.resiSearchTagName = ""
+      }
+      console.log(  this.formData.resiSearchTagId);
       // return false
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
 
@@ -865,7 +732,6 @@ export default {
         });
         return false;
       }
-
       if (this.source === "manage") {
         this.formData.serviceCategoryKey = this.serviceCategoryKey;
       }

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

@@ -114,7 +114,8 @@
           </el-switch>
         </el-form-item>
       </el-form>
-      <el-form :model="newFormData" :rules="newDataRule" ref="ref_gxxq_form1">
+        
+      <el-form :model="newFormData" :rules="newDataRule" ref="ref_gxxq_form1" class="div_form">
         <el-form-item
           v-if="formData.assignFlag"
           label="服务方"
@@ -192,7 +193,6 @@
           label-width="150px"
           prop="serviceTimeEnd"
         >
-          <!--  -->
           <el-date-picker
             v-model="newFormData.serviceTimeStart"
             :picker-options="startPickerOptions"
@@ -204,7 +204,6 @@
             placeholder="开始时间"
           >
           </el-date-picker>
-          <!-- -->
           <span class="u-data-tag">至</span>
           <el-date-picker
             v-model="newFormData.serviceTimeEnd"
@@ -249,8 +248,6 @@
         @dialogCancle="addFormCancle"
         @dialogOk="addFormOk"
       >
-        <!--    @handleOk="handleOk"
-          @handleClose="handleClose" -->
       </label-form>
     </el-dialog>
   </div>
@@ -592,7 +589,7 @@ export default {
     },
 
     async handleServiceChange(type, val) {
-      console.log(val);
+      this.newFormData.serverOrgId = ''
       await this.getServiceuserList(val);
     },
 
@@ -705,6 +702,8 @@ export default {
         this.newFormData.serviceScopeList,
         "objectId"
       );
+      let serviceScopeListCopy = this.newFormData.serviceScopeList.slice();
+
       //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
       this.newArr = this.sarr.filter(
         (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
@@ -724,10 +723,9 @@ export default {
           arr.push(item);
         }
       });
-
       this.newFormData.serviceScopeList = arr;
-      
-      let params = {
+      try {
+        let params = {
         title: this.formData.title,
         content: this.formData.content,
         commonServiceTypeId: this.formData.commonServiceTypeId,
@@ -744,17 +742,22 @@ export default {
         url = "/governance/commonDemand/update";
         params.id = this.scopeId;
       }
-
-      console.log(params);
-      const { data, code, msg } = await requestPost(url, params);
+        const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message.success("添加成功");
         this.resetData();
         this.$emit("handleComfirm");
-      } else if (code >= 8000) {
+      }else{
+        this.newFormData.serviceScopeList = serviceScopeListCopy
         this.$message.error(msg);
+        console.log(msg);
       }
+      }catch (error) {
+        this.newFormData.serviceScopeList = serviceScopeListCopy
+        this.$message.error(msg);
+        console.log(msg);
+        }
     },
 
     handleCancle() {

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

@@ -301,15 +301,12 @@ export default {
       this.tagId = row.tagId;
       this.tagObj = row;
       for (let i in this.tableData) {
-        this.handleChangeSource(this.tableData[i], [i], type);
-        this.handleChangeFieldsType(this.tableData[i], [i], type);
-        setTimeout(() => {
-          this.handleChangeFieldsName(this.tableData[i], [i], type);
-        }, 300);
+       await this.handleChangeSource(this.tableData[i], [i], type);
+       await this.handleChangeFieldsType(this.tableData[i], [i], type);
+       await this.handleChangeFieldsName(this.tableData[i], [i], type);
       }
     },
     querySearchAsync(val, cb) {
-      console.log(this.searchList);
       var searchList = this.searchList;
       var results = val
         ? searchList.filter(this.createStateFilter(val))
@@ -355,7 +352,6 @@ export default {
     },
     // 选择数据源
     async handleChangeSource(row, index, type) {
-      console.log(row);
       if (row.dataSource == "resi") {
         let url = "/oper/customize/icformitemgroup/list";
         let params = {
@@ -485,7 +481,6 @@ export default {
       }
       if (row.itemId == "") return;
       //  列表对应值的option有的是通过接口获取的就需要再通过optionSourceType判断下
-      console.log(arr[0].optionSourceType);
       if (arr[0].optionSourceType == "remote") {
         let url = "";
         let params = {};