From 2be7245f11563b38e043a57c93cab5983b92ecc3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 7 Feb 2023 10:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=B1=BB=E5=9E=8B/=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=E7=BB=84=E7=BB=87/=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF/=E7=A4=BE=E5=8C=BA=E7=AE=80?=
 =?UTF-8?q?=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/communityYantai/cpts/grid-info.vue   |   4 +-
 .../base/organization/organization.vue        |  11 +-
 .../regionalParty/activitys.vue               |   4 +-
 .../regionalParty/activitysForm.vue           |   2 +-
 .../communityParty/regionalParty/units.vue    | 110 +++---------------
 .../regionalParty/unitsDetail.vue             |  70 ++++++++---
 .../regionalParty/unitsForm.vue               | 100 +++++++++-------
 .../estateManagement/estateManagement.vue     |   6 +-
 8 files changed, 153 insertions(+), 154 deletions(-)

diff --git a/src/views/modules/base/communityYantai/cpts/grid-info.vue b/src/views/modules/base/communityYantai/cpts/grid-info.vue
index 3c174ec4c..e7892159e 100644
--- a/src/views/modules/base/communityYantai/cpts/grid-info.vue
+++ b/src/views/modules/base/communityYantai/cpts/grid-info.vue
@@ -25,8 +25,8 @@
 				<div class="value">{{ info.mobile || '--' }}</div>
 			</div>
 			<div class="item">
-				<div class="field">网格简介：</div>
-				<div class="value">{{ info.remark || '--' }}</div>
+				<div class="field">网格类型：</div>
+				<div class="value">{{ info.gridTypeName || '--' }}</div>
 			</div>
 			<div class="item" v-if="mapData">
 				<div class="field">管辖范围：</div>
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index af28bd5f0..6f498d913 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -677,6 +677,10 @@
           <el-input v-model="agencyForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
+        <el-form-item label="社区简介">
+          <el-input v-model="agencyForm.remark"
+          type="textarea" rows=3  maxlength="500" show-word-limit placeholder="请输入社区简介"></el-input>
+        </el-form-item>
         <el-form-item label="坐标">
           <div id="con"></div>
         </el-form-item>
@@ -719,6 +723,7 @@
           placeholder="请输入内容"
           resize="none"
           rows=3
+      maxlength="500"
           show-word-limit
         >
         </el-input>
@@ -772,9 +777,10 @@
           type="textarea"
           v-model="OrgDetailsForm.remark"
           placeholder="请输入内容"
+          show-word-limit  
+          maxlength="500"
           resize="none"
           rows=3
-          show-word-limit
         >
         </el-input>
         </el-form-item>
@@ -1013,6 +1019,7 @@ export default {
         areaName: "",
         contacts: "",
         mobile: "",
+        remark:"",
         code: "",
       },
       // 树
@@ -1627,6 +1634,7 @@ export default {
         (this.agencyForm.contacts = ""),
         (this.agencyForm.mobile = ""),
         (this.agencyForm.code = ""),
+        (this.agencyForm.remark = ""),
         (this.latitude = ""),
         (this.longitude = "");
     },
@@ -2356,6 +2364,7 @@ export default {
         contacts: this.agencyForm.contacts,
         mobile: this.agencyForm.mobile,
         code: this.agencyForm.code,
+        remark: this.agencyForm.remark,
         latitude: this.latitude,
         longitude: this.longitude,
       };
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 2559274b9..5bfddf2fc 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -133,7 +133,7 @@
                          align="center"
                          type="index"
                          width="50"></el-table-column>
-        <el-table-column prop="unitName"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="单位名称"
@@ -522,7 +522,7 @@ export default {
       this.timeRange = []
       this.formData = {
         gridId: '',
-        unitName: '',
+        name: '',
         serviceMatter: '',
         type: '',
         contact: '',
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 1c1dfc789..539fa378b 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -223,7 +223,7 @@ export default {
       let _form = {
         gridId: '',
         serviceMatter: '',//服务事项
-        serviceMatterList: [],
+        serviceMatterList: {},
         unitId: '',//单位ID
         unitIdList: [],
         title: '',//活动标题
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 265bf8d71..ce5b68d17 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -19,8 +19,8 @@
 
           </el-form-item>
           <el-form-item label="单位名称"
-                        prop="unitName">
-            <el-input v-model="formData.unitName"
+                        prop="name">
+            <el-input v-model="formData.name"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -133,7 +133,7 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="unitName"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="单位名称"
@@ -145,13 +145,13 @@
                          label="所属组织"
                          min-width="100">
         </el-table-column>
-        <el-table-column prop="type"
+        <el-table-column prop="typeName"
                          header-align="center"
                          align="center"
                          label="分类"
                          min-width="80">
         </el-table-column>
-        <el-table-column prop="serviceMatterListShow"
+        <el-table-column prop="serviceMatterName"
                          header-align="center"
                          align="center"
                          label="服务事项"
@@ -177,12 +177,7 @@
                          label="联系电话"
                          width="120">
         </el-table-column>
-        <el-table-column prop="memberCount"
-                         header-align="center"
-                         align="center"
-                         label="在职党员数"
-                         width="100">
-        </el-table-column>
+        
         <!-- <el-table-column prop="satisfaction"
                          header-align="center"
                          align="center"
@@ -219,59 +214,11 @@
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-popover v-if="agencyId===scope.row.agencyId"
-                        popper-class="btn-popper"
-                        placement="bottom"
-                        style="margin-left:10px"
-                        width="20"
-                        trigger="click">
-              <div v-if="scope.row.syncType==='not_sync'"
-                   class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleSync(scope.row)">同步</el-button>
-              </div>
-              <div v-if="scope.row.syncType==='sync'"
-                   class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleNoSync(scope.row)">取消同步</el-button>
-              </div>
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleFinish(scope.row)">完成情况</el-button>
-              </div>
-
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail"
-                           size="small"
-                           @click="handleScore(scope.row)">积分记录</el-button>
-              </div>
-              <div class="table-more-btn">
-                <el-button type="text"
+            <el-button type="text"
                            class="div-table-button--delete"
                            size="small"
                            @click="handleDelete(scope.row)">删除</el-button>
-              </div>
-
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--more"
-                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
-            </el-popover>
-
-            <el-button v-else
-                       type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>
-
+         
           </template>
         </el-table-column>
       </el-table>
@@ -366,7 +313,7 @@ export default {
 
       unitList: [],//单位list
       serviceList: [],//服务list
-      typeList: [],//分类list
+      typeList: [{label:'实有单位',value:'1'},{label:'社会服务组织',value:'2'},{label:'志愿单位',value:'3'}],//分类list
       agencyIdArray: [],
       orgOptions: [],
       orgOptionProps: {
@@ -376,11 +323,10 @@ export default {
         children: 'subAgencyList',
         checkStrictly: true
       },
-
       unitId: '',
       formData: {
         agencyId: '',
-        unitName: '',
+        name: '',
         serviceMatter: '',
         type: '',
         contact: '',
@@ -418,9 +364,6 @@ export default {
     await this.loadService()
     this.getOrgTreeList()
 
-    //获取分类
-    await this.loadType()
-
     const { user } = this.$store.state
     this.agencyId = user.agencyId
 
@@ -484,29 +427,10 @@ export default {
       }
 
     },
-    //获取分类
-    async loadType () {
-      const url = "/sys/dict/data/dictlist"
-
-      let params = {
-        dictType: 'party_unit_type'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.typeList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/heart/icpartyunit/list"
+      const url = "/heart/icPublicServiceOrg/page"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
       let params = {
         pageSize: this.pageSize,
@@ -560,7 +484,7 @@ export default {
 
     //完成情况
     handleFinish (row) {
-      this.finishDiaTitle = row.unitName + '完成情况'
+      this.finishDiaTitle = row.name + '完成情况'
       this.finishDiaShow = true
       this.$nextTick(() => {
         this.$refs.ref_finish.initTable(row)
@@ -586,7 +510,7 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
+        this.$refs.ref_form.initForm('edit',row.id)
       })
     },
 
@@ -639,7 +563,7 @@ export default {
 
       let params = {
         id: row.id,
-        deptName: row.unitName,
+        deptName: row.name,
         mobile: row.contactMobile,
         personName: row.contact,
         deptType: 'party_unit',
@@ -711,14 +635,14 @@ export default {
     },
 
     async deleteUnit (row) {
-      const url = "/heart/icpartyunit/delete"
+      const url = "/heart/icPublicServiceOrg/delete"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
 
       let params = {
         id: row.id
       }
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, [row.id])
 
       if (code === 0) {
         this.$message({
@@ -737,7 +661,7 @@ export default {
       this.agencyIdArray = []
       this.formData = {
         agencyId: '',
-        unitName: '',
+        name: '',
         serviceMatter: '',
         type: '',
         contact: '',
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
index 4290b99a8..755c93676 100644
--- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
@@ -7,7 +7,7 @@
         <div class="m-info">
           <div class="info-prop">
             <span class="info-title-2">单位名称：</span>
-            <span>{{ formData.unitName||'--'  }}</span>
+            <span>{{ formData.name||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -17,7 +17,7 @@
 
           <div class="info-prop">
             <span class="info-title-2">服务事项：</span>
-            <span>{{ formData.serviceMatterList.join(',') }}</span>
+            <span>{{ formData.serviceMatterName }}</span>
           </div>
 
           <div class="info-prop">
@@ -28,10 +28,6 @@
             <span class="info-title-2">联系电话：</span>
             <span>{{ formData.contactMobile||'--'  }}</span>
           </div>
-          <div class="info-prop">
-            <span class="info-title-2">在职党员：</span>
-            <span>{{ formData.memberCount||'--'  }}</span>
-          </div>
           <div class="info-prop">
             <span class="info-title-2">备注：</span>
             <span>{{ formData.remark||'--'  }}</span>
@@ -67,6 +63,8 @@
 import { Loading } from 'element-ui' // 引入Loading服务
 import nextTick from 'dai-js/tools/nextTick'
 import daiMap from "@/utils/dai-map";
+import { requestPost } from '@/js/dai/request'
+import { log } from 'console';
 
 var map
 var search
@@ -78,8 +76,19 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      formData: {},
+      formData: {
+        name:"",
+        type:"",
+        serviceMatterName:"",
+        contact:"",
+        contactMobile:"",
+        remark:"",
+        address:"",
+        latitude:"",
+        longitude:"",
+      },
       initLoading: false,
+      unitId:""
     }
   },
   components: {},
@@ -99,16 +108,38 @@ export default {
         // map.destroy()
       }
     },
-
+    // async initForm (row) {
+    //   this.startLoading()
+    //   let { latitude, longitude } = this.$store.state.user;
+    //     this.unitId = row.id
+    //     await this.getDetail()
+      
+    //   if (!latitude || latitude == "" || latitude == "0") {
+    //     latitude = 39.9088810666821;
+    //     longitude = 116.39743841556731;
+    //   }
+    //     this.$nextTick(() => {
+    //     if (!map) {
+    //       this.initMap(latitude, longitude)
+    //     } else {
+    //       map.setCenter(latitude, longitude);
+    //       map.setMarker(latitude, longitude);
+
+    //     }
+
+    //   })
+
+    //   this.endLoading()
+
+    // },
     async initForm (row) {
-
       this.startLoading()
-      this.formData = JSON.parse(JSON.stringify(row))
+      // this.formData = JSON.parse(JSON.stringify(row))
       this.initLoading = true
-      console.log(this.formData)
+      this.unitId = row.id
       // await nextTick(200)
-
-
+      await this.getDetail()
+      console.log(this.formData);
       let { latitude, longitude } = this.$store.state.user;
       console.log('lat' + latitude + ',lon' + longitude)
       if (this.formData.latitude && this.formData.longitude) {
@@ -133,11 +164,22 @@ export default {
       this.endLoading()
 
     },
+    async getDetail () {
+      const url = `/heart/icPublicServiceOrg/detail/${this.unitId}`
+     
+      const { data, code, msg } = await requestPost(url)
+      if (code === 0) {
+        this.formData = data
+
+      } else {
+        this.$message.error(msg)
+      }
 
+    },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap (latitude, longitude) {
-
+      console.log(latitude, longitude);
       map = new daiMap(
         document.getElementById("app_detail_unit"),
         { latitude, longitude },
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 44e59cee0..8bef718f4 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -10,14 +10,14 @@
                class="form">
 
         <el-form-item label="单位名称"
-                      prop="unitName"
+                      prop="name"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入单位名称"
-                    v-model="formData.unitName">
+                    v-model="formData.name">
           </el-input>
         </el-form-item>
         <el-form-item label="分类"
@@ -45,8 +45,8 @@
                              style="display:flex;flex-wrap:wrap"
                              v-model="formData.serviceMatterList">
             <el-checkbox v-for="item in serviceList"
-                         :key="item.value"
-                         :label="item.value">{{item.label}}</el-checkbox>
+                         :key="item.categoryCode"
+                         :label="item.categoryCode">{{item.categoryName}}</el-checkbox>
 
           </el-checkbox-group>
 
@@ -69,16 +69,7 @@
                     v-model="formData.contactMobile">
           </el-input>
         </el-form-item>
-        <el-form-item label="在职党员"
-                      style="display: block"
-                      prop="memberCount"
-                      label-width="150px">
-          <el-input-number class="item_width_4"
-                           v-model="formData.memberCount"
-                           :min="0"
-                           :max="9999"
-                           label="在职党员"></el-input-number>
-        </el-form-item>
+       
         <el-form-item label="备注"
                       prop="remark"
                       label-width="150px"
@@ -154,16 +145,15 @@ export default {
   data () {
     let initFormData = () => {
       let _form = {
-        unitName: '',
+        name: '',
         serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
-        memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: this.$store.state.user.longitude, //经度
-        latitude: this.$store.state.user.latitude//纬度
+        longitude:  this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude  //纬度
       }
 
       return _form
@@ -174,7 +164,7 @@ export default {
       searchValue: '',
       resultList: [],
       loading: false,
-
+      serviceMatterListCody:[],
       btnDisable: false,
 
       unitId: '',
@@ -189,7 +179,8 @@ export default {
 
     // this.initMap()
   },
-
+  watch:{
+  },
   methods: {
 
     async initForm (type, unitId) {
@@ -205,8 +196,7 @@ export default {
       this.formType = type
       if (unitId) {
         this.unitId = unitId
-        this.formData.id = unitId
-        await this.loadFormData()
+       await this.getDetail()
       } else {
         this.formData.latitude = latitude
         this.formData.longitude = longitude
@@ -224,23 +214,44 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/serviceitem/dict-list"
+      const url = "/heart/serviceitem/dict-options"
       let params = {
         type: 'usable'
         // parentCategoryCode: '1010'
       }
 
       const { data, code, msg } = await requestPost(url, params)
-
+      
       if (code === 0) {
         this.serviceList = data
-
       } else {
         this.$message.error(msg)
       }
 
     },
+    async getDetail () {
+      const url = `/heart/icPublicServiceOrg/detail/${this.unitId}`
+     
+      const { data, code, msg } = await requestPost(url)
+      if (code === 0) {
+        for(let key in data){
+            if(key == 'serviceMatterList'){
+              let arr =[]
+             for(let val of data[key]){
+              arr.push(val.categoryCode)
+             }
+             this.serviceMatterListCody = arr 
+            }
+        }
+       
+        this.formData = data
+        this.formData.serviceMatterList =  this.serviceMatterListCody
+
+      } else {
+        this.$message.error(msg)
+      }
 
+    },
     //加载组织
     async loadFormData () {
       const url = '/heart/icpartyunit/detail'
@@ -252,7 +263,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
+        if (!data.serviceMatterList) {
           data.serviceMatterList = []
         }
 
@@ -292,13 +303,27 @@ export default {
       //   return false;
       // }
 
-      let url = '/heart/icpartyunit/save'
+      let url = '/heart/icPublicServiceOrg/save'
       // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
-      // if (this.formType === 'edit') {
-      //  this.formData.id = this.unitId
-      // } 
-
-      const { data, code, msg } = await requestPost(url, this.formData)
+      if (this.formType === 'edit') {
+       this.formData.id = this.unitId
+       url = '/heart/icPublicServiceOrg/update'
+      } 
+      if(this.formData.serviceMatterList.length>0){
+        let arr = []
+         for( let code of this.formData.serviceMatterList){
+          this.serviceList.forEach(item=>{
+           if( item.categoryCode == code){
+            arr.push({categoryCode:item.categoryCode,categoryId:item.categoryId})
+           }
+           return arr
+          })
+         }
+        this.formData.serviceMatterList = arr
+        this.formData.latitude = this.formData.latitude.toString()
+        this.formData.longitude = this.formData.longitude.toString()
+      }
+      const { data, code, msg } = await requestPost(url,this.formData)
 
       if (code === 0) {
         this.$message({
@@ -321,7 +346,6 @@ export default {
       this.$emit('dialogCancle')
 
     },
-
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap (latitude, longitude) {
 
@@ -415,12 +439,11 @@ export default {
       this.unitId = ''
       this.keyWords = ''
       this.formData = {
-        unitName: '',
+        name: '',
         serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
-        memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
         longitude: this.$store.state.user.longitude, //经度
@@ -447,7 +470,7 @@ export default {
     dataRule () {
       return {
 
-        unitName: [
+        name: [
           { required: true, message: '单位名称不能为空', trigger: 'blur' },
         ],
         type: [
@@ -460,9 +483,6 @@ export default {
         contactMobile: [
           { required: true, message: '联系电话不能为空', trigger: 'blur' }
         ],
-        memberCount: [
-          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
-        ],
         address: [
           { required: true, message: '详细地址不能为空', trigger: 'blur' }
         ],
@@ -479,7 +499,7 @@ export default {
       type: Array,
       default: []
     },
-
+   
   }
 }
 </script>
diff --git a/src/views/modules/communityService/estateManagement/estateManagement.vue b/src/views/modules/communityService/estateManagement/estateManagement.vue
index 2cb0ea534..4361a76fb 100644
--- a/src/views/modules/communityService/estateManagement/estateManagement.vue
+++ b/src/views/modules/communityService/estateManagement/estateManagement.vue
@@ -280,7 +280,11 @@
           this.$message.success("删除成功！");
           this.getTableData();
         } else {
-          this.$message.error("操作失败！");
+          if(code>=8000){
+            this.$message.error(msg);
+          }else{
+            this.$message.error("操作失败！");
+          }
         }
       },