Merge branch 'dev_fuwu0527' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev_fuwu0527

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

@@ -11,8 +11,8 @@
 
         <el-form-item label="服务分类"
                       label-width="150px"
-                      prop="serviceCategoryId">
+                      prop="serviceCategoryKey">
-          <el-select v-model="formData.serviceCategoryId"
+          <el-select v-model="formData.serviceCategoryKey"
                      placeholder="请选择"
                      clearable
                      class="item_width_1">
@@ -85,12 +85,12 @@
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
-                      prop="principalConcat"
+                      prop="principalContact"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.principalConcat">
+                    v-model="formData.principalContact">
           </el-input>
         </el-form-item>
 
@@ -101,7 +101,7 @@
                           :picker-options="startPickerOptions"
                           class="item_width_2"
                           type="date"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           value="yyyy-MM-dd"
                           placeholder="开始时间">
           </el-date-picker>
@@ -110,7 +110,7 @@
                           :picker-options="endPickerOptions"
                           class="item_width_2 data-tag"
                           type="date"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           value="yyyy-MM-dd"
                           placeholder="结束时间">
           </el-date-picker>
@@ -139,7 +139,7 @@
 
       </el-form>
       <div v-show="formType==='feedback'||showFeedback">
-        <h3 class="d-h3">反馈内容</h3>
+        <!-- <h3 class="d-h3">反馈内容</h3> -->
 
         <el-form ref="ref_form_feedback"
                  :inline="true"
@@ -196,7 +196,8 @@
           <el-form-item label="服务状态"
                         label-width="150px"
                         prop="serviceStatus">
-            <el-select class="item_width_1"
+            <span>已完成</span>
+            <!-- <el-select class="item_width_1"
                        v-model="feedbackFormData.serviceStatus"
                        placeholder="全部"
                        clearable>
@@ -205,7 +206,7 @@
                          :label="item.label"
                          :value="item.value">
               </el-option>
-            </el-select>
+            </el-select> -->
 
           </el-form-item>
           <el-form-item label="满意度"
@@ -261,17 +262,17 @@
                         prop="attach">
             <el-upload class="upload-demo"
                        :action="uploadUlr"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
                        :on-success="handleFileSuccess"
                        :on-remove="handleFileRemove"
-                       :on-preview="handleFileDownload"
                        :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、excel、pdf文件</div>
+                   class="el-upload__tip">支持图片、word、pdf</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -336,12 +337,12 @@ export default {
 
       keyWords: '',
       formData: {
-        serviceCategoryId: '',//服务分类id	
+        serviceCategoryKey: '',//服务分类id	
         serviceProjectId: '',//服务项目id	
         serviceOrgId: '',//服务组织id	
         serviceScope: [],//
         principalName: '',//经办人(责任人)姓名	
-        principalConcat: '',//经办人联系方式	
+        principalContact: '',//经办人联系方式	
         serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
         serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
         remark: '',//
@@ -354,13 +355,48 @@ export default {
         serviceGoal: '',//	服务目标	
         serviceEffect: '',//	服务效果	
         servicePeopleNumber: null,//	服务人数	
-        serviceStatus: '',//	服务状态。in_service服务中；completed:已完成	
+        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
         satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
         longitude: '',//	经度	
         latitude: '',//	维度	
         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
@@ -382,22 +418,30 @@ export default {
   },
 
   watch: {
-    // "formData.serviceTimeEnd": function (val) {
+    "formData.serviceTimeEnd": function (val) {
-    //   if (val && val != '') {
+      if (val && val != '') {
-    //     let arrayTemp = val.split(' ')
+        let arrayTemp = val.split(' ')
-    //     this.formData.serviceTimeEnd = arrayTemp[0] 
+        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
-    //   }
+      }
 
-    // },
+    },
   },
   components: {},
   async mounted () {
     this.startLoading()
     this.initMap()
+    if (this.formType === 'add') {
       this.$refs.ref_form.resetFields();
-    this.$refs.ref_form_feedback.resetFields();
       await this.loadScopeTree()
+    }
+
+    this.$refs.ref_form_feedback.resetFields();
+
+
     this.endLoading()
+
+    this.formData = JSON.parse(JSON.stringify(this.formDataTemp));
+    this.feedbackFormData = { ...this.formData.feedback }
   },
 
 
@@ -408,6 +452,8 @@ export default {
     },
 
     hancleClickCategray () {
+      this.formData.serviceProjectId = ''
+      this.formData.serviceOrgId = ''
       //获取服务项目
       this.loadProjectList()
       //获取服务组织
@@ -421,8 +467,8 @@ export default {
 
     // 获取服务范围树
     loadScopeTree () {
-      // const url = '/gov/org/isServiceProject/service/serviceScopeTree'
+      const url = '/gov/org/icServiceProject/service/serviceScopeTree'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {}
       window.app.ajax.post(
         url,
@@ -448,10 +494,11 @@ export default {
       this.formData.serviceScope = []
       let selArray = this.$refs["myCascader"].getCheckedNodes()
       selArray.forEach(element => {
+
         let obj = {
-          objectType: element.objectType,
+          objectType: element.data.objectType === 'grid' ? 'grid' : element.data.objectType === 'neighborhood' ? 'neighborhood' : 'agency',
-          objectId: element.objectId,
+          objectId: element.data.objectId,
-          objectName: element.objectName,
+          objectName: element.data.objectName,
         }
         this.formData.serviceScope.push(obj)
       });
@@ -460,17 +507,17 @@ export default {
 
     //加载组织
     async loadProjectList () {
-      // const url = '/heart/icServiceProject/serviceProjectList'
+      const url = '/heart/icServiceProject/serviceProjectList'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/serviceProjectList'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/serviceProjectList'
       let params = {
         isPage: false,
-        serviceCategory: this.formData.serviceCategoryId,
+        serviceCategoryKey: this.formData.serviceCategoryKey,
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.projectList = data.list
+        this.projectList = [...data.list]
       } else {
         this.$message.error(msg)
       }
@@ -478,10 +525,10 @@ export default {
 
     //加载组织
     async loadOrgList () {
-      // const url = '/heart/icServiceOrg/selectlist'
+      const url = '/heart/icServiceOrg/selectlist'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceOrg/selectlist'
       let params = {
-        serviceType: this.formData.serviceCategoryId,
+        serviceType: this.formData.serviceCategoryKey,
 
       }
 
@@ -496,6 +543,15 @@ export default {
 
     async handleComfirm () {
 
+      if (this.formType === 'add') {
+        this.handleAdd()
+      } else if (this.formType === 'feedback') {
+        this.handleFeedback()
+      }
+    },
+
+    async handleAdd () {
+
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -530,10 +586,30 @@ export default {
     },
 
     async addFuwu () {
+      if (this.showFeedback) {
+        this.feedbackFormData.attachmentList = []
+        this.feedbackFormData.attachmentList = [...this.fileList]
+        this.formData.feedback = { ... this.feedbackFormData }
+      } else {
+        this.formData.feedback = null
+      }
+
+
       console.log(this.formData)
-      return false
+      // return false
-      // const url = '/heart/icServiceProject/service/initiate'
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+      if (regPhone.test(this.formData.principalContact) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+
+      const url = '/heart/icServiceProject/service/initiate'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
       let params = {
 
         ...this.formData
@@ -549,17 +625,62 @@ export default {
         this.$message.error(msg)
       }
     },
+    async handleFeedback () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      this.$refs['ref_form_feedback'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+          this.addFeecback()
+
+        }
+
+      })
+
+    },
+
+    async addFeecback () {
+
+      this.feedbackFormData.attachmentList = []
+      this.feedbackFormData.attachmentList = [...this.fileList]
+      this.feedbackFormData.serviceRecordId = this.serviceRecordId
+
+      console.log(this.feedbackFormData)
+      // return false
+
+      const url = '/heart/icServiceProject/service/feedback'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
+      let params = {
+
+        ...this.feedbackFormData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message.success('发起成功')
+        this.resetData()
+        this.$emit('handleOk')
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
     beforeUpload (file) {
       const array = file.name.split('.')
       const extension = array[array.length - 1]
 
-      if (extension !== 'xls'
+      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
-        && extension !== 'xlsx'
+
-        && extension !== 'doc'
+      if (formatarray.indexOf(extension) === -1) {
-        && extension !== 'docx'
+        this.$message.error('只支持图片、word、pdf')
-        && extension !== 'pdf') {
-        this.$message.error('只能上传word、excel、pdf文件！')
         return false
       }
 
@@ -578,8 +699,28 @@ export default {
         const array = file.name.split('.')
         const fileType = array[array.length - 1]
 
+        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
+        const videoarray = ['mp4', 'wma', 'm4a']
+        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
+        const mp3Array = ['mp3']
+
+        if (picArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'image'
+        } else if (videoarray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'video'
+        } else if (docArray.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'doc'
+        } else if (mp3Array.indexOf(fileType) > -1) {
+          file.attachmentFormat = 'voice'
+        }
+
         file.url = res.data.url
         file.type = fileType
+
+        file.attachmentName = file.name
+        file.attachmentType = file.type
+        file.attachmentUrl = file.url
+
         this.fileList.push(file)
         console.log(this.fileList)
       } else this.$message.error(res.msg)
@@ -718,12 +859,12 @@ export default {
 
     resetData () {
       this.formData = {
-        serviceCategoryId: '',//服务分类id	
+        serviceCategoryKey: '',//服务分类id	
         serviceProjectId: '',//服务项目id	
         serviceOrgId: '',//服务组织id	
         serviceScope: [],//
         principalName: '',//经办人(责任人)姓名	
-        principalConcat: '',//经办人联系方式	
+        principalContact: '',//经办人联系方式	
         serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
         serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
         remark: '',//
@@ -736,7 +877,7 @@ export default {
         serviceGoal: '',//	服务目标	
         serviceEffect: '',//	服务效果	
         servicePeopleNumber: null,//	服务人数	
-        serviceStatus: '',//	服务状态。in_service服务中；completed:已完成	
+        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
         satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
         longitude: '',//	经度	
         latitude: '',//	维度	
@@ -764,7 +905,7 @@ export default {
     dataRule () {
       return {
 
-        serviceCategoryId: [
+        serviceCategoryKey: [
           { required: true, message: '服务类别不能为空', trigger: 'blur' },
         ],
         serviceProjectId: [

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

@@ -5,97 +5,109 @@
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
+               :disabled="formType==='detail'"
                :rules="dataRule"
-               :disabled="formType === 'detail'"
+               class="div_form">
-               class="form">
 
         <el-form-item label="服务分类"
-                      prop="serviceCategoryId">
+                      label-width="150px"
-          <el-select v-model="formData.serviceCategoryId"
+                      prop="serviceCategoryKey">
+          <span>{{formData.serviceCategoryName}}</span>
+
+          <!-- <el-select v-model="formData.serviceCategoryKey"
                      placeholder="请选择"
-                     size="small"
                      clearable
-                     class="item_width_2">
+                     class="item_width_1">
-            <el-option v-for="item in categrayArray"
+            <el-option v-for="(item,index) in categrayArray"
+                       @click.native="hancleClickCategray(index)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
 
         <el-form-item label="服务项目"
-                      prop="type"
+                      prop="serviceProjectId"
                       label-width="150px"
                       style="display: block">
-          <el-select class="item_width_1"
+          <span>{{formData.serviceProjectName}}</span>
-                     v-model="formData.type"
+          <!-- <el-select class="item_width_1"
+                     v-model="formData.serviceProjectId"
                      placeholder="请选择"
                      filterable
                      clearable>
-            <el-option v-for="item in typeList"
+            <el-option v-for="(item,index) in projectList"
-                       :key="item.value"
+                       @click.native="hancleClickProject(index)"
-                       :label="item.label"
+                       :key="item.serviceProjectId"
-                       :value="item.value">
+                       :label="item.serviceName"
+                       :value="item.serviceProjectId">
             </el-option>
-          </el-select>
+          </el-select> -->
 
         </el-form-item>
         <el-form-item label="服务组织"
-                      prop="type"
+                      prop="serviceOrgId"
                       label-width="150px"
                       style="display: block">
-          <el-select class="item_width_1"
+          <span>{{formData.serviceOrgName}}</span>
-                     v-model="formData.type"
+          <!-- <el-select class="item_width_1"
+                     v-model="formData.serviceOrgId"
                      placeholder="请选择"
                      filterable
                      clearable>
-            <el-option v-for="item in typeList"
+            <el-option v-for="item in orgList"
-                       :key="item.value"
+                       :key="item.icServiceOrgId"
-                       :label="item.label"
+                       :label="item.orgName"
-                       :value="item.value">
+                       :value="item.icServiceOrgId">
             </el-option>
-          </el-select>
+          </el-select> -->
 
         </el-form-item>
 
         <el-form-item label="服务范围"
-                      prop="unitName"
+                      prop="serviceScope"
                       label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <div v-for="item in formData.serviceScope"
-                    maxlength="50"
+               :key="item.objectId">
-                    show-word-limit
+            <div>{{item.objectName}}</div>
-                    placeholder="请输入单位名称"
+          </div>
-                    v-model="formData.unitName">
+          <!-- <el-cascader class="item_width_1"
-          </el-input>
+                       ref="myCascader"
+                       v-model="scopeIdArray"
+                       :key="iscascaderShow"
+                       :options="casOptions"
+                       :props="optionProps"
+                       :show-all-levels="false"
+                       @change="handleChangeScope"></el-cascader> -->
         </el-form-item>
 
         <el-form-item label="经办人"
-                      prop="contact"
+                      prop="principalName"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人姓名"
-                    v-model="formData.contact">
+                    v-model="formData.principalName">
           </el-input>
         </el-form-item>
         <el-form-item label="联系方式"
-                      prop="contactMobile"
+                      prop="principalContact"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入联系人电话"
-                    v-model="formData.contactMobile">
+                    v-model="formData.principalContact">
           </el-input>
         </el-form-item>
 
         <el-form-item label="服务时间"
+                      label-width="150px"
                       prop="serviceTimeStart">
           <el-date-picker v-model="formData.serviceTimeStart"
                           :picker-options="startPickerOptions"
                           class="item_width_2"
-                          size="small"
                           type="date"
                           value-format="yyyy-MM-dd"
                           value="yyyy-MM-dd"
@@ -105,7 +117,6 @@
           <el-date-picker v-model="formData.serviceTimeEnd"
                           :picker-options="endPickerOptions"
                           class="item_width_2 data-tag"
-                          size="small"
                           type="date"
                           value-format="yyyy-MM-dd"
                           value="yyyy-MM-dd"
@@ -128,150 +139,6 @@
 
       </el-form>
 
-      <h3>反馈内容</h3>
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
-
-        <el-form-item label="分类"
-                      prop="type"
-                      label-width="150px"
-                      style="display: block">
-          <el-select class="item_width_1"
-                     v-model="formData.type"
-                     placeholder="请选择"
-                     filterable
-                     clearable>
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="单位名称"
-                      prop="unitName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入单位名称"
-                    v-model="formData.unitName">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="服务事项"
-                      prop="serviceMatterList"
-                      label-width="150px"
-                      style="display: block">
-          <el-checkbox-group class="item_width_1"
-                             style="display:flex;flex-wrap:wrap"
-                             v-model="formData.serviceMatterList">
-            <el-checkbox v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.value">{{item.label}}</el-checkbox>
-
-          </el-checkbox-group>
-
-        </el-form-item>
-        <el-form-item label="联系人"
-                      prop="contact"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.contact">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="contactMobile"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.contactMobile">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="在职党员"
-                      style="display: block"
-                      prop="memberCount"
-                      label-width="150px">
-          <el-input-number class="item_width_4"
-                           v-model="formData.memberCount"
-                           :min="0"
-                           :max="9999"
-                           label="在职党员"></el-input-number>
-        </el-form-item>
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input 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-item label="位置坐标"
-                      prop="longitude"
-                      label-width="150px"
-                      style="display: block">
-          <div style="width:500px">
-
-            <div class="div_map">
-              <div id="app">
-
-              </div>
-              <div class="div_searchmap">
-                <el-input class="item_width_4"
-                          maxlength="50"
-                          size="mini"
-                          placeholder="请输入关键字"
-                          v-model="keyWords">
-                </el-input>
-                <el-button style="margin-left: 10px"
-                           type="primary"
-                           size="mini"
-                           @click="handleSearchMap">查询</el-button>
-              </div>
-            </div>
-
-            <div style="margin-top: 10px">
-              <span>经度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入经度"
-                        v-model="formData.longitude">
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input class="item_width_3"
-                        maxlength="50"
-                        placeholder="请输入纬度"
-                        v-model="formData.latitude">
-              </el-input>
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item label="地理位置"
-                      prop="address"
-                      label-width="150px"
-                      style="display: block">
-
-          <el-input class="item_width_1"
-                    v-model="formData.address">
-          </el-input>
-
-        </el-form-item>
-      </el-form>
     </div>
 
     <div class="div_btn">
@@ -318,11 +185,10 @@ export default {
     }
 
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+
 
       btnDisable: false,
 
-      unitId: '',
       keyWords: '',
       formData: {
         unitName: '',
@@ -345,7 +211,7 @@ export default {
         disabledDate: startDisabledDate
       },
 
-      categrayArray: [],
+
       projectList: [],
 
     }
@@ -353,75 +219,27 @@ export default {
   components: {},
   mounted () {
     if (this.serviceRecordId) {//详情
-
+      this.loadInfo()
     }
-    this.initMap()
+    // this.initMap()
     console.log('mounted')
   },
-  activated () {
-    console.log('activated')
-  },
 
-  methods: {
-
-    async initForm (type, unitId) {
-      this.startLoading()
-      this.$refs.ref_form.resetFields();
-
-      //获取服务事项
-      await this.loadService()
-
-      this.formType = type
-      if (unitId) {
-        this.unitId = unitId
-        this.formData.id = unitId
-        await this.loadFormData()
-      } else {
-        map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-        this.setMarker(36.0722275, 120.38945519)
-      }
 
-      this.endLoading()
+  methods: {
-
-    },
-
-    //获取服务事项下拉框
-    async loadService () {
-      const url = "/heart/serviceitem/dict-list"
-      let params = {
-        type: 'usable'
-        // parentCategoryCode: '1010'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
 
-    },
 
     //加载组织
-    async loadFormData () {
+    async loadInfo () {
-      const url = '/heart/icpartyunit/detail'
+      const url = `/heart/icServiceProject/service/detail/${this.serviceRecordId}`
-      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail' + this.serviceRecordId
-      let params = {
+      let params = {}
-        id: this.unitId
-      }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
-          data.serviceMatterList = []
-        }
-
         this.formData = { ...data }
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        this.formData.serviceRecordId = this.serviceRecordId
-        this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)
       }
@@ -440,16 +258,16 @@ export default {
           app.util.validateRule(messageObj)
           this.btnDisable = false
         } else {
-          this.addUnit()
+          this.editFuwu()
         }
 
       })
 
 
     },
-    async addUnit () {
+    async editFuwu () {
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.formData.contactMobile) === false) {
+      if (regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -458,11 +276,9 @@ export default {
         return false;
       }
 
-      let url = '/heart/icpartyunit/save'
+      let url = '/heart/icServiceProject/service/update'
-      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
+      // let url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/update"
-      // if (this.formType === 'edit') {
+
-      //  this.formData.id = this.unitId
-      // } 
 
       const { data, code, msg } = await requestPost(url, this.formData)
 
@@ -472,8 +288,8 @@ export default {
           message: '操作成功'
         })
         this.resetData()
-        this.$emit('dialogOk')
+
-        this.btnDisable = false
+        this.$emit('handleOk')
       } else {
         this.btnDisable = false
         this.$message.error(msg)
@@ -600,19 +416,17 @@ export default {
 
 
     resetData () {
-      this.unitId = ''
-      this.keyWords = ''
       this.formData = {
-        unitName: '',
+        serviceCategoryKey: '',//服务分类id	
-        serviceMatterList: [],
+        serviceProjectId: '',//服务项目id	
-        type: '',
+        serviceOrgId: '',//服务组织id	
-        contact: '',
+        serviceScope: [],//
-        contactMobile: '',
+        principalName: '',//经办人(责任人)姓名	
-        memberCount: 0,
+        principalContact: '',//经办人联系方式	
-        remark: '', //备注【最大500字】
+        serviceTimeStart: '',//服务起始时间yyyy-MM-dd	
-        address: '', //详细地址
+        serviceTimeEnd: '',//服务截止时间yyyy-MM-dd	
-        longitude: '', //经度
+        remark: '',//
-        latitude: '' //纬度
+
       }
     },
     // 开启加载动画
@@ -635,44 +449,39 @@ export default {
     dataRule () {
       return {
 
-        unitName: [
+        serviceCategoryKey: [
-          { required: true, message: '单位名称不能为空', trigger: 'blur' },
+          { required: true, message: '服务类别不能为空', trigger: 'blur' },
         ],
-        type: [
+        serviceProjectId: [
-          { required: true, message: '分类不能为空', trigger: 'blur' }
+          { required: true, message: '服务项目不能为空', trigger: 'blur' }
         ],
 
-        contact: [
+        serviceOrgId: [
-          { required: true, message: '联系人不能为空', trigger: 'blur' }
+          { required: true, message: '服务组织不能为空', trigger: 'blur' }
-        ],
-        contactMobile: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' }
         ],
-        memberCount: [
+        serviceTimeStart: [
-          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+          { required: true, message: '服务时间不能为空', trigger: 'blur' }
         ],
-        address: [
+        serviceScope: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+          { required: true, message: '服务范围不能为空', trigger: 'blur' }
         ],
-        longitude: [
+
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]
       }
     },
-
   },
   props: {
 
     serviceRecordId: {
       type: String,
-      required: ''
+      required: true
     },
-    formType: {
+    formType: {//表单操作类型 add新增，edit编辑，detail详情,feedback反馈
       type: String,
-      required: ''
+      required: true
     },
     categrayArray: {
       type: Array,
+      required: true,
       default () {
         return []
       }
@@ -680,18 +489,8 @@ export default {
   }
 }
 </script>
-<style scoped>
+
-.div_map {
-  position: relative;
-}
-.div_searchmap {
-  z-index: 5000;
-  position: absolute;
-  top: 5px;
-  left: 5px;
-}
-</style>
 
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/management/form-main.scss";
 </style>

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

@@ -9,8 +9,8 @@
           <div>
 
             <el-form-item label="服务分类"
-                          prop="serviceCategoryId">
+                          prop="serviceCategoryKey">
-              <el-select v-model="formData.serviceCategoryId"
+              <el-select v-model="formData.serviceCategoryKey"
                          placeholder="请选择"
                          size="small"
                          clearable
@@ -49,7 +49,7 @@
                               class="item_width_2"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               value="yyyy-MM-dd"
                               placeholder="开始时间">
               </el-date-picker>
@@ -59,7 +59,7 @@
                               class="item_width_2 data-tag"
                               size="small"
                               type="date"
-                              value-format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd HH:mm:ss"
                               value="yyyy-MM-dd"
                               placeholder="结束时间">
               </el-date-picker>
@@ -133,6 +133,7 @@
 
           <el-table-column prop="serviceCategoryName"
                            align="center"
+                           width="100"
                            label="服务类别"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -143,17 +144,17 @@
                            :show-overflow-tooltip="true">
           </el-table-column>
 
-          <el-table-column prop="serviceTimeStart"
+          <el-table-column prop="serviceOrgName"
                            align="center"
-                           width="110"
+                           min-width="150"
                            label="服务组织名称"
                            :show-overflow-tooltip="true">
 
           </el-table-column>
 
-          <el-table-column prop="address"
+          <el-table-column prop="serviceTimeStart"
                            align="center"
-                           min-width="210"
+                           width="250"
                            :show-overflow-tooltip="true"
                            label="服务时间">
             <template slot-scope="scope">
@@ -167,7 +168,7 @@
                            label="服务状态"
                            :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{scope.row.serviceStatus==='in_service'?'服务':'已完成'}}</span>
+              <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
             </template>
           </el-table-column>
 
@@ -181,7 +182,7 @@
           <el-table-column fixed="right"
                            label="操作"
                            align="center"
-                           width="100">
+                           width="180">
             <template slot-scope="scope">
               <el-button @click="handleDetail(scope.row)"
                          type="text"
@@ -193,12 +194,12 @@
                          size="small"
                          class="div-table-button--edit">编辑</el-button>
               <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleFreeBack(scope.row)"
+                         @click="handleFeedback(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--edit">反馈</el-button>
               <el-button v-if="scope.row.serviceStatus==='in_service'"
-                         @click="handleCancel(scope.row)"
+                         @click="handleDel(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--delete">取消</el-button>
@@ -225,7 +226,7 @@
                :visible.sync="showAdd"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'新增记录'"
+               :title="addDiaTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
@@ -235,19 +236,25 @@
                 :categrayArray="categrayArray"
                 :statusArray="statusArray"
                 :satisfyArray="satisfyArray"
+                :serviceRecordId="serviceRecordId"
                 @handleOk="handleOk"
                 @handleClose="handleClose"></add-form>
     </el-dialog>
-    <el-dialog :visible.sync="showDetail"
+    <el-dialog v-if="showDetail"
+               :visible.sync="showDetail"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="'记录详情'"
+               :title="detailDiaTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
                @closed="showDetail = false">
       <detail-form ref="ref_detail_form"
-                   :serviceRecordId="serviceRecordId">
+                   :serviceRecordId="serviceRecordId"
+                   :categrayArray="categrayArray"
+                   @handleOk="handleOk"
+                   @handleClose="handleClose"
+                   :formType="formType">
       </detail-form>
     </el-dialog>
 
@@ -317,7 +324,7 @@ export default {
       ],
 
       formData: {
-        serviceCategoryId: '',//服务类别id	
+        serviceCategoryKey: '',//服务类别id	
         serviceProjectName: '',//项目名称	
         serviceOrgName: '',//服务组织名称	
         serviceTimeStart: '',//服务开始时间yyyy-MM-dd	
@@ -340,7 +347,9 @@ export default {
       showAdd: false,
       showDetail: false,
       showFeedback: false,
-      formType: 'add'
+      formType: 'add',
+      addDiaTitle: '发起服务',
+      detailDiaTitle: '服务详情',
 
     };
   },
@@ -353,13 +362,13 @@ export default {
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   watch: {
-    // "formData.serviceTimeEnd": function (val) {
+    "formData.serviceTimeEnd": function (val) {
-    //   if (val && val != '') {
+      if (val && val != '') {
-    //     let arrayTemp = val.split(' ')
+        let arrayTemp = val.split(' ')
-    //     this.formData.serviceTimeEnd = arrayTemp[0] 
+        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
-    //   }
+      }
 
-    // },
+    },
   },
   mounted () {
     console.log(this.$store.state)
@@ -394,6 +403,7 @@ export default {
 
 
     async handleAdd () {
+      this.addDiaTitle = '发起服务'
       this.formType = 'add'
       this.showAdd = true;
     },
@@ -401,27 +411,22 @@ export default {
     async handleDetail (row) {
       this.serviceRecordId = row.serviceRecordId
       this.formType = 'detail'
-      // this.showDetail = true
+      this.showDetail = true
-      this.showAdd = true;
-    },
 
-    //加载组织数据
+    },
-    async handleDispose (row) {
+    async handleEdit (row) {
       this.serviceRecordId = row.serviceRecordId
-      const url = "/gov/project/icEvent/detail";
+      this.formType = 'edit'
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+      this.showDetail = true
-
-      const { data, code, msg } = await requestPost(url, {
-        serviceRecordId: this.serviceRecordId,
-      });
-
-      if (code === 0) {
 
-        this.eventDetailData = { ...data };
+    },
 
-      } else {
+    //加载组织数据
-        this.$message.error(msg);
+    async handleFeedback (row) {
-      }
+      this.serviceRecordId = row.serviceRecordId
+      this.addDiaTitle = '服务反馈'
+      this.formType = 'feedback'
+      this.showAdd = true;
     },
 
 
@@ -429,33 +434,54 @@ export default {
       this.serviceRecordId = ""
       this.formType = ''
 
-      this.showAdd = false;
+      this.showAdd = false
-      this.getTableData()
+      this.showDetail = false
+
 
     },
     handleOk () {
       this.handleClose()
       this.pageNo = 1
+      this.getTableData()
 
     },
 
-    handleEditSuccess () {
-      this.handleClose();
-      this.getTableData();
-    },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel (row) {
-      console.log(rowData, rowIndex);
+
-      const url =
+      this.serviceRecordId = row.serviceRecordId
-        "/heart/iccommunityselforganization/delcommunityselforganization";
+
-      const { tableData } = this;
+      this.$confirm("确认取消服务?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.cancelFuwu()
+        })
+        .catch(err => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
         });
 
+
+
+    },
+
+    async cancelFuwu () {
+
+      const url = `/heart/icServiceProject/service/cancel/${this.serviceRecordId}`;
+
+
+      const { data, code, msg } = await requestPost(url, {});
+
       if (code === 0) {
-        this.$message.success("删除成功！");
+        this.$message.success("取消成功！");
         this.getTableData();
       } else {
         this.$message.error("操作失败！");
@@ -463,8 +489,8 @@ export default {
     },
 
     async getTableData () {
-      // const url = "/heart/icServiceProject/service/recordList";
+      const url = "/heart/icServiceProject/service/recordList";
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
+      // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
@@ -546,14 +572,13 @@ export default {
 
     resetSearch () {
       this.formData = {
-        gridId: '',
+        serviceCategoryKey: '',
-        serviceCategoryId: '',
         serviceProjectName: '',
         serviceOrgName: '',
-        mobile: '',
         serviceTimeStart: '',
         serviceTimeEnd: '',
         serviceStatus: '',
+        satisfaction: ''
       }