Merge branch '1121筛选' into dev

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

@@ -506,7 +506,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
-            this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1043');
+            this.searchdemandOptions = this.getTreeData(res.data).filter((item) => item.categoryCode == '1044');
           }
         })
         .catch(() => {

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

@@ -306,7 +306,7 @@
     >
       <el-form
         v-if="dialogVisible"
-        label-width="120px"
+        label-width="130px"
         :model="form"
         :rules="rules"
         ref="ruleForm"
@@ -318,7 +318,7 @@
             v-model="form.gridName"
             :disabled="disabled"
             size="small"
-            class="u-item-width-normal"
+            class="input-width-small"
           ></el-input>
           <!-- <span >{{ form.gridName }}</span> -->
           <el-select
@@ -327,7 +327,7 @@
             filterable
             placeholder="请选择"
             size="small"
-            class="u-item-width-normal"
+            class="input-width-small"
             clearable
             :disabled="disabled"
             @change="handleGridChange"
@@ -356,7 +356,7 @@
             :disabled="disabled"
             clearable
             size="small"
-            class="u-item-width-normal"
+            class="input-width-small"
             @change="handleCateSlect"
           ></el-cascader>
           <!-- <el-select v-model="form.parentCode" filterable placeholder="请选择" class="input-width" clearable>
@@ -373,13 +373,13 @@
             v-if="disabled"
             v-model="form.reportTypeName"
             :disabled="disabled"
-            class="input-width"
+            class="input-width-small"
           ></el-input>
           <el-select
             v-else
             v-model="form.reportType"
             filterable
-            class="input-width"
+            class="input-width-small"
             placeholder="请选择"
             clearable
             :disabled="disabled"
@@ -398,7 +398,7 @@
             v-model="form.reportUserName"
             :disabled="disabled"
             placeholder="请输入"
-            class="input-width"
+            class="input-width-small"
             clearable
           ></el-input>
         </el-form-item>
@@ -407,7 +407,7 @@
             v-model="form.reportUserMobile"
             :disabled="disabled"
             placeholder="请输入"
-            class="u-item-width-normal"
+            class="input-width-small"
             maxlength="11"
             clearable
           ></el-input>
@@ -416,7 +416,7 @@
           <el-date-picker
             v-model="form.reportTime"
             type="datetime"
-            class="u-item-width-daterange2"
+            class="input-width-small"
             size="small"
             clearable
             :disabled="disabled"
@@ -430,12 +430,12 @@
             v-if="disabled"
             v-model="form.demandUserName"
             :disabled="disabled"
-            class="u-item-width-normal"
+            class="input-width-small"
           ></el-input>
           <el-select
             v-else
             v-model="form.demandUserId"
-            class="u-item-width-normal"
+            class="input-width-small"
             filterable
             :disabled="disabled"
             placeholder="请选择"
@@ -457,7 +457,7 @@
           <el-date-picker
             v-model="form.wantServiceTime"
             type="datetime"
-            class="input-width"
+            class="input-width-small"
             clearable
             :disabled="disabled"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -472,7 +472,7 @@
             :disabled="disabled"
             type="textarea"
             clearable
-            class="input-width-textarea"
+            class="u-item-width-normal"
             placeholder="请输入内容"
           ></el-input>
         </el-form-item>
@@ -489,13 +489,13 @@
             <el-input
               v-model="form.serviceShowName"
               :disabled="disabled"
-              class="input-width"
+              class="u-item-width-normal"
             ></el-input>
           </template>
           <template v-else>
             <el-select
               v-model="form.serviceType"
-              class="input-width-small"
+              class="u-item-width-normal"
               placeholder="请选择"
               clearable
               :disabled="disabled && addType !== 'appoint'"
@@ -512,7 +512,7 @@
             -
             <el-select
               v-model="form.serverId"
-              class="input-width-middle"
+              class="u-item-width-normal"
               filterable
               placeholder="请选择"
               clearable
@@ -544,7 +544,7 @@
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
               v-model="finishServiceTime"
-              class="input-width-min"
+              class="u-item-width-normal"
               clearable
               :disabled="disabled && addType != 'finish'"
               type="datetimerange"
@@ -1438,7 +1438,7 @@ export default {
   }
 }
 .form-wr {
-  .input-width {
+  .input-width-small {
     width: 260px;
     &-small {
       width: 160px;

src/views/modules/communityService/policy/addPolicy.vue

@@ -10,7 +10,7 @@
         class="div_form"
       >
         <!-- 政策类型 -->
-        <el-form-item label="需求类型" prop="categoryCode" label-width="150px">
+        <el-form-item label="政策类型" prop="categoryCode" label-width="150px">
           <el-cascader
           ref="categoryCode"
             v-model="formData.categoryCode"