Merge branch 'dev_fuwu0527' into test

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

@@ -122,10 +122,10 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="500"
+                    maxlength="1000"
                     show-word-limit
                     :rows="3"
-                    placeholder="请输入备注，不超过500字"
+                    placeholder="请输入备注，不超过1000字"
                     v-model="formData.remark"></el-input>
         </el-form-item>
         <el-form-item label="直接反馈"
@@ -162,10 +162,10 @@
                         style="display: block">
             <el-input class="item_width_1"
                       type="textarea"
-                      maxlength="500"
+                      maxlength="1000"
                       show-word-limit
                       :rows="3"
-                      placeholder="请输入服务目标，不超过500字"
+                      placeholder="请输入服务目标，不超过1000字"
                       v-model="feedbackFormData.serviceGoal"></el-input>
           </el-form-item>
 
@@ -175,10 +175,10 @@
                         style="display: block">
             <el-input class="item_width_1"
                       type="textarea"
-                      maxlength="500"
+                      maxlength="1000"
                       show-word-limit
                       :rows="3"
-                      placeholder="请输入服务效果，不超过500字"
+                      placeholder="请输入服务效果，不超过1000字"
                       v-model="feedbackFormData.serviceEffect"></el-input>
           </el-form-item>
 
@@ -362,41 +362,6 @@ export default {
         address: '',
         attachmentList: [],//	附件列表
       },
-      formDataTemp: {
-        principalContact: "15111111111",
-        principalName: "31231",
-        remark: "4234234",
-        serviceCategoryKey: "01",
-        serviceOrgId: "1531105677127692289",
-        serviceProjectId: "1531514265581076482",
-        serviceScope: [
-          {
-            objectId: "1479033225060757506",
-            objectName: "合肥路街道",
-            objectType: "street",
-          },
-          {
-            objectId: "1514064686570147842",
-            objectName: "ss",
-            objectType: "street",
-          }
-        ],
-        serviceTimeEnd: "",
-        serviceTimeStart: "",
-
-        feedback: {
-          address: "山东省青岛市市南区南京路73号",
-          latitude: 36.0722275,
-          longitude: 120.38945519,
-          satisfaction: "bad",
-          serviceEffect: "234234234",
-          serviceGoal: "234234",
-          servicePeopleNumber: 1,
-          serviceProjectId: "1531514265581076482",
-          serviceProjectName: "223",
-          serviceStatus: "completed",
-        }
-      },
 
       projectList: [],//服务项目list
       orgList: [],//服务组织list
@@ -430,18 +395,17 @@ export default {
   async mounted () {
     this.startLoading()
     this.initMap()
+    this.$refs.ref_form_feedback.resetFields();
     if (this.formType === 'add') {
       this.$refs.ref_form.resetFields();
       await this.loadScopeTree()
-    }
+    } else {
-
+      this.$set(this.feedbackFormData, 'serviceProjectName', this.serviceProjectName)
-    this.$refs.ref_form_feedback.resetFields();
 
+    }
 
     this.endLoading()
 
-    this.formData = JSON.parse(JSON.stringify(this.formDataTemp));
-    this.feedbackFormData = { ...this.formData.feedback }
   },
 
 
@@ -598,7 +562,7 @@ export default {
       console.log(this.formData)
       // return false
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.formData.principalContact) === false) {
+      if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -959,6 +923,11 @@ export default {
       type: String,
       required: ''
     },
+    serviceProjectName: {//服务项目名称
+      type: String,
+      required: false,
+      default: ''
+    },
     formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
       type: String,
       required: ''

src/views/modules/communityService/fuwujilu/fuwuList.vue

@@ -238,6 +238,7 @@
                 :statusArray="statusArray"
                 :satisfyArray="satisfyArray"
                 :serviceRecordId="serviceRecordId"
+                :serviceProjectName="serviceProjectName"
                 @handleOk="handleOk"
                 @handleClose="handleClose"></add-form>
     </el-dialog>
@@ -344,6 +345,7 @@ export default {
         disabledDate: startDisabledDate
       },
       serviceRecordId: '',
+      serviceProjectName: '',
 
       showAdd: false,
       showDetail: false,
@@ -411,6 +413,7 @@ export default {
 
     async handleDetail (row) {
       this.serviceRecordId = row.serviceRecordId
+
       this.formType = 'detail'
       this.showDetail = true
 
@@ -424,7 +427,9 @@ export default {
 
     //加载组织数据
     async handleFeedback (row) {
+
       this.serviceRecordId = row.serviceRecordId
+      this.serviceProjectName = row.serviceProjectName
       this.addDiaTitle = '服务反馈'
       this.formType = 'feedback'
       this.showAdd = true;

src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue

@@ -29,7 +29,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.serviceCategory || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceCategory || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -47,7 +47,7 @@
             v-model="fmData.serviceName"
           >
           </el-input>
-          <div v-else>{{ fmData.serviceName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -66,7 +66,7 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.serviceContent"
           ></el-input>
-          <div v-else>{{ fmData.serviceContent || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceContent || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -89,7 +89,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.policyLevelName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.policyLevelName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -108,7 +108,7 @@
             placeholder="请输入政策依据，不超过1000字"
             v-model="fmData.policyGround"
           ></el-input>
-          <div v-else>{{ fmData.policyGround || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.policyGround || "--" }}</div>
         </el-form-item>
 
         <el-form-item

src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue

@@ -30,7 +30,7 @@
             >
             </el-option>
           </el-select>
-          <div v-else>{{ fmData.serviceTypeName }}</div>
+          <div style="width:610px" v-else>{{ fmData.serviceTypeName }}</div>
         </el-form-item>
 
         <el-form-item
@@ -48,7 +48,7 @@
             v-model="fmData.orgName"
           >
           </el-input>
-          <div v-else>{{ fmData.orgName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.orgName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -67,7 +67,7 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.orgDescribe"
           ></el-input>
-          <div v-else>{{ fmData.orgDescribe || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.orgDescribe || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -84,7 +84,7 @@
             placeholder="请输入负责人姓名"
             v-model="fmData.principalName"
           ></el-input>
-          <div v-else>{{ fmData.principalName || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.principalName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -101,7 +101,7 @@
             placeholder="请输入联系方式"
             v-model="fmData.principalMobile"
           ></el-input>
-          <div v-else>{{ fmData.principalMobile || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.principalMobile || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -165,7 +165,7 @@
             placeholder="请输入备注，不超过500字"
             v-model="fmData.remark"
           ></el-input>
-          <div v-else>{{ fmData.remark || "--" }}</div>
+          <div style="width:610px" v-else>{{ fmData.remark || "--" }}</div>
         </el-form-item>
       </el-form>
     </div>

src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@@ -469,9 +469,14 @@ export default {
 
     handleServiceChange (type, val) {
       if (val === "social_org") {
-        if (type === "add") this.getServiceuserList(val, "add_demand");
+        if (type === "add") {
-        else this.getServiceuserList(val, "query_demand");
+          this.getServiceuserList(val, "add_demand");
-      } else this.getServiceuserList(val, "");
+        } else {
+          this.getServiceuserList(val, "query_demand");
+        }
+      } else {
+        this.getServiceuserList(val, "");
+      }
     },
 
     async getServiceuserList (serviceType, query) {