Merge branch 'dev_zxc_work_log' into dev

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

@@ -30,10 +30,7 @@
                       label-width="150px"
                       style="display: block"
                       prop="serviceType">
-          <el-select v-model="formData.serviceType"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
+          <el-select v-model="formData.serviceType" filterable placeholder="请选择"
                      clearable>
             <el-option v-for="item in serviceTypeList"
                        :key="item.serviceType"
@@ -190,16 +187,19 @@ 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'){
         this.formData = row
         this.getDemandUserList(this.formData.gridId)
+        this.serviceTypeList.forEach(s => {
+          if (s.serviceType === this.formData.serviceType){
+            this.disabled = s.enabled === 1 ? true : false
+          }
+        })
+        if (!this.disabled){
+          this.formData.serviceType = ''
+        }
       }
       this.endLoading()
     },
@@ -324,6 +324,7 @@ export default {
     resetData () {
       this.demandUserList = []
       this.optionsG = []
+      this.disabled = false
       this.formData = {
         serviceType: 0,
         gridId: '',