Merge branch 'dev_zxc_work_log' into dev

src/views/modules/communityService/worklog/workLogForm.vue

@@ -31,8 +31,9 @@
                       style="display: block"
                       prop="serviceType">
           <el-select v-model="formData.serviceType"
-                     placeholder="请选择"
                      filterable
+                     :disabled="disabled"
+                     placeholder="请选择"
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -130,7 +131,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
 import {requestGet} from "../../../../js/dai/request";
@@ -150,7 +150,7 @@ export default {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       agencyId: '',
       btnDisable: false,
-
+      disabled: false,
       applicantId: '',
       keyWords: '',
       formData: {
@@ -190,6 +190,11 @@ export default {
 
       //获取服务事项
       await this.getServiceTypeList()
+      this.serviceTypeList.forEach(s => {
+        if (s.serviceType === this.formData.serviceType){
+          this.disabled = s.enabled
+        }
+      })
       this.getGridList(type)
       this.formType = type
       if (type === 'edit'){
@@ -201,7 +206,7 @@ export default {
 
     //获取服务事项下拉框
     async getServiceTypeList () {
-      const url = "/heart/workdiaryService/serviceType/page"
+      const url = "/heart/workdiaryService/serviceType/avaliableList"
       // let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
       let params = {
         pageNo: 1,