From 0dab2130f4034482c81f779e83f83a00c0c5bd81 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 28 Jun 2023 16:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=8A=98=E5=8F=A0/=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96=E7=AE=A1=E7=90=86=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityTable.vue |   1 +
 .../modules/communityService/gxxq/addForm.vue |   1 +
 .../communityService/labelConfig/index.vue    | 118 +++++-------------
 .../communityService/policy/addPolicy.vue     |  21 ++--
 4 files changed, 42 insertions(+), 99 deletions(-)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index b37725b32..bf789729b 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -372,6 +372,7 @@
 		<!-- 修改弹出框 -->
 		<el-dialog
 			:visible.sync="formShow"
+			v-if="formShow"
 			:close-on-click-modal="false"
 			:close-on-press-escape="false"
 			:title="formTitle"
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index e455a6db0..5979f1212 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -182,6 +182,7 @@
             :key="iscascaderShow"
             :options="casOptions"
             :props="optionProps"
+            collapse-tags
             :show-all-levels="false"
           ></el-cascader>
         </el-form-item>
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
index 9d3098635..c4970d46f 100644
--- a/src/views/modules/communityService/labelConfig/index.vue
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -1,119 +1,52 @@
 <template>
   <div class="g-main">
     <div class="m-search">
-      <el-form
-        :inline="true"
-        :model="formData"
-        ref="ref_searchform"
-        :label-width="'120px'"
-      >
+      <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
         <el-form-item label="标签名称" prop="tagName">
-          <el-input
-            v-model="formData.tagName"
-            size="small"
-            class="u-item-width-normal"
-            clearable
-            placeholder="请输入"
-          >
+          <el-input v-model="formData.tagName" size="small" class="u-item-width-normal" clearable placeholder="请输入">
           </el-input>
         </el-form-item>
         <el-row type="flex">
           <el-col :span="24" align="right">
-            <el-button
-              style="margin-left: 30px"
-              size="small"
-              type="primary "
-              @click="handleSearchFrom"
-              >查询</el-button
-            >
+            <el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearchFrom">查询</el-button>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <div class="m-table">
       <div class="div_btn">
-        <el-button
-          style="height: 32px"
-          size="small"
-          @click="handleAdd({}, 'add')"
-          type="primary"
-          icon="el-icon-plus"
-        >
-          新增</el-button
-        >
+        <el-button style="height: 32px" size="small" @click="handleAdd({}, 'add')" type="primary" icon="el-icon-plus">
+          新增</el-button>
       </div>
-      <el-table
-        ref="config_table"
-        border
-        :data="tableData"
-        v-loading="tableLoading"
-        style="width: 100%"
-        :height="tableHeight"
-      >
-        <el-table-column
-          label="标签名称"
-          prop="tagName"
-          fixed="left"
-          align="center"
-          key="tagName"
-        />
+      <el-table ref="config_table" border :data="tableData" v-loading="tableLoading" style="width: 100%"
+        :height="tableHeight">
+        <el-table-column label="标签名称" prop="tagName" fixed="left" align="center" key="tagName" />
         <el-table-column fixed="right" label="操作" align="center" width="200">
           <template slot-scope="scope">
-            <el-button
-              style="margin-right: 10px"
-              @click="handleAdd(scope.row, 'edit')"
-              size="small"
-              type="text"
-              >修改</el-button
-            >
+            <el-button style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small"
+              type="text">修改</el-button>
             <!--   按钮权限-->
             <template>
-              <el-popconfirm
-                title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
-              >
-                <el-button size="small" type="text" slot="reference"
-                  >删除</el-button
-                >
+              <el-popconfirm title="删除之后无法回复，确认删除？" @onConfirm="handleDel(scope.row)">
+                <el-button size="small" type="text" slot="reference">删除</el-button>
               </el-popconfirm>
             </template>
           </template>
         </el-table-column>
       </el-table>
-
       <div class="div-flex">
         <div class="m-page">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page.sync="pageNo"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="pageSize"
-            layout="sizes, prev, pager, next, total"
-            :total="total"
-          >
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]" :page-size="pageSize" layout="sizes, prev, pager, next, total"
+            :total="total">
           </el-pagination>
         </div>
       </div>
     </div>
-    <el-dialog
-      :visible.sync="formShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="formTitle"
-      destroy-on-close
-      width="950px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <add-form
-        v-if="formShow"
-        ref="Config_form"
-        :row-obj="rowObj"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      ></add-form>
+    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+      destroy-on-close width="950px" top="5vh" class="dialog-h" @closed="diaClose">
+      <add-form v-if="formShow" ref="Config_form" :row-obj="rowObj" @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"></add-form>
     </el-dialog>
   </div>
 </template>
@@ -140,7 +73,7 @@ export default {
       rowObj: {},
     };
   },
-  created() {},
+  created() { },
   components: { addForm },
   methods: {
     async getlabelConfigList() {
@@ -225,10 +158,17 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
+
 .div_btn {
   margin-bottom: 12px;
 }
-.dialog-h{
-    padding: 0 50px;
+
+.div-flex {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.dialog-h {
+  padding: 0 50px;
 }
 </style>
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 8fcb1e644..92eae1cc6 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -72,9 +72,9 @@
           <el-date-picker
             v-model="formData.startDate"
             class="item_width_2"
-            type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd HH:mm:ss"
             placeholder="开始时间"
           >
           </el-date-picker>
@@ -82,9 +82,9 @@
           <el-date-picker
             v-model="formData.endDate"
             class="item_width_2 u-data-tag"
-            type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd HH:mm:ss"
             placeholder="结束时间"
           >
           </el-date-picker>
@@ -326,9 +326,9 @@
             v-model="newFormData.serviceTimeStart"
             class="item_width_2"
             style="width: 220px"
-            type="date"
+            type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
+            value="yyyy-MM-dd HH:mm:ss"
             placeholder="开始时间"
           >
           </el-date-picker>
@@ -338,9 +338,9 @@
             v-model="newFormData.serviceTimeEnd"
             class="item_width_2 u-data-tag"
             style="width: 220px"
-            type="date"
+            type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            value="yyyy-MM-dd"
+            value="yyyy-MM-dd HH:mm:ss"
             placeholder="结束时间"
           >
           </el-date-picker>
@@ -821,6 +821,7 @@ export default {
       this.newArr = this.sarr.filter(
         (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
       );
+      this.newFormData.serviceScopeList = []
       for (let i in this.newArr) {
         this.newFormData.serviceScopeList.push({
           objectId: this.newArr[i].objectId,