bug#474,bug#479

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

@@ -444,11 +444,11 @@ export default {
         serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
         resiSearchTagId: "", //查找享受服务人员
         resiSearchTagName: "", //享受服务人员名称
-        serviceName: "", //服务名称
+        serviceName: "", //服务事项
         noticeApproches: [], //通知服务方
         policyId: "", //政策依据
-        serviceOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
-        serviceOrgId: "", //服务组织Id
+        serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+        serviceOrgId: "", //服务方Id
         objList: [], //
         principalName: "", //经办人(责任人)姓名
         principalContact: "", //经办人联系方式
@@ -473,10 +473,10 @@ export default {
           { required: true, message: "服务类别不能为空", trigger: "change" },
         ],
         serviceName: [
-          { required: true, message: "服务名称不能为空", trigger: "change" },
+          { required: true, message: "服务事项不能为空", trigger: "change" },
         ],
         serviceOrgId: [
-          { required: true, message: "服务组织不能为空", trigger: "change" },
+          { required: true, message: "服务方不能为空", trigger: "change" },
         ],
 
         serviceTimeStart: [

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

@@ -65,7 +65,7 @@
         >
           <el-input
             class="item_width_1"
-            placeholder="请输入服务事项"
+            placeholder="请输入需求标题"
             v-model="formData.title"
           >
           </el-input>
@@ -365,7 +365,7 @@ export default {
           { required: true, message: "需求类别不能为空", trigger: "bulr" },
         ],
         title: [
-          { required: true, message: "服务名称不能为空", trigger: "bulr" },
+          { required: true, message: "需求标题不能为空", trigger: "bulr" },
         ],
 
         content: [

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

@@ -14,7 +14,7 @@
           label="政策类型"
           style="display: block"
           label-width="150px"
-          prop="serviceTypesLevel2"
+          prop="policyCategoryL2"
         >
           <el-select
             class="cell-width-1"
@@ -1016,7 +1016,7 @@ export default {
   computed: {
     dataRule() {
       return {
-        serviceType: [
+        policyCategoryL2: [
           { required: true, message: "政策类型不能为空", trigger: "blur" },
         ],
         policyLevel: [

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

@@ -66,7 +66,7 @@
             v-model="formData.createdTimeStart"
             class="u-item-width-daterange"
             size="small"
-            type="date"
+            type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
             value="yyyy-MM-dd HH:mm:ss"
             placeholder="开始时间"
@@ -77,7 +77,7 @@
             v-model="formData.createdTimeEnd"
             class="u-item-width-daterange u-data-tag"
             size="small"
-            type="date"
+            type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
             value="yyyy-MM-dd HH:mm:ss"
             placeholder="结束时间"