Merge branch 'V4.3.2_bug' into feature

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

@@ -6,7 +6,7 @@
                 <el-form-item label="服务类别" prop="categoryCode" label-width="150px">
                     <el-cascader v-model.trim="formData.categoryCode" :options="demandOptions"
                         :props="{ label: 'categoryName', value: 'categoryCode', children: 'childCateList' }" clearable
-                        size="small" class="u-item-width-normal"></el-cascader>
+                        size="small" class="u-item-width-normal" @change="handelChangeCategoryCode"></el-cascader>
                 </el-form-item>
                 <el-form-item label="服务事项" prop="serviceName" label-width="150px"
                     :class="{ 'form-item': source === 'visiual' }" style="display: block">
@@ -383,6 +383,13 @@ export default {
     },
 
     methods: {
+        handelChangeCategoryCode(val){
+            if(val[0] === '1041'){
+                this.serviceOptions.push({label:'公益岗',value:'public_welfare_post'})
+            }else{
+                this.serviceOptions = this.serviceOptions.filter(item=>item.value!='public_welfare_post')
+            }
+        },
         handelDisabledRules(v) {
             if (!v) {
                 delete this.dataRule.resiSearchTagId;

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

@@ -146,7 +146,7 @@
         />
 
         <el-table-column
-          label="指派服务"
+          label="需求状态"
           prop="assignFlag"
           fixed="left"
           align="center"