From 2369d228368f6e1892d0b9230e33bd271a13540c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 17:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 37 ++++++++++++-------
 .../modules/communityService/shzz/index.vue   | 19 +++++++---
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index eb0aee65c..bcd5c95be 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -39,7 +39,7 @@
           </div>
         </el-form-item>
         <el-form-item
-            label="社会组织名称	"
+            label="组织名称	"
             prop="societyName"
             label-width="150px"
             style="display: block"
@@ -48,14 +48,14 @@
               class="item_width_1"
               maxlength="50"
               show-word-limit
-              placeholder="请输入社会组织名称	"
+              placeholder="请输入组织名称	"
               v-model="dataForm.societyName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-            label="服务事项"
+            label="服务内容"
             prop="serviceMatters"
             label-width="150px"
             style="display: block"
@@ -66,7 +66,7 @@
               maxlength="1000"
               show-word-limit
               :rows="3"
-              placeholder="请输入服务事项，不超过1000字"
+              placeholder="请输入服务内容，不超过1000字"
               v-model="dataForm.serviceMatters"
           ></el-input>
         </el-form-item>
@@ -88,7 +88,7 @@
         </el-form-item>
 
         <el-form-item
-            label="负责人电话	"
+            label="服务电话	"
             prop="mobile"
             label-width="150px"
             style="display: block"
@@ -97,7 +97,7 @@
               class="item_width_1"
               maxlength="50"
               show-word-limit
-              placeholder="请输入负责人电话	"
+              placeholder="请输入服务电话	"
               v-model="dataForm.mobile"
           >
           </el-input>
@@ -105,11 +105,19 @@
 
         <el-form-item
             label="服务时间	"
-            prop="serviceTime"
+            prop="serviceTimeStr"
             label-width="150px"
             style="display: block"
         >
-          <el-date-picker
+          <el-input
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入服务时间	"
+              v-model="dataForm.serviceTimeStr"
+          >
+          </el-input>
+<!--          <el-date-picker
               v-model="dataForm.serviceTime"
               type="daterange"
               range-separator="至"
@@ -117,7 +125,7 @@
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker>-->
         </el-form-item>
 
         <el-form-item
@@ -236,6 +244,7 @@ export default {
         mobile: "",
         serviceStartTime: "",
         serviceEndTime: "",
+        serviceTimeStr: "",
         serviceTime: ["", ""],
         adminStaffId: "",
         address: "",
@@ -250,11 +259,11 @@ export default {
     dataRule() {
       return {
         societyName: [
-          {required: true, message: "社会组织名称	不能为空", trigger: "blur"},
+          {required: true, message: "组织名称	不能为空", trigger: "blur"},
           {
             min: 1,
             max: 50,
-            message: "社会组织名称	长度在 1 到 50个字符",
+            message: "组织名称	长度在 1 到 50个字符",
             trigger: "blur",
           },
         ],
@@ -262,7 +271,7 @@ export default {
           {required: true, message: "头像不能为空", trigger: "blur"},
         ],
         serviceMatters: [
-          {required: true, message: "服务事项不能为空", trigger: "blur"},
+          {required: true, message: "服务内容不能为空", trigger: "blur"},
         ],
         personInCharge: [
           {required: true, message: "负责人姓名不能为空", trigger: "blur"},
@@ -271,9 +280,9 @@ export default {
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
         ],*/
         mobile: [
-          {required: true, message: "负责人电话不能为空", trigger: "blur"},
+          {required: true, message: "服务电话不能为空", trigger: "blur"},
         ],
-        serviceTime: [
+        serviceTimeStr: [
           {required: true, message: "服务时间不能为空", trigger: "blur"},
         ],
         /*longitude: [
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 4c9cb6275..a50590d92 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -57,13 +57,19 @@
                 <div class="resi-cell-label">服务时间</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
-                  <el-date-picker v-model="fmData.serviceTime"
+                  <el-input v-model="fmData.serviceTimeStr"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入">
+                  </el-input>
+<!--                  <el-date-picker v-model="fmData.serviceTime"
                                   type="daterange"
                                   range-separator="至"
                                   start-placeholder="开始日期"
                                   end-placeholder="结束日期"
                                   value-format="yyyy-MM-dd">
-                  </el-date-picker>
+                  </el-date-picker>-->
                 </div>
               </div>
             </el-col>
@@ -116,17 +122,17 @@
                          align="center"
                          width="50" />
         <el-table-column prop="societyName"
-                         label="社会组织名称">
+                         label="组织名称">
         </el-table-column>
         <el-table-column prop="serviceMatters"
-                         label="服务事项">
+                         label="服务内容">
         </el-table-column>
         <el-table-column prop="personInCharge"
                          label="负责人">
         </el-table-column>
         <el-table-column prop="mobile"
-                         label="负责人电话"> </el-table-column>
-        <el-table-column prop="serviceTime"
+                         label="服务电话"> </el-table-column>
+        <el-table-column prop="serviceTimeStr"
                          label="服务时间"> </el-table-column>
 <!--        <el-table-column prop="score"
                          width="80"
@@ -229,6 +235,7 @@ export default {
         serviceStartTime: "",
         serviceEndTime: "",
         serviceTime: "",
+        serviceTimeStr: "",
       },
 
       importBtnTitle: "excel导入",