Merge branch 'dev-身份验证1114' into dev

src/views/modules/communityParty/regionalParty/units.vue

@@ -7,6 +7,17 @@
                :label-width="'100px'">
         <div>
 
+          <el-form-item label="所属组织"
+                        prop="agencyId">
+            <el-cascader class="item_width_1"
+                         ref="myCascader"
+                         v-model="agencyIdArray"
+                         :options="orgOptions"
+                         :props="orgOptionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
+
+          </el-form-item>
           <el-form-item label="单位名称"
                         prop="unitName">
             <el-input v-model="formData.unitName"
@@ -356,9 +367,19 @@ export default {
       unitList: [],//单位list
       serviceList: [],//服务list
       typeList: [],//分类list
+      agencyIdArray: [],
+      orgOptions: [],
+      orgOptionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
 
       unitId: '',
       formData: {
+        agencyId: '',
         unitName: '',
         serviceMatter: '',
         type: '',
@@ -395,6 +416,7 @@ export default {
   async mounted () {
     //获取服务事项
     await this.loadService()
+    this.getOrgTreeList()
 
     //获取分类
     await this.loadType()
@@ -406,6 +428,39 @@ export default {
   },
 
   methods: {
+
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+
+        this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+
+      } else {
+        this.formData.agencyId = ''
+
+      }
+
+    },
+
+    getOrgTreeList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customeragency/my-subagency-list', {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+
     handleSearch () {
       this.loadTable()
     },
@@ -679,7 +734,9 @@ export default {
 
     //重置搜索条件
     resetSearch () {
+      this.agencyIdArray = []
       this.formData = {
+        agencyId: '',
         unitName: '',
         serviceMatter: '',
         type: '',

src/views/modules/shequzhili/event/eventList.vue

@@ -8,9 +8,9 @@
                  :label-width="'80px'">
           <div>
 
-            <el-form-item label="所属网格"
+            <el-form-item label="所属组织"
                           prop="gridId">
-              <el-select class="item_width_1"
+              <!-- <el-select class="item_width_1"
                          v-model="formData.gridId"
                          placeholder="全部"
                          size="small"
@@ -20,7 +20,15 @@
                            :label="item.label"
                            :value="item.value">
                 </el-option>
-              </el-select>
+              </el-select> -->
+
+              <el-cascader class="customer_cascader"
+                           ref="myCascader"
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
 
             </el-form-item>
             <el-form-item label="上报渠道"
@@ -161,6 +169,7 @@
 
         <el-table :data="tableData"
                   border
+                  v-loading="tableLoading"
                   :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                   class="table"
                   style="width: 100%"
@@ -407,10 +416,20 @@ export default {
     }
 
     return {
+      tableLoading: false,
       pageType: "list", // 列表list 新增add  处理dispose 详情info
       user: {},
       agencyId: '',
       gridList: [],//所属网格list--场所区域
+      agencyIdArray: [],
+      orgOptions: [],
+      orgOptionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
       tableData: [],
 
       statusArray: [
@@ -448,6 +467,7 @@ export default {
 
       formData: {
         gridId: '',
+        agencyId: '',
         sourceType: '',
         eventContent: '',
         name: '',
@@ -503,11 +523,30 @@ export default {
     this.user = this.$store.state.user
 
     this.agencyId = this.user.agencyId
-    this.loadGrid();
+    this.getOrgTreeList();
     this.getTableData();
     this.getCateOptions()
   },
   methods: {
+
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+        if (obj.level === 'grid') {
+          this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.formData.agencyId = ''
+        } else {
+          this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.formData.gridId = ''
+        }
+
+      } else {
+        this.formData.agencyId = ''
+        this.formData.gridId = ''
+      }
+
+    },
+
     handleEventType (val) {
       // console.log('val-----eee', val)
       console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
@@ -579,23 +618,22 @@ export default {
       this.getTableData();
     },
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
-
-      let params = {
-        agencyId: this.agencyId,
-        purpose: "query"
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.gridList = data
-
+    getOrgTreeList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customeragency/agencygridtree', {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           } else {
-        this.$message.error(msg)
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
           }
-
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
     },
 
     async handleExport () {
@@ -727,6 +765,7 @@ export default {
     },
 
     async getTableData () {
+      this.tableLoading = true
       const url = "/gov/project/icEvent/list";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/list";
       const { pageSize, pageNo, formData } = this;
@@ -735,6 +774,8 @@ export default {
         pageNo,
         ...formData,
       });
+
+      this.tableLoading = false
       if (code === 0) {
 
         this.total = data.total || 0;
@@ -791,7 +832,9 @@ export default {
     },
 
     resetSearch () {
+      this.agencyIdArray = []
       this.formData = {
+        agencyId: '',
         gridId: '',
         sourceType: '',
         eventContent: '',