From 7348f9aabdd10cebe6f08253638d59074a30925a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 7 Feb 2023 19:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E6=A3=80=E5=8D=95=E4=BD=8D=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regionalParty/activitys.vue               |   4 +-
 .../regionalParty/activitysForm.vue           |   2 +-
 .../communityParty/regionalParty/units.vue    | 110 +++++++++++++++---
 .../regionalParty/unitsDetail.vue             |  70 +++--------
 .../regionalParty/unitsForm.vue               | 100 +++++++---------
 5 files changed, 150 insertions(+), 136 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 5bfddf2fc..2559274b9 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="name"
+        <el-table-column prop="unitName"
                          header-align="center"
                          align="center"
                          label="单位名称"
@@ -522,7 +522,7 @@ export default {
       this.timeRange = []
       this.formData = {
         gridId: '',
-        name: '',
+        unitName: '',
         serviceMatter: '',
         type: '',
         contact: '',
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 539fa378b..1c1dfc789 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 ce5b68d17..265bf8d71 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="name">
-            <el-input v-model="formData.name"
+                        prop="unitName">
+            <el-input v-model="formData.unitName"
                       class="item_width_1"
                       clearable
                       size="small"
@@ -133,7 +133,7 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="name"
+        <el-table-column prop="unitName"
                          header-align="center"
                          align="center"
                          label="单位名称"
@@ -145,13 +145,13 @@
                          label="所属组织"
                          min-width="100">
         </el-table-column>
-        <el-table-column prop="typeName"
+        <el-table-column prop="type"
                          header-align="center"
                          align="center"
                          label="分类"
                          min-width="80">
         </el-table-column>
-        <el-table-column prop="serviceMatterName"
+        <el-table-column prop="serviceMatterListShow"
                          header-align="center"
                          align="center"
                          label="服务事项"
@@ -177,7 +177,12 @@
                          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"
@@ -214,11 +219,59 @@
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
-            <el-button type="text"
+
+            <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"
                            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>
@@ -313,7 +366,7 @@ export default {
 
       unitList: [],//单位list
       serviceList: [],//服务list
-      typeList: [{label:'实有单位',value:'1'},{label:'社会服务组织',value:'2'},{label:'志愿单位',value:'3'}],//分类list
+      typeList: [],//分类list
       agencyIdArray: [],
       orgOptions: [],
       orgOptionProps: {
@@ -323,10 +376,11 @@ export default {
         children: 'subAgencyList',
         checkStrictly: true
       },
+
       unitId: '',
       formData: {
         agencyId: '',
-        name: '',
+        unitName: '',
         serviceMatter: '',
         type: '',
         contact: '',
@@ -364,6 +418,9 @@ export default {
     await this.loadService()
     this.getOrgTreeList()
 
+    //获取分类
+    await this.loadType()
+
     const { user } = this.$store.state
     this.agencyId = user.agencyId
 
@@ -427,10 +484,29 @@ 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/icPublicServiceOrg/page"
+      const url = "/heart/icpartyunit/list"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
       let params = {
         pageSize: this.pageSize,
@@ -484,7 +560,7 @@ export default {
 
     //完成情况
     handleFinish (row) {
-      this.finishDiaTitle = row.name + '完成情况'
+      this.finishDiaTitle = row.unitName + '完成情况'
       this.finishDiaShow = true
       this.$nextTick(() => {
         this.$refs.ref_finish.initTable(row)
@@ -510,7 +586,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)
       })
     },
 
@@ -563,7 +639,7 @@ export default {
 
       let params = {
         id: row.id,
-        deptName: row.name,
+        deptName: row.unitName,
         mobile: row.contactMobile,
         personName: row.contact,
         deptType: 'party_unit',
@@ -635,14 +711,14 @@ export default {
     },
 
     async deleteUnit (row) {
-      const url = "/heart/icPublicServiceOrg/delete"
+      const url = "/heart/icpartyunit/delete"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
 
       let params = {
         id: row.id
       }
 
-      const { data, code, msg } = await requestPost(url, [row.id])
+      const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
         this.$message({
@@ -661,7 +737,7 @@ export default {
       this.agencyIdArray = []
       this.formData = {
         agencyId: '',
-        name: '',
+        unitName: '',
         serviceMatter: '',
         type: '',
         contact: '',
diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue
index 755c93676..4290b99a8 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.name||'--'  }}</span>
+            <span>{{ formData.unitName||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -17,7 +17,7 @@
 
           <div class="info-prop">
             <span class="info-title-2">服务事项：</span>
-            <span>{{ formData.serviceMatterName }}</span>
+            <span>{{ formData.serviceMatterList.join(',') }}</span>
           </div>
 
           <div class="info-prop">
@@ -28,6 +28,10 @@
             <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>
@@ -63,8 +67,6 @@
 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
@@ -76,19 +78,8 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      formData: {
-        name:"",
-        type:"",
-        serviceMatterName:"",
-        contact:"",
-        contactMobile:"",
-        remark:"",
-        address:"",
-        latitude:"",
-        longitude:"",
-      },
+      formData: {},
       initLoading: false,
-      unitId:""
     }
   },
   components: {},
@@ -108,38 +99,16 @@ 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
-      this.unitId = row.id
+      console.log(this.formData)
       // 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) {
@@ -164,22 +133,11 @@ 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 8bef718f4..44e59cee0 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="name"
+                      prop="unitName"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     maxlength="50"
                     show-word-limit
                     placeholder="请输入单位名称"
-                    v-model="formData.name">
+                    v-model="formData.unitName">
           </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.categoryCode"
-                         :label="item.categoryCode">{{item.categoryName}}</el-checkbox>
+                         :key="item.value"
+                         :label="item.value">{{item.label}}</el-checkbox>
 
           </el-checkbox-group>
 
@@ -69,7 +69,16 @@
                     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"
@@ -145,15 +154,16 @@ export default {
   data () {
     let initFormData = () => {
       let _form = {
-        name: '',
+        unitName: '',
         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
@@ -164,7 +174,7 @@ export default {
       searchValue: '',
       resultList: [],
       loading: false,
-      serviceMatterListCody:[],
+
       btnDisable: false,
 
       unitId: '',
@@ -179,8 +189,7 @@ export default {
 
     // this.initMap()
   },
-  watch:{
-  },
+
   methods: {
 
     async initForm (type, unitId) {
@@ -196,7 +205,8 @@ export default {
       this.formType = type
       if (unitId) {
         this.unitId = unitId
-       await this.getDetail()
+        this.formData.id = unitId
+        await this.loadFormData()
       } else {
         this.formData.latitude = latitude
         this.formData.longitude = longitude
@@ -214,44 +224,23 @@ export default {
 
     //获取服务事项下拉框
     async loadService () {
-      const url = "/heart/serviceitem/dict-options"
+      const url = "/heart/serviceitem/dict-list"
       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
+        this.serviceList = data
 
       } else {
         this.$message.error(msg)
       }
 
     },
+
     //加载组织
     async loadFormData () {
       const url = '/heart/icpartyunit/detail'
@@ -263,7 +252,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        if (!data.serviceMatterList) {
+        if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
           data.serviceMatterList = []
         }
 
@@ -303,27 +292,13 @@ export default {
       //   return false;
       // }
 
-      let url = '/heart/icPublicServiceOrg/save'
+      let url = '/heart/icpartyunit/save'
       // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
-      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 (this.formType === 'edit') {
+      //  this.formData.id = this.unitId
+      // } 
+
+      const { data, code, msg } = await requestPost(url, this.formData)
 
       if (code === 0) {
         this.$message({
@@ -346,6 +321,7 @@ export default {
       this.$emit('dialogCancle')
 
     },
+
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap (latitude, longitude) {
 
@@ -439,11 +415,12 @@ export default {
       this.unitId = ''
       this.keyWords = ''
       this.formData = {
-        name: '',
+        unitName: '',
         serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
+        memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
         longitude: this.$store.state.user.longitude, //经度
@@ -470,7 +447,7 @@ export default {
     dataRule () {
       return {
 
-        name: [
+        unitName: [
           { required: true, message: '单位名称不能为空', trigger: 'blur' },
         ],
         type: [
@@ -483,6 +460,9 @@ export default {
         contactMobile: [
           { required: true, message: '联系电话不能为空', trigger: 'blur' }
         ],
+        memberCount: [
+          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+        ],
         address: [
           { required: true, message: '详细地址不能为空', trigger: 'blur' }
         ],
@@ -499,7 +479,7 @@ export default {
       type: Array,
       default: []
     },
-   
+
   }
 }
 </script>