From cb1de69384356b1dd4b34ea4686f001c7b354eda Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 21 Feb 2023 15:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=89=BE=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=BF=E7=AD=96=E7=B1=BB=E5=9E=8B=E5=8F=8C?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/policy/addPolicy.vue     | 170 +++++++++++++-----
 .../communityService/policy/policyList.vue    |   2 +-
 2 files changed, 125 insertions(+), 47 deletions(-)

diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 6a72359a2..34f44ef42 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -8,25 +8,56 @@
                :rules="dataRule"
                :disabled="formType==='detail'"
                class="div_form">
+        <!-- 政策类型 -->
+        <el-form-item label="政策类型"
+              style="display: block"
+              label-width="150px"
+              prop="serviceType">
+          <div class="f-flex">
+            <el-form-item prop="serviceType" 
+                                    class="u-item-width-communitycascader f-bto0" 
+                                    :rules="dataRule.serviceType" >
+              <el-select class="cell-width-1"
+                        v-model.trim="formData.policyTypeLevel1Id"
+                        placeholder="请选择"
+                        clearable>
+                <el-option v-for="item in serviceTypesLevel1"
+                            @click.native="handleChangeServiceTypeLevel1"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="serviceType" 
+                                    class="u-item-width-communitycascader f-bto0" 
+                                    :rules="dataRule.serviceType" >
+              <el-select class="cell-width-1"
+                        v-model.trim="formData.policyTypeLevel2Id"
+                        placeholder="请选择"
+                        clearable>
+                <el-option v-for="item in serviceTypesLevel2"
+                            @click.native=""
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-form-item>
 
-        <el-form-item label="政策级别"
-                      style="display: block"
+        <el-form-item label="政策标题"
+                      prop="title"
                       label-width="150px"
-                      prop="policyLevel">
-          <el-select class="item_width_2"
-                     v-model="formData.policyLevel"
-                     placeholder="全部"
-                     clearable>
-            <el-option v-for="item in policyLevelArray"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入政策标题"
+                    v-model="formData.title">
+          </el-input>
         </el-form-item>
 
-        <el-form-item label="政策日期"
+        <el-form-item label="政策有效期"
                       style="display: block"
                       label-width="150px"
                       prop="startDate">
@@ -47,14 +78,21 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="政策标题"
-                      prop="title"
+        <el-form-item label="政策级别"
+                      style="display: block"
                       label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入政策标题"
-                    v-model="formData.title">
-          </el-input>
+                      prop="policyLevel">
+          <el-select class="item_width_2"
+                     v-model="formData.policyLevel"
+                     placeholder="全部"
+                     clearable>
+            <el-option v-for="item in policyLevelArray"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
         </el-form-item>
 
         <el-form-item label="政策内容"
@@ -70,7 +108,7 @@
                     v-model="formData.content"></el-input>
         </el-form-item>
 
-        <div v-for="(item,index) in formData.ruleList"
+        <!-- <div v-for="(item,index) in formData.ruleList"
              :key="index"
              style="margin-bottom:15px">
 
@@ -101,15 +139,15 @@
                   :index="index"></rule>
           </div>
 
-        </div>
+        </div> -->
 
-        <div class="btn-add-rule">
+        <!-- <div class="btn-add-rule">
           <el-button type="primary"
                      size="mini"
                      @click="addRule">增加细则</el-button>
-        </div>
+        </div> -->
 
-        <el-form-item label="匹配资源类型"
+        <!-- <el-form-item label="匹配资源类型"
                       prop="serviceScope"
                       label-width="150px"
                       style="display: block">
@@ -119,7 +157,7 @@
                        :options="demandOptions"
                        :props="optionProps"
                        @change="handleCateSlect"></el-cascader>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item class="block"
                       label="附件"
@@ -187,16 +225,19 @@ export default {
 
     return {
 
-      ruleList: [
-        {
-          ruleName: '',
-          resiRuleList: [],
-          houseRuleList: [],
-          statRuleList: []
-        }
-      ],
+      // ruleList: [
+      //   {
+      //     ruleName: '',
+      //     resiRuleList: [],
+      //     houseRuleList: [],
+      //     statRuleList: []
+      //   }
+      // ],
 
       policyLevelArray: [],
+      // 公共服务分类
+      serviceTypesLevel1:[],
+      serviceTypesLevel2:[],
 
       btnDisable: false,
       demandOptions: [],
@@ -211,6 +252,8 @@ export default {
       },
 
       formData: {
+        policyTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
+        policyTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
         policyLevel: '',//政府级别
         startDate: '',//起始时间yyyy-MM-dd	
         endDate: '',//截止时间yyyy-MM-dd	
@@ -218,14 +261,14 @@ export default {
         content: '',//
         categoryList: [],
         attachmentList: [],
-        ruleList: [
-          {
-            ruleName: '',
-            resiRuleList: [],
-            houseRuleList: [],
-            statRuleList: []
-          }
-        ],
+        // ruleList: [
+        //   {
+        //     ruleName: '',
+        //     resiRuleList: [],
+        //     houseRuleList: [],
+        //     statRuleList: []
+        //   }
+        // ],
 
       },
 
@@ -297,7 +340,7 @@ export default {
           let arr = element.codePath.split(',')
           this.demandIdArray.push(arr)
         });
-        this.formData.ruleList = data.ruleList
+        // this.formData.ruleList = data.ruleList
 
 
         this.formData = data
@@ -324,6 +367,7 @@ export default {
 
     async getDictOptions () {
 
+      // 政策级别下拉
       this.$http
         .post("/sys/dict/data/dictlist", {
           dictType: "policy_level",
@@ -339,6 +383,19 @@ export default {
           return this.$message.error("网络错误");
         });
 
+        // 政策分类下拉（其实是获取的共性服务分类）
+        this.$http
+        .get("/governance/commonServiceType/selectList/0")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel1 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
     },
 
 
@@ -656,6 +713,8 @@ export default {
     resetData () {
       this.ruleList = []
       this.formData = {
+        serviceTypeLevel1Id:'',
+        serviceTypeLevel2Id:'',
         policyLevel: '',//政府级别
         startDate: '',//起始时间yyyy-MM-dd	
         endDate: '',//截止时间yyyy-MM-dd	
@@ -680,6 +739,23 @@ export default {
       if (loading) {
         loading.close()
       }
+    },
+
+    // 服务类型下拉框选中事件
+    handleChangeServiceTypeLevel1() {
+      this.formData.policyTypeLevel2Id = ''
+      this.$http
+        .get("/governance/commonServiceType/selectList/" + this.formData.policyTypeLevel1Id)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceTypesLevel2 = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        })
     }
   },
   computed: {
@@ -697,7 +773,9 @@ export default {
 
 
       return {
-
+        serviceType: [
+          { required: true, message: '政策类型不能为空', trigger: 'blur' }
+        ],
         policyLevel: [
           { required: true, message: '政策级别不能为空', trigger: 'change' }
         ],
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 33f8a5ec3..b892fe562 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -401,7 +401,7 @@ export default {
 
     async getTableData () {
       this.tableLoading = true
-      const url = "/heart/policy/list";
+      const url = "/governance/policy/list";
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {