From 1e10c9d9b5f0242d7e89926bc9269e49bd7183d9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 6 Mar 2023 10:07:36 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=200301=E9=9C=80=E6=B1=82=EF=BC=9A?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/operAuth.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
index f0ee36e8c..86ce8f98d 100644
--- a/src/views/modules/workSys/operAuth.vue
+++ b/src/views/modules/workSys/operAuth.vue
@@ -165,7 +165,7 @@ export default {
 
       timeRange: [],
       formData: {
-        category: 'data_tm',
+        category: '',
         operatorName: '',//姓名
         operatorMobile: '',//手机号
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
@@ -268,7 +268,7 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        category: 'data_tm',
+        category: '',
         operatorName: '',//姓名
         operatorMobile: '',//手机号
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm

From 126d36911af41a2266d74fc392afe485ab316c49 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 6 Mar 2023 14:20:13 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=81=9A=E4=BA=86=E5=88=97=E8=A1=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/articleTag/edit.vue | 359 ++++++++++++++++++
 .../modules/workSys/articleTag/index.vue      | 348 +++++++++++++++++
 2 files changed, 707 insertions(+)
 create mode 100644 src/views/modules/workSys/articleTag/edit.vue
 create mode 100644 src/views/modules/workSys/articleTag/index.vue

diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
new file mode 100644
index 000000000..8b21186db
--- /dev/null
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='detail'"
+               class="form">
+
+        <el-form-item label="角色名称"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    :disabled="defaultRole==='1'"
+                    placeholder="请输入角色名称"
+                    clearable
+                    v-model="formData.name">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    :disabled="defaultRole==='1'"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 5, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入备注"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <el-form-item label="管理平台菜单"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-tree class="item_width_1"
+                   :data="menuList"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   :default-expanded-keys="['000']"
+                   ref="menuListTree"
+                   accordion
+                   show-checkbox>
+          </el-tree>
+        </el-form-item>
+        <el-form-item label="可视化平台菜单"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-tree class="item_width_1 item_border"
+                   :data="menuListShuju"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   :default-expanded-keys="['000']"
+                   ref="menuListShujuTree"
+                   accordion
+                   show-checkbox>
+          </el-tree>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      roleId: '',
+      menuList: [],
+      menuListShuju: [],
+      formData: {
+        id: '',
+        name: '',
+        remark: '',//备注
+        menuIdList: [],
+        customerId: ''
+      },
+
+      defaultRole: '',
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+
+  },
+
+  methods: {
+
+    async initForm (type, roleId, defaultRole) {
+      this.startLoading()
+      this.customerId = localStorage.getItem("customerId");
+      this.formData.customerId = this.customerId
+      //获取菜单
+      await this.getMenuList()
+      await this.getMenuShujuList()
+
+      this.$refs.menuListTree.setCheckedKeys([])
+      this.$refs.menuListShujuTree.setCheckedKeys([])
+
+      this.formType = type
+
+      if (roleId) {
+        this.roleId = roleId
+        this.formData.id = roleId
+        this.defaultRole = defaultRole
+        this.loadFormData()
+      }
+
+      this.endLoading()
+
+
+    },
+
+
+    async getMenuList () {
+      const url = "/gov/access/menu/nav"
+
+      let params = {}
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.menuList = [
+          {
+            id: '000',
+            name: '全部菜单',
+            children: [...data]
+          }
+        ]
+        // this.menuList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getMenuShujuList () {
+      const url = "/gov/access/menu/nav"
+
+      let params = {
+        tableName: 'data_menu'
+      }
+
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.menuListShuju = [
+          {
+            id: '000',
+            name: '全部菜单',
+            children: [...data]
+          }
+        ]
+        // this.menuListShuju = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+      const url = '/gov/access/govrole/' + this.roleId
+      let params = {
+
+      }
+      const { data, code, msg } = await requestGet(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        this.formData.menuIdList.forEach(item => {
+          this.$refs.menuListTree.setChecked(item, true)
+
+        })
+        this.formData.menuIdList.forEach(item => {
+          this.$refs.menuListShujuTree.setChecked(item, true)
+        })
+        this.formData.customerId = this.customerId
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleComfirm () {
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+
+        } else {
+          this.addNat()
+        }
+
+      })
+    },
+
+    async addNat () {
+
+
+      this.formData.menuIdList = []
+      this.formData.menuIdList = [
+        ...this.$refs.menuListTree.getCheckedKeys(),
+        ...this.$refs.menuListTree.getHalfCheckedKeys(),
+        ...this.$refs.menuListShujuTree.getCheckedKeys(),
+        ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
+      ]
+      this.formData.menuIdList = this.formData.menuIdList.filter(item => item !== '000')
+
+      console.log('menuAll', this.formData)
+
+      // return false
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/access/govrole/save'
+
+        this.formData.roleId = ''
+
+      } else {
+        url = '/gov/access/govrole/edit'
+
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+
+      this.roleId = ''
+
+      this.formData = {
+        id: '',
+        name: '',
+        remark: '',//备注
+        menuIdList: [],
+        customerId: ''
+
+      }
+      this.$refs['ref_form'].resetFields()
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '角色名称不能为空', trigger: 'change' }
+        ],
+
+
+      }
+    },
+
+  },
+  props: {
+
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_border {
+  border: 1px;
+  border-radius: 50%;
+}
+</style>
+
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
+
diff --git a/src/views/modules/workSys/articleTag/index.vue b/src/views/modules/workSys/articleTag/index.vue
new file mode 100644
index 000000000..ce0f56615
--- /dev/null
+++ b/src/views/modules/workSys/articleTag/index.vue
@@ -0,0 +1,348 @@
+<template>
+	<div class="div_main">
+		<div class="div_search">
+			<el-form
+				:inline="true"
+				:model="formData"
+				ref="ref_searchform"
+				:label-width="'110px'"
+			>
+				<el-form-item label="标签名称" prop="tagName">
+					<el-input
+						v-model="formData.tagName"
+						size="small"
+						class="list_item_width_1"
+						clearable
+						placeholder="请输入标签名称"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-button
+					style="margin-left: 30px"
+					size="small"
+					class="diy-button--search"
+					@click="handleSearch"
+					>查询</el-button
+				>
+				<el-button
+					style="margin-left: 10px"
+					size="small"
+					class="diy-button--reset"
+					@click="resetSearch"
+					>重置</el-button
+				>
+			</el-form>
+		</div>
+
+		<div class="div_table">
+			<div class="div_btn">
+				<el-button
+					class="diy-button--add"
+					size="small"
+					@click="handleAdd"
+					>新增</el-button
+				>
+			</div>
+
+			<div style="padding: 0 10px">
+				<el-table
+					class="table"
+					ref="ref_table"
+					:data="tableData"
+					border
+					:height="tableHeight"
+					v-loading="tableLoading"
+					:header-cell-style="{
+						background: '#2195FE',
+						color: '#FFFFFF',
+					}"
+					style="width: 100%"
+				>
+					<el-table-column
+						label="序号"
+						header-align="center"
+						align="center"
+						type="index"
+						width="50"
+					></el-table-column>
+
+					<el-table-column
+						prop="tagName"
+						header-align="center"
+						align="center"
+						label="标签名称"
+						min-width="100"
+					>
+					</el-table-column>
+					<el-table-column
+						prop="showFlag"
+						header-align="center"
+						align="center"
+						label="状态"
+						min-width="110"
+					>
+						<template slot-scope="scope">
+							{{ scope.row.showFlag == 1 ? "显示" : "隐藏" }}
+						</template>
+					</el-table-column>
+
+					<el-table-column
+						label="操作"
+						fixed="right"
+						width="140"
+						header-align="center"
+						align="center"
+						class="operate"
+					>
+						<template slot-scope="scope">
+							<el-button
+								v-if="false"
+								type="text"
+								class="div-table-button--detail"
+								size="small"
+								@click="handleDetail(scope.row)"
+								>查看</el-button
+							>
+							<el-button
+								type="text"
+								class="div-table-button--edit"
+								size="small"
+								@click="handleEdit(scope.row)"
+								>修改</el-button
+							>
+
+							<el-button
+								v-if="true"
+								type="text"
+								class="div-table-button--delete"
+								size="small"
+								@click="showOrHide(scope.row)"
+								>{{
+									scope.row.showFlag == 0 ? "显示" : "隐藏"
+								}}</el-button
+							>
+						</template>
+					</el-table-column>
+				</el-table>
+				<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>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			width="850px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<edit
+				ref="ref_form"
+				@dialogCancle="diaClose"
+				@dialogOk="addFormOk"
+			></edit>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import edit from "./edit";
+
+import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+
+let loading; // 加载动画
+export default {
+	components: {
+		edit,
+	},
+
+	data() {
+		return {
+			loading: false,
+			total: 0,
+			pageSize: 20,
+			pageNo: 0,
+			tableLoading: false,
+			isResiUser: true,
+
+			agencyId: "",
+
+			timeRange: [],
+			formData: {
+				tagName: "", //名称
+				// createdTime: '',//时间
+			},
+
+			tableData: [],
+
+			//form相关
+			formShow: false,
+			formTitle: "新增",
+		};
+	},
+
+	computed: {
+		tableHeight() {
+			return this.$store.state.inIframe
+				? this.clientHeight - 360 + this.iframeHeight
+				: this.clientHeight - 360;
+		},
+
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+
+	async mounted() {
+		const { user } = this.$store.state;
+		this.agencyId = user.agencyId;
+
+		await this.loadTable();
+	},
+
+	activated() {
+		this.$refs["ref_table"].doLayout();
+	},
+
+	methods: {
+		async handleSearch() {
+			this.isResiUser = this.formData.orgType === "current";
+
+			await this.loadTable();
+
+			this.$nextTick(() => {
+				this.$refs.ref_table.doLayout(); // 解决表格错位
+			});
+		},
+
+		async loadTable() {
+			this.tableLoading = true;
+
+			const url = "/gov/voice/tag/page-list";
+
+			let params = {
+				pageSize: this.pageSize,
+				pageNo: this.pageNo,
+				...this.formData,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.total = data.total;
+				this.tableData = data.list;
+			} else {
+				this.$message.error(msg);
+			}
+			this.tableLoading = false;
+		},
+
+		diaClose() {
+			this.$refs.ref_form.resetData();
+			this.formShow = false;
+		},
+
+		handleAdd() {
+			this.formTitle = "新增";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("add", null);
+			});
+		},
+
+		handleEdit(row) {
+			this.formTitle = "修改";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("edit", row.id, row.defaultRole);
+			});
+		},
+
+		handleDetail(row) {
+			this.formTitle = "详情";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("detail", row.id);
+			});
+		},
+
+		addFormOk() {
+			this.formShow = false;
+			this.loadTable();
+		},
+
+		async showOrHide(row) {
+			const url = "/gov/voice/tag/change-show-flag";
+
+			const { data, code, msg } = await requestPost(url, {
+				id: row.id,
+				showFlag: row.showFlag == 1 ? 0 : 1,
+			});
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "操作成功",
+				});
+
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//重置搜索条件
+		resetSearch() {
+			this.formData = {
+				tagName: "", //姓名
+			};
+
+			this.pageNo = 0;
+			this.loadTable();
+		},
+
+		handleSizeChange(val) {
+			this.pageSize = val;
+			this.pageNo = 1;
+			this.loadTable();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.loadTable();
+		},
+
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>

From e42dbd86284242a436d8acba8af828ebb941671a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 6 Mar 2023 21:58:33 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E7=BE=A4=E7=A7=9F=E6=88=BF=E5=85=88?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/htgl/index.vue   |   4 +-
 .../tuceng/anquan/qunzufang/index.vue         | 400 ++++++++++++++++++
 .../tuceng/anquan/qunzufang/qzfInfo.vue       | 336 +++++++++++++++
 3 files changed, 738 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue

diff --git a/src/views/modules/shequzhili/htgl/index.vue b/src/views/modules/shequzhili/htgl/index.vue
index 033196013..8204fcc0a 100644
--- a/src/views/modules/shequzhili/htgl/index.vue
+++ b/src/views/modules/shequzhili/htgl/index.vue
@@ -305,8 +305,8 @@ export default {
   computed: {
     maxTableHeight () {
       return this.$store.state.inIframe
-        ? this.clientHeight - 360 + this.iframeHeigh
-        : this.clientHeight - 360;
+        ? this.clientHeight - 240 + this.iframeHeigh
+        : this.clientHeight - 240;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
new file mode 100644
index 000000000..12ffe99f8
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
@@ -0,0 +1,400 @@
+<template>
+    <div  class="div_main">
+        <div class="div_search">
+          <el-form
+            :inline="true"
+            :model="formData"
+            ref="ref_searchform"
+            :label-width="'100px'"
+          >
+            <div>
+              <el-form-item label="所属组织" prop="orgId" >
+                <el-cascader
+                  class="item_width_2"
+                  ref="myCascaderm"
+                  size="small"
+                  v-model="agencyIdArray"
+                  :options="orgOptions"
+                  :props="orgOptionProps"
+                  :show-all-levels="false"
+                  @change="handleChangeAgency"
+                ></el-cascader>
+              </el-form-item>
+  
+              <el-form-item label="房主姓名" prop="ownerName">
+                <el-input
+                  class="item_width_2"
+                  size="small"
+                  v-model="formData.ownerName"
+                  clearable
+                  placeholder="请输入"
+                >
+                </el-input>
+              </el-form-item>
+  
+           
+  
+              <el-form-item label="联系方式" prop="ownerPhone">
+                <el-input
+                  class="item_width_2"
+                  size="small"
+                  v-model="formData.ownerPhone"
+                  clearable
+                  placeholder="请输入"
+                >
+                </el-input>
+              </el-form-item>
+  
+              <el-form-item label="房屋用途" prop="purpose">
+                <el-select v-model="formData.purpose"
+                           placeholder="'请选择'"
+                           size="small"
+                           clearable
+                           style="width: 240px"
+                           :multiple="false">
+                  <el-option v-for="item in housePurposeOption"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="备注" prop="remark">
+                <el-input
+                  class="item_width_2"
+                  size="small"
+                  v-model="formData.remark"
+                  clearable
+                  placeholder="请输入"
+                >
+                </el-input>
+              </el-form-item>
+              
+              <el-button
+                style="margin-left: 30px"
+                size="small"
+                class="diy-button--search"
+                @click="handleSearch"
+                >查询</el-button
+              >
+              <el-button
+                style="margin-left: 10px"
+                size="small"
+                class="diy-button--reset"
+                @click="resetSearch"
+                >重置</el-button
+              >
+            </div>
+          </el-form>
+        </div>
+  
+      <div class="div_table">
+        <el-table
+          border
+          :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+          class="table"
+          :data="tableData"
+          style="width: 100%"
+          :height="maxTableHeight"
+        >
+       
+          <el-table-column
+            label="序号"
+            fixed="left"
+            type="index"
+            align="center"
+            width="50"
+          />
+  
+          <el-table-column
+            prop="houseName"
+            align="center"
+            min-width="180"
+            label="房屋名称"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+  
+          <el-table-column
+            prop="houseType"
+            label="类型"
+            min-width="150"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+  
+          <el-table-column
+            prop="purpose"
+            align="center"
+            min-width="150"
+            label="用途"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+  
+          <el-table-column
+            prop="rentFlag"
+            align="center"
+            width="150"
+            :show-overflow-tooltip="true"
+            label="房屋状态"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="ownerName"
+            align="center"
+            width="150"
+            :show-overflow-tooltip="true"
+            label="房主姓名"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="ownerPhone"
+            align="center"
+            width="150"
+            :show-overflow-tooltip="true"
+            label="联系方式"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="ownerIdCard"
+            align="center"
+            width="150"
+            :show-overflow-tooltip="true"
+            label="身份证"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="remark"
+            align="center"
+            width="150"
+            :show-overflow-tooltip="true"
+            label="备注"
+          >
+          </el-table-column>
+          <el-table-column fixed="right" label="操作" align="center" width="100">
+            <template slot-scope="scope">
+              <!-- <el-button v-if="scope.row.issueStatus==='voting'&& agencyId===scope.row.orgId"
+                   @click="handleDispose(scope.row)"
+                   type="text"                 size="small"
+                   class="div-table-button--edit">处理</el-button> -->
+  
+              <el-button @click="handleWatch(scope.row)" type="text" size="small"
+                >查看</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+  
+        <div>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="parseInt(pageSize)"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <el-dialog
+      title="房屋详情"
+      :visible.sync="showhtglDialog"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="950px"
+      v-if="showhtglDialog"
+      @close="detailFormCancle"
+     >
+      <qzf-info 
+      ref="qzf_info"
+      @diaDetailClose="detailFormCancle"
+      >
+      </qzf-info>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { mapGetters } from "vuex";
+  import { requestPost } from "@/js/dai/request";
+  import qzfInfo from "./qzfInfo.vue"
+  import axios from "axios";
+  
+  export default {
+   
+    data() {
+        let orgOptionProps = {
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
+      return {
+        orgOptions: [],
+        orgOptionProps,
+        housePurposeOption:[
+            { value: '1', label: '住宅' },
+            { value: '2', label: '商业' },
+            { value: '3', label: '办公' },
+            { value: '4', label: '工业' },
+            { value: '5', label: '仓储' },
+            { value: '6', label: '商住混用' },
+            { value: '7', label: '其他' }
+            ],
+        formData: {
+          ownerName: '',
+          ownerPhone: '',
+          startDate: '',
+          endDate: '',
+          purpose:'',
+          remark:'',
+          orgId:''
+        },
+        showhtglDialog:false,
+        topicId:'',
+        tableData:[],
+        dialogVisible:false,
+        agencyIdArray: [],
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+      };
+    },
+    created() {
+      this.getTableData()
+    },
+    mounted() {
+      this.getOrgTreeList();
+    },
+    methods: {
+      async getOrgTreeList() {
+        const url = "/gov/org/customeragency/agencygridtree";
+        let params = {
+          agencyId: this.agencyId,
+          purpose: "query",
+        };
+  
+        const { data, code, msg } = await requestPost(url, params);
+  
+        if (code === 0) {
+          this.orgOptions = [];
+          this.orgOptions.push(data);
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      handleChangeAgency (val) {
+      let obj = this.$refs["myCascaderm"].getCheckedNodes()[0].data
+        console.log(obj);
+      if (obj) {
+        if (obj.level === 'grid') {
+          this.formData.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+        } else {
+          this.formData.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+        }
+
+      } else {
+        this.formData.orgId = ''
+      }
+    },
+      handleSizeChange (val) {
+  
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getTableData();
+      },
+      handleCurrentChange (val) {
+              this.pageNo = val;
+              this.getTableData();
+      },
+      handleSearch (val) {
+        this.pageNo = 1;
+        this.getTableData();
+        console.log(this.agencyIdArray);
+      },
+     
+      resetSearch () {
+          this.agencyIdArray = []
+          this.formData = {
+          ownerName: '',
+          ownerPhone: '',
+          startDate: '',
+          endDate: '',
+      }
+      this.pageNo = 1
+      },
+  
+      async getTableData () {
+        const url = "/gov/org/house/group-rent-house-list";
+        let { pageSize, pageNo, formData } = this;
+        // if(this.agencyIdArray.length ==1){
+        //     orgId = JSONparse(JSON.stringify(this.agencyIdArray[0])).join()
+        // }else if(this.agencyIdArray.length ==2){
+        //     orgId = JSONparse(JSON.stringify(this.agencyIdArray[1])).splice(1).join()
+        // }else if(this.agencyIdArray.length ==3){
+        //     orgId = JSONparse(JSON.stringify(this.agencyIdArray[0])).splice(2).join()
+        // }else if(this.agencyIdArray.length ==4){
+        //     orgId = JSONparse(JSON.stringify(this.agencyIdArray[0])).splice(3).join()
+        // }else{
+        //   this.agencyIdArray = []
+        // }
+        console.log( this.agencyIdArray);
+        const { data, code, msg } = await requestPost(url, {
+          pageSize,
+          pageNo,
+        //   orgId,
+          orgType: "agency",
+          ...formData,
+        });
+        if (code === 0) {
+          this.total = data.total || 0;
+          this.tableData = data.list
+            ? data.list.map((item) => {
+              return item;
+            })
+            : [];
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      detailFormCancle () {
+        this.showhtglDialog = false
+      },
+      async handleWatch (row) {
+        console.log(row,'see');
+        this.showhtglDialog = true
+        this.$nextTick(() => {
+        this.$refs.qzf_info.initForm(row)
+        })
+
+      },
+    },
+    components: {
+      qzfInfo
+    },
+    computed: {
+      maxTableHeight () {
+        return this.$store.state.inIframe
+          ? this.clientHeight - 240 + this.iframeHeigh
+          : this.clientHeight - 240;
+      },
+      ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {},
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+  @import "@/assets/scss/modules/management/list-main.scss";
+  @import "@/assets/scss/modules/shequzhili/event-info.scss";
+   ::v-deep .el-row{
+  margin:20px 0px 10px;
+  font-size: 15px;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
new file mode 100644
index 000000000..403efbbdd
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
@@ -0,0 +1,336 @@
+<template>
+    <div>
+      <div class="dialog-h-content scroll-h">
+        <div class="div_tuomin">
+          <el-button
+                     size="mini"
+                     class="diy-button--search"
+                     @click="handleTuomin">显示脱敏信息</el-button>
+        </div>
+        <div v-if="initLoading"
+             class="m-row">
+          <div class="m-info">
+            <div class="info-prop">
+              <span class="info-title-2">所属楼栋：</span>
+              <span>{{ dataForm.neighborHoodName }}-{{dataForm.buildingName}}</span>
+            </div>
+  
+            <div class="info-prop">
+              <span class="info-title-2">单元号：</span>
+              <span>{{ dataForm.unitName?dataForm.unitName:'--' }}</span>
+            </div>
+  
+            <div class="info-prop">
+              <span class="info-title-2">门牌号：</span>
+              <span>{{ dataForm.doorName}}</span>
+            </div>
+  
+            <div class="info-prop">
+              <span class="info-title-2">房屋编码：</span>
+              <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+            </div>
+            <div v-if="dataForm.houseQrcodeUrl"
+                 style="display: flex;flex-direction: column;">
+              <img style="margin-left: 70px;width: 200px;"
+                   :src="dataForm.houseQrcodeUrl">
+              <a style="margin-left: 80px"
+                 :href="dataForm.houseQrcodeUrl"
+                 target="_blank">下载</a>
+            </div>
+  
+            <div class="info-prop">
+              <span class="info-title-2">房屋类型：</span>
+              <span>{{dataForm.houseTypeName?dataForm.houseTypeName:'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">房屋用途：</span>
+              <span>{{dataForm.purposeName?dataForm.purposeName:'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">房屋状态：</span>
+              <span>{{dataForm.rentName?dataForm.rentName:'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">房主姓名：</span>
+              <span>{{dataForm.ownerName?dataForm.ownerName:'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">联系方式：</span>
+              <span>{{dataForm.showOwnerPhone?dataForm.showOwnerPhone:'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">房主身份证：</span>
+              <span>{{dataForm.showOwnerIdCard?dataForm.showOwnerIdCard:'--' }}</span>
+            </div>
+            <div class="info-prop">
+              <span class="info-title-2">备注：</span>
+              <span>{{dataForm.remark?dataForm.remark:'--' }}</span>
+            </div>
+            <div class="info-prop">
+                <span class="">居住成员信息：</span>
+                <span v-if="quanzufangResiList.length==0">--</span>
+            </div>
+            <section>
+                      <el-row >
+                          <el-col :span="3"> 姓名</el-col>
+                          <el-col :span="7">联系方式</el-col>
+                          <el-col :span="9">房主身份证</el-col>
+                      </el-row>
+                      <el-row type="flex"  v-for="(item,index) in quanzufangResiList" :key="index">
+                          <el-col :span="3"> {{item.name}}</el-col>
+                          <el-col :span="7"> {{item.mobile?item.mobile:"--"}}</el-col>
+                          <el-col :span="9"> {{item.idCard?item.idCard:"--"}}</el-col>
+                      </el-row>
+            </section>
+          </div>
+        </div>
+  
+      </div>
+      <div class="div-btn">
+        <el-button size="small"
+                   @click="handleCancle">关 闭</el-button>
+  
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  import { mapGetters } from 'vuex'
+  import { Loading } from 'element-ui' // 引入Loading服务
+  import { requestPost, requestGet } from '@/js/dai/request'
+  
+  
+  let loading // 加载动画
+  export default {
+    data () {
+      return {
+        formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+        btnDisable: false,
+        initLoading: false,
+        unitList: [],
+  
+        houseId: '', //房屋ID
+        houseType: '1',
+        purpose: '1',
+        rentFlag: 0,
+        dataForm: {
+          neighborHoodId: '', // 所属小区ID
+          buildingId: '',//所属楼栋ID
+          buildingUnitId: '',//所属单元ID
+          doorName: '',//门牌号
+          houseType: '',//房屋类型【楼房，平房，别墅】
+          purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+          rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+          ownerPhone: '', //联系方式
+          ownerName: '', //房主名字
+          ownerIdCard: '', //房主身份证
+          remark: '',
+          quanzufangResiList:[],//群租房人员
+          // realPerson: 0,
+          coding: '',
+          sysCoding: ''
+        },
+  
+        keyWords: '',
+        agencyObj: {},
+  
+      }
+    },
+    components: {},
+    mounted () {
+  
+    },
+  
+    methods: {
+      handleCancle () {
+        // this.diaDestroy()
+        this.$emit('diaDetailClose')
+  
+      },
+      diaDestroy () {
+       
+      },
+      async initForm (row, agencyObj) {
+        console.log(row,'see1');
+  
+        //  this.dataForm = JSON.parse(JSON.stringify(row))
+        this.agencyObj = agencyObj
+        this.houseId = row.houseId
+        await this.loadHouseInfo()
+        await this.loadQunzufangInfo()
+        this.initLoading = true
+
+
+        // this.$refs.ref_form.resetFields();
+        // this.agencyObj = agencyObj
+        // this.formType = type
+        // console.log('agencyObj-----', agencyObj)
+        // if (row) {
+  
+        //   this.houseId = row.houseId
+        //   await this.loadHouseInfo()
+  
+  
+        // } else {
+  
+        //   this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        //   this.dataForm.buildingId = this.agencyObj.id
+        // }
+  
+  
+        // await this.loadUnitList()
+  
+      },
+  
+      async handleTuomin () {
+        const url = "/data/aggregator/epmetuser/detailByType";
+  
+        const { data, code, msg } = await requestPost(url, {
+          id: this.houseId,
+          type: "checkHouse",
+        });
+  
+        if (code === 0) {
+          this.$set(this.dataForm, 'showOwnerPhone', data.mobile)
+          this.$set(this.dataForm, 'showOwnerIdCard', data.idCard)
+        } else {
+          this.$message.error(msg);
+        }
+  
+      },
+  
+      async loadHouseInfo () {
+  
+        const url = "/gov/org/ichouse/" + this.houseId
+  
+        const { data, code, msg } = await requestGet(url)
+  
+        if (code === 0) {
+          // debugger
+          this.dataForm = { ...data }
+  
+          this.houseType = this.dataForm.houseType
+          this.purpose = this.dataForm.purpose
+          this.rentFlag = parseInt(this.dataForm.rentFlag)
+  
+  
+        } else {
+          this.$message.error(msg)
+        }
+  
+      },
+      
+      async loadQunzufangInfo () {
+  
+        const url = "/epmetuser/icresiuser/listhomeuserbrief-encrypt/" + this.houseId
+
+        const { data, code, msg } = await requestPost(url)
+
+        if (code === 0) {
+            // debugger
+            // this.dataForm = { ...data }
+
+            // this.houseType = this.dataForm.houseType
+            // this.purpose = this.dataForm.purpose
+            // this.rentFlag = parseInt(this.dataForm.rentFlag)
+            this.quanzufangResiList = data
+            console.log(data);
+        } else {
+            this.$message.error(msg)
+        }
+
+      },
+      resetData () {
+        this.houseId = '' //房屋ID
+        this.houseType = '1'
+        this.purpose = '1'
+        this.rentFlag = 0
+        this.dataForm = {
+          neighborHoodId: '', // 所属小区ID
+          buildingId: '',//所属楼栋ID
+          buildingUnitId: '',//所属单元ID
+          doorName: '',//门牌号
+          houseType: '1',//房屋类型【楼房，平房，别墅】
+          purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+          rentFlag: 0,//是否出租【是：1，否：0】
+          ownerPhone: '', //联系方式
+          ownerName: '', //房主名字
+          ownerIdCard: '', //房主身份证
+          remark: '', // 备注
+          coding: '',
+          sysCoding: ''
+        }
+  
+      },
+      // 开启加载动画
+      startLoading () {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: '正在加载……', // 加载中需要显示的文字
+          background: 'rgba(0,0,0,.7)' // 背景颜色
+        })
+      },
+      // 结束加载动画
+      endLoading () {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    computed: {
+      dataRule () {
+        return {
+          buildingUnitId: [
+            { required: true, message: '所属单元不能为空', trigger: 'blur' },
+          ],
+          doorName: [
+            { required: true, message: '门牌号不能为空', trigger: 'blur' }
+          ],
+          coding: [
+            { required: true, message: '房屋编码不能为空', trigger: 'blur' }
+          ],
+          houseType: [
+            { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+          ],
+          purpose: [
+            { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+          ],
+          rentFlag: [
+            { required: true, message: '是否出租不能为空', trigger: 'blur' }
+          ],
+          ownerPhone: [
+            { required: false }
+          ],
+          ownerName: [
+            { required: false }
+          ],
+          ownerIdCard: [
+            { required: false }
+          ],
+          remark: [
+            { required: false }
+          ],
+        }
+      },
+  
+    },
+    props: {
+      view_real_data: {//显示【显示脱敏信息】按钮
+        type: Boolean,
+        default: false,
+      }
+    }
+  }
+  </script>
+  <style lang="scss" scoped >
+  @import "@/assets/scss/modules/management/detail-main.scss";
+  
+  .div_tuomin {
+    position: absolute;
+    top: 52px;
+    right: 40px;
+    z-index: 1000;
+  }
+  </style>
+  
\ No newline at end of file

From d7a21e1c7200bca47cfe776ce8323e41cc28f219 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 7 Mar 2023 10:50:30 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E7=BE=A4=E7=A7=9F=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/htgl/index.vue   | 48 ++++++++++---------
 .../tuceng/anquan/qunzufang/qzfInfo.vue       | 31 +++++++++---
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/shequzhili/htgl/index.vue b/src/views/modules/shequzhili/htgl/index.vue
index 8204fcc0a..8a2682f8c 100644
--- a/src/views/modules/shequzhili/htgl/index.vue
+++ b/src/views/modules/shequzhili/htgl/index.vue
@@ -11,12 +11,13 @@
             <el-form-item label="所属组织" prop="orgId" >
               <el-cascader
                 class="item_width_2"
-                ref="myCascader"
+                ref="myCascaderk"
                 size="small"
                 v-model="agencyIdArray"
                 :options="orgOptions"
                 :props="orgOptionProps"
                 :show-all-levels="false"
+                @change="handleChangeAgency"
               ></el-cascader>
             </el-form-item>
 
@@ -185,20 +186,22 @@ import axios from "axios";
 
 export default {
   data() {
+    let orgOptionProps = {
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
     return {
       orgOptions: [],
-      orgOptionProps: {
-        multiple: false,
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-        checkStrictly: true
-      },
+      orgOptionProps,
       formData: {
         topicContent: '',
         userName: '',
         startDate: '',
         endDate: '',
+        gridId:'',
       },
       showhtglDialog:false,
       topicId:'',
@@ -249,7 +252,19 @@ export default {
       this.pageNo = 1;
       this.getTableData();
     },
-   
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascaderk"].getCheckedNodes()[0].data
+      if (obj) {
+        if (obj.level === 'grid') {
+          this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+        } else {
+          this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+        }
+
+      } else {
+        this.formData.gridId = ''
+      }
+    },
     resetSearch () {
         this.agencyIdArray = []
         this.formData = {
@@ -257,29 +272,18 @@ export default {
         userName: '',
         startDate: '',
         endDate: '',
+        gridId:''
     }
     this.pageNo = 1
     },
 
     async getTableData () {
       const url = "/resi/group/ytTopic/topicList";
-      var gridId = ''
       const { pageSize, pageNo, formData } = this;
-      if(this.agencyIdArray.length ==1){
-         gridId = this.agencyIdArray.join()
-      }else if(this.agencyIdArray.length ==2){
-        gridId = this.agencyIdArray.splice(1).join()
-      }else if(this.agencyIdArray.length ==3){
-        gridId = this.agencyIdArray.splice(2).join()
-      }else if(this.agencyIdArray.length ==4){
-        gridId = this.agencyIdArray.splice(3).join()
-      }else{
-        this.agencyIdArray = []
-      }
+     
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
-        gridId,
         source:'1',
         ...formData,
       });
diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
index 403efbbdd..468d0d9f2 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
@@ -151,8 +151,6 @@
        
       },
       async initForm (row, agencyObj) {
-        console.log(row,'see1');
-  
         //  this.dataForm = JSON.parse(JSON.stringify(row))
         this.agencyObj = agencyObj
         this.houseId = row.houseId
@@ -186,19 +184,40 @@
         const url = "/data/aggregator/epmetuser/detailByType";
   
         const { data, code, msg } = await requestPost(url, {
-          id: this.houseId,
+          id:this.houseId,
           type: "checkHouse",
         });
-  
+        for(let i in this.quanzufangResiList){
+            await this.getResiTuomin( this.quanzufangResiList[i].id)
+        }
         if (code === 0) {
           this.$set(this.dataForm, 'showOwnerPhone', data.mobile)
           this.$set(this.dataForm, 'showOwnerIdCard', data.idCard)
         } else {
           this.$message.error(msg);
         }
-  
       },
-  
+      async getResiTuomin(id){
+        const url = "/data/aggregator/epmetuser/detailByType";
+        const { data, code, msg } = await requestPost(url, {
+            id:id,
+            type: "checkIcResiUser",
+        });
+        if(code == 0){
+           for(let i in this.quanzufangResiList){
+            // console.log(this.quanzufangResiList[i].mobile.split(7,11));
+            // console.log(data.mobile.split(7,11));
+            if(this.quanzufangResiList[i].mobile.substr(7,4) == data.mobile.substr(7,4)){
+                this.$set(this.quanzufangResiList[i],'mobile',data.mobile)
+                this.$set(this.quanzufangResiList[i],'idCard',data.idCard)
+            }
+           }
+
+        }else {
+            this.$message.error(msg)
+        }
+        
+      },
       async loadHouseInfo () {
   
         const url = "/gov/org/ichouse/" + this.houseId

From 24d7094df658869a3f28109b2379e64795c09291 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 7 Mar 2023 12:56:09 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E7=BE=A4=E7=A7=9F=E6=88=BF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/tuceng/anquan/qunzufang/index.vue | 9 ++++++++-
 .../shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue       | 9 +++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
index 12ffe99f8..d933567b8 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
@@ -105,7 +105,14 @@
             align="center"
             width="50"
           />
-  
+          <el-table-column
+            prop="gridName"
+            align="center"
+            min-width="180"
+            label="所属组织"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
           <el-table-column
             prop="houseName"
             align="center"
diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
index 468d0d9f2..3f3671861 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/qzfInfo.vue
@@ -66,8 +66,8 @@
               <span class="info-title-2">备注：</span>
               <span>{{dataForm.remark?dataForm.remark:'--' }}</span>
             </div>
-            <div class="info-prop">
-                <span class="">居住成员信息：</span>
+            <div class="leftPostion_box">
+                <span class="">居住成员信息</span>
                 <span v-if="quanzufangResiList.length==0">--</span>
             </div>
             <section>
@@ -351,5 +351,10 @@
     right: 40px;
     z-index: 1000;
   }
+  .leftPostion_box{
+    position: relative;
+    left: -80px;
+    font-size: 18px;
+  }
   </style>
   
\ No newline at end of file

From dbd8ba2f7dce8f38b1039f93ac6e99837bc9a2c4 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 7 Mar 2023 20:15:25 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=85=88=E6=8F=90=E4=BA=A4=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emblemManagement/cpts/emblemIfon.vue      | 143 ++++++++
 .../workSys/emblemManagement/index.vue        | 320 ++++++++++++++++++
 2 files changed, 463 insertions(+)
 create mode 100644 src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
 create mode 100644 src/views/modules/workSys/emblemManagement/index.vue

diff --git a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
new file mode 100644
index 000000000..7e5ba53d9
--- /dev/null
+++ b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
@@ -0,0 +1,143 @@
+<template>
+    <div>
+    <div class="body">
+       <el-row type="flex"  >
+             <el-col :span="24">
+                   <span class="htgl_info_label">所属网格:</span> {{emblemObj.gridName||'--'}}
+           </el-col>
+         </el-row>
+      
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">审核类型:</span> <section style="flex:1">{{emblemObj.badgeName||'--'}}</section>
+           </el-col>
+         </el-row>
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">姓名:</span> <section style="flex:1">{{emblemObj.userName||'--'}}</section>
+           </el-col>
+         </el-row>
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">身份证号:</span> <section style="flex:1">{{emblemObj.idCard||'--'}}</section>
+           </el-col>
+         </el-row>
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">手机号:</span> <section style="flex:1">{{emblemObj.mobile||'--'}}</section>
+           </el-col>
+         </el-row>
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">备注:</span> <section style="flex:1">{{emblemObj.userName||'--'}}</section>
+           </el-col>
+         </el-row>
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+                   <span :class="emblemObj.topicImages?'img_label':'htgl_info_label'" >认证证件:</span>
+                  <template>
+                        <img :src="emblemObj.userAvatar" alt="" width="150px" height="200px"  />
+                  </template>
+           </el-col>
+         </el-row>
+      
+    </div>
+    </div>
+   </template>
+   
+   <script>
+   import nextTick from "dai-js/tools/nextTick";
+   import { requestPost } from "@/js/dai/request";
+   export default {
+   
+     data() {
+       return {
+       };
+     },
+     props:{
+       emblemObj:{
+           type:Object,
+          default:()=>{}
+       },
+     },
+      created() {
+       // console.log(this.emblemObj);
+       // this.$set(this.emblemObj,'topicVoices',this.emblemObj)
+       this.getResiTuomin(emblemObj.userId)
+
+     },
+     mounted(){
+     },
+     methods:{
+        async getResiTuomin(id){
+            const url = "/data/aggregator/epmetuser/detailByType";
+            const { data, code, msg } = await requestPost(url, {
+                id:id,
+                type: "checkIcResiUser",
+            });
+            if(code == 0){
+            for(let i in this.quanzufangResiList){
+                    this.$set(this.emblemObj,'mobile',data.mobile)
+                    this.$set(this.emblemObj,'idCard',data.idCard)
+            }
+
+            }else {
+                this.$message.error(msg)
+            }
+        
+      },
+   
+     },
+    
+     components: {},
+     computed: {
+     },
+     watch: {},
+   };
+   </script>
+   <style lang="scss" scoped>
+   .img_label{
+       display: inline-block;
+       height: 75px;
+       vertical-align: top;
+       padding-left: 10px;
+       width: 90px;
+       text-align: left;
+       margin-right: 6px;
+   }
+   .body{
+     padding: 0 60px;
+   }
+   .htgl_info_label{
+       display: inline-block;
+       width: 90px;
+       text-align: left;
+       padding-left: 10px;
+       position: relative;
+       margin-right: 6px;
+   }
+   .htgl_info_label::before{
+       content: "";
+       display: block;
+       position: absolute;
+       top: 5px;
+       width: 7px;
+       left: -5px;
+       height: 7px;
+       background: #0c81fe;
+       border-radius: 3px;
+       margin-right: 10px;
+   }
+   .img_label::before{
+     content: "";
+       display: block;
+       position: absolute;
+       left: -5px;
+       top: 5px;
+       width: 7px;
+       height: 7px;
+       background: #0c81fe;
+       border-radius: 3px;
+       margin-right: 10px;
+   }
+   </style>
\ No newline at end of file
diff --git a/src/views/modules/workSys/emblemManagement/index.vue b/src/views/modules/workSys/emblemManagement/index.vue
new file mode 100644
index 000000000..fee13312c
--- /dev/null
+++ b/src/views/modules/workSys/emblemManagement/index.vue
@@ -0,0 +1,320 @@
+<template>
+    <div  class="div_main">
+        <div class="div_search">
+          <el-form
+            :inline="true"
+            :model="formData"
+            ref="ref_searchform"
+            :label-width="'100px'"
+          >
+            <div>
+              <el-form-item label="所属网格" prop="orgId" >
+              
+                <el-select
+                v-model="formData.gridId"
+                placeholder="请选择"
+                size="small"
+                clearable
+                >
+                    <el-option v-for="item in orgOptions" 
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                    >
+
+                    </el-option>
+                </el-select>
+              </el-form-item>
+  
+            
+  
+              <el-form-item label="徽章类型">
+                <el-select v-model="formData.badgeId"
+                         class="item_width_2"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in orgOptionA"
+                           :key="item.badgeId"
+                           :label="item.badgeName"
+                           :value="item.badgeId">
+                </el-option>
+              </el-select>
+              
+              </el-form-item>
+  
+              <el-form-item label="状态">
+                <el-select v-model="formData.auditStatus"
+                         class="item_width_2"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in orgOptionB"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              
+              </el-form-item>
+              <el-button
+                style="margin-left: 30px"
+                size="small"
+                class="diy-button--search"
+                @click="handleSearch"
+                >查询</el-button
+              >
+              <el-button
+                style="margin-left: 10px"
+                size="small"
+                class="diy-button--reset"
+                @click="resetSearch"
+                >重置</el-button
+              >
+            </div>
+          </el-form>
+        </div>
+  
+      <div class="div_table">
+        <el-table
+          border
+          :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+          class="table"
+          :data="tableData"
+          style="width: 100%"
+          :height="maxTableHeight"
+        >
+       
+          <el-table-column
+            label="序号"
+            fixed="left"
+            type="index"
+            align="center"
+            width="50"
+          />
+  
+          <el-table-column
+            prop="gridName"
+            align="center"
+            label="所属网格"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+  
+          <el-table-column
+            prop="badgeName"
+            label="徽章类型"
+            min-width="150"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+  
+          <el-table-column
+            prop="userName"
+            align="center"
+            min-width="150"
+            label="申请人"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+  
+          <el-table-column
+            prop="auditStatus"
+            align="center"
+            width="180"
+            :show-overflow-tooltip="true"
+            label="状态"
+          >
+          <template slot-scope="scope">
+                {{scope.row.auditStatus == 'approved'?'审核通过':scope.row.auditStatus == 'rejected'?'审核驳回':'审核中'}}
+          </template>
+          </el-table-column>
+  
+          <el-table-column fixed="right" label="操作" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button @click="handleWatch(scope.row)" type="text" size="small"
+                >{{scope.row.auditStatus=='approved'?'查看':'审核'}}</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+  
+        <div>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="parseInt(pageSize)"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <el-dialog
+      title="审核信息"
+      :visible.sync="showhtglDialog"
+      width="950px"
+      v-if="showhtglDialog"
+      @close="showhtglDialog = false"
+     >
+      <emblem-ifon  
+      :emblemObj="emblemObj"
+      >
+      </emblem-ifon>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { mapGetters } from "vuex";
+  import { requestPost } from "@/js/dai/request";
+  import emblemIfon from "./cpts/emblemIfon.vue"
+  export default {
+    data() {
+      return {
+        orgOptions: [],
+        orgOptionA:[],
+        orgOptionB:[
+            {label:'审核通过',value:'approved'},
+            {label:'审核驳回',value:'rejected'},
+            {label:'审核中',value:'auditing'},
+        ],
+        formData: {
+            gridId:'',
+            badgeId:'',
+            auditStatus:'',
+        },
+        showhtglDialog:false,
+        topicId:'',
+        tableData:[],
+        emblemObj:{},
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+      };
+    },
+    created() {
+      this.getTableData()
+    },
+    mounted() {
+      this.getOrgTreeList();
+      this.getEmblemType()
+    },
+    methods: {
+      async getOrgTreeList() {
+        const url = "/gov/org/customergrid/gridoption";
+  
+        let params = {
+          agencyId: this.$store.state.user.agencyId,
+          purpose: "addorupdate",
+        };
+  
+        const { data, code, msg } = await requestPost(url, params);
+  
+        if (code === 0) {
+          this.orgOptions= data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      async getEmblemType() {
+        const url = "/epmetuser/badge/badge-options";
+  
+        const { data, code, msg } = await requestPost(url);
+        if (code === 0) {
+          this.orgOptionA= data;
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      handleSizeChange (val) {
+  
+          this.pageSize = val;
+          window.localStorage.setItem("pageSize", val);
+          this.getTableData();
+      },
+      handleCurrentChange (val) {
+              this.pageNo = val;
+              this.getTableData();
+      },
+      handleSearch (val) {
+        this.pageNo = 1;
+        this.getTableData();
+      },
+      async getResiTuomin(id){
+            const url = "/data/aggregator/epmetuser/detailByType";
+            const { data, code, msg } = await requestPost(url, {
+                id:id,
+                type: "checkIcResiUser",
+            });
+            if(code == 0){
+                   return data
+            }else {
+                this.$message.error(msg)
+            }
+        
+      },
+      resetSearch () {
+         
+          this.formData = {
+            gridId:'',
+            badgeId:'',
+            auditStatus:'',
+      }
+      this.pageNo = 1
+      },
+  
+      async getTableData () {
+        const url = "/epmetuser/badge/audit-page-list";
+        const { pageSize, pageNo, formData } = this;
+        const { data, code, msg } = await requestPost(url, {
+          pageSize,
+          pageNo,
+          agencyId:this.$store.state.user.agencyId,
+          ...formData,
+        });
+        if (code === 0) {
+          this.total = data.total || 0;
+          this.tableData = data.list
+            ? data.list.map((item) => {
+              return item;
+            })
+            : [];
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      async handleWatch (row) {
+        this.showhtglDialog = true
+        this.getResiTuomin(row.userId)
+        this.emblemObj = {row,...this.getResiTuomin(row.userId)}
+        console.log(row);
+      },
+    },
+    components: {
+        emblemIfon
+    },
+    computed: {
+      maxTableHeight () {
+        return this.$store.state.inIframe
+          ? this.clientHeight - 240 + this.iframeHeigh
+          : this.clientHeight - 240;
+      },
+      ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {},
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+  @import "@/assets/scss/modules/management/list-main.scss";
+  @import "@/assets/scss/modules/shequzhili/event-info.scss";
+   ::v-deep .el-row{
+  margin:20px 0px 10px;
+  font-size: 15px;
+  }
+  </style>
+  
\ No newline at end of file

From ec0ce11f361f2b75fbe8b6198f5b0e3701dfb246 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 8 Mar 2023 10:16:13 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=BA=A4=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/articleTag/edit.vue | 291 +++++++-----------
 .../modules/workSys/articleTag/index.vue      |   3 +-
 .../emblemManagement/cpts/emblemIfon.vue      |  38 +--
 .../workSys/emblemManagement/index.vue        |  14 +-
 4 files changed, 130 insertions(+), 216 deletions(-)

diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index 8b21186db..a5efaaeed 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -5,66 +5,35 @@
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
-               :rules="dataRule"
+               :rules="rules"
                :disabled="formType==='detail'"
                class="form">
 
-        <el-form-item label="角色名称"
-                      prop="name"
+        <el-form-item label="分类名称"
+                      prop="tagName"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
                     :disabled="defaultRole==='1'"
                     placeholder="请输入角色名称"
                     clearable
-                    v-model="formData.name">
+                    v-model="formData.tagName">
           </el-input>
 
         </el-form-item>
-
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    :disabled="defaultRole==='1'"
-                    maxlength="500"
-                    show-word-limit
-                    :autosize="{ minRows: 5, maxRows: 10 }"
-                    clearable
-                    placeholder="请输入备注"
-                    v-model="formData.remark"></el-input>
-        </el-form-item>
-
-        <el-form-item label="管理平台菜单"
-                      prop="content"
-                      label-width="150px"
-                      style="display: block">
-          <el-tree class="item_width_1"
-                   :data="menuList"
-                   :props="{ label: 'name', children: 'children' }"
-                   node-key="id"
-                   :default-expanded-keys="['000']"
-                   ref="menuListTree"
-                   accordion
-                   show-checkbox>
-          </el-tree>
-        </el-form-item>
-        <el-form-item label="可视化平台菜单"
-                      prop="content"
-                      label-width="150px"
-                      style="display: block">
-          <el-tree class="item_width_1 item_border"
-                   :data="menuListShuju"
-                   :props="{ label: 'name', children: 'children' }"
-                   node-key="id"
-                   :default-expanded-keys="['000']"
-                   ref="menuListShujuTree"
-                   accordion
-                   show-checkbox>
-          </el-tree>
-        </el-form-item>
+                          <!-- :prop="'formData.'+'agencyList.' +'agencyId'" -->
+        <el-form-item label="应用范围"
+                          label-width="150px"
+                          prop="agencyId"
+                          >
+              <el-cascader ref="cascaderUnit"
+                           v-model="formData.agencyId"
+                           :options="orgOptions"
+                           :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
+                           clearable 
+                           @change="cascaderClick"
+                           />
+            </el-form-item>
 
       </el-form>
     </div>
@@ -90,138 +59,102 @@ import { requestPost, requestGet } from '@/js/dai/request'
 let loading // 加载动画
 export default {
   data () {
+   
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
       btnDisable: false,
-
+      orgOptions:[],
       roleId: '',
+      sbid:'',
       menuList: [],
       menuListShuju: [],
       formData: {
-        id: '',
-        name: '',
-        remark: '',//备注
-        menuIdList: [],
-        customerId: ''
+          tagName: '',
+          agencyId:'',
+          orgIdPath:''
+      },
+      formDatam:[],
+      rules:{
+        tagName: [
+          { required: true, message: '分类名称不能为空', trigger: 'blur' }
+        ],
+        agencyId:[
+        { required: true, message: '应用范围不能为空', trigger: 'blur' }
+        ]
       },
 
       defaultRole: '',
-
     }
   },
   components: {},
   async mounted () {
-
-
+    await this.getOrgTreeList()
   },
 
   methods: {
 
-    async initForm (type, roleId, defaultRole) {
+    async initForm (type, row, defaultRole) {
       this.startLoading()
-      this.customerId = localStorage.getItem("customerId");
-      this.formData.customerId = this.customerId
-      //获取菜单
-      await this.getMenuList()
-      await this.getMenuShujuList()
-
-      this.$refs.menuListTree.setCheckedKeys([])
-      this.$refs.menuListShujuTree.setCheckedKeys([])
-
       this.formType = type
-
-      if (roleId) {
-        this.roleId = roleId
-        this.formData.id = roleId
-        this.defaultRole = defaultRole
-        this.loadFormData()
-      }
-
+      this.formData = {...row}
       this.endLoading()
 
-
-    },
-
-
-    async getMenuList () {
-      const url = "/gov/access/menu/nav"
-
-      let params = {}
-
-      const { data, code, msg } = await requestGet(url, params)
-
-      if (code === 0) {
-        this.menuList = [
-          {
-            id: '000',
-            name: '全部菜单',
-            children: [...data]
-          }
-        ]
-        // this.menuList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async getMenuShujuList () {
-      const url = "/gov/access/menu/nav"
-
-      let params = {
-        tableName: 'data_menu'
-      }
-
-
-      const { data, code, msg } = await requestGet(url, params)
-
-      if (code === 0) {
-        this.menuListShuju = [
-          {
-            id: '000',
-            name: '全部菜单',
-            children: [...data]
-          }
-        ]
-        // this.menuListShuju = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
     },
-
-    async loadFormData () {
-
-      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
-      const url = '/gov/access/govrole/' + this.roleId
-      let params = {
-
-      }
-      const { data, code, msg } = await requestGet(url, params)
-      if (code === 0) {
-        this.formData = data
-
-        this.formData.menuIdList.forEach(item => {
-          this.$refs.menuListTree.setChecked(item, true)
-
-        })
-        this.formData.menuIdList.forEach(item => {
-          this.$refs.menuListShujuTree.setChecked(item, true)
-        })
-        this.formData.customerId = this.customerId
-
+    async getOrgTreeList() {
+      const { user } = this.$store.state
+        this.dataListLoading = true
+        this.$http
+          .post('/gov/org/customeragency/staffinagencylist')
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            } else {
+              console.log('获取查询详情成功', res.data)
+              let { agencyList, subAgencyList } = res.data
+              // this.optionsA = res.data
+              // console.log(this.optionsA);
+              const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
+              this.orgOptions = this.deepTree(_arr)
+            }
+          })
+          .catch(() => {
+            this.dataListLoading = false
+            return this.$message.error('网络错误')
+          })
+        this.dataListLoading = false
+    },     
+     deepTree (arr) {
+        if (Array.isArray(arr)) {
+          return arr.map(item => {
+            return {
+              ...item,
+              subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
+            }
+          })
+        }
+      },
+    cascaderClick () {
+      let obj = this.$refs["cascaderUnit"].getCheckedNodes()[0].data
+      var arr = []
+      if (obj) {
+        if (obj.level === "street" && obj.subAgencyList!= null) {
+              for(let i in obj.subAgencyList){
+                this.formDatam.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.orgIdPath})
+              }
+              console.log( this.formDatam);
+        } else {
+              this.$set(this.formData,'agencyId',obj.agencyId)
+              this.$set(this.formData,'orgIdPath',obj.orgIdPath)
+        }
       } else {
-        this.$message.error(msg)
+        this.formData.agencyId = ''
       }
-    },
-
+  
+      },
     handleComfirm () {
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj)
-
         } else {
           this.addNat()
         }
@@ -230,20 +163,6 @@ export default {
     },
 
     async addNat () {
-
-
-      this.formData.menuIdList = []
-      this.formData.menuIdList = [
-        ...this.$refs.menuListTree.getCheckedKeys(),
-        ...this.$refs.menuListTree.getHalfCheckedKeys(),
-        ...this.$refs.menuListShujuTree.getCheckedKeys(),
-        ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
-      ]
-      this.formData.menuIdList = this.formData.menuIdList.filter(item => item !== '000')
-
-      console.log('menuAll', this.formData)
-
-      // return false
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -251,18 +170,30 @@ export default {
 
       let url = ''
       if (this.formType === 'add') {
-        url = '/gov/access/govrole/save'
-
-        this.formData.roleId = ''
+        url = '/gov/voice/tag/save'
 
       } else {
-        url = '/gov/access/govrole/edit'
+        url = '/gov/voice/tag/update'
 
       }
-
-
-      const { data, code, msg } = await requestPost(url, this.formData)
-
+      console.log(this.formData);
+     const { tagName,orgIdPath,agencyId} = this.formData 
+     let params = {}
+     if(agencyId &&this.formDatam.length==0){
+        params = {
+          tagName,
+          agencyList:{
+            orgIdPath,
+            agencyId,
+          },
+        }
+     }else{
+        params = {
+          tagName,
+          agencyList:this.formDatam
+        }
+     }
+      const { data, code, msg } = await requestPost(url,params)
       if (code === 0) {
         this.$message({
           type: 'success',
@@ -276,7 +207,7 @@ export default {
         this.btnDisable = false
         this.$message.error(msg)
       }
-
+      this.formDatam = []
     },
 
     handleCancle () {
@@ -290,12 +221,7 @@ export default {
       this.roleId = ''
 
       this.formData = {
-        id: '',
-        name: '',
-        remark: '',//备注
-        menuIdList: [],
-        customerId: ''
-
+        tagName: '',
       }
       this.$refs['ref_form'].resetFields()
     },
@@ -318,10 +244,7 @@ export default {
   computed: {
     dataRule () {
       return {
-        name: [
-          { required: true, message: '角色名称不能为空', trigger: 'change' }
-        ],
-
+        
 
       }
     },
diff --git a/src/views/modules/workSys/articleTag/index.vue b/src/views/modules/workSys/articleTag/index.vue
index ce0f56615..811df167b 100644
--- a/src/views/modules/workSys/articleTag/index.vue
+++ b/src/views/modules/workSys/articleTag/index.vue
@@ -144,6 +144,7 @@
 			:close-on-click-modal="false"
 			:close-on-press-escape="false"
 			:title="formTitle"
+			destroy-on-close
 			width="850px"
 			top="5vh"
 			class="dialog-h"
@@ -267,7 +268,7 @@ export default {
 			this.formTitle = "修改";
 			this.formShow = true;
 			this.$nextTick(() => {
-				this.$refs.ref_form.initForm("edit", row.id, row.defaultRole);
+				this.$refs.ref_form.initForm("edit", row);
 			});
 		},
 
diff --git a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
index 7e5ba53d9..5084704b5 100644
--- a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
+++ b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
@@ -24,12 +24,7 @@
          </el-row>
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">手机号:</span> <section style="flex:1">{{emblemObj.mobile||'--'}}</section>
-           </el-col>
-         </el-row>
-         <el-row type="flex"  >
-             <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">备注:</span> <section style="flex:1">{{emblemObj.userName||'--'}}</section>
+               <span  class="htgl_info_label">手机号11111:</span> <section style="flex:1">{{emblemObj.mobile||'--'}}</section>
            </el-col>
          </el-row>
          <el-row type="flex"  >
@@ -40,8 +35,18 @@
                   </template>
            </el-col>
          </el-row>
-      
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">审核原因:</span> <section style="flex:1">{{emblemObj.userName||'--'}}</section>
+           </el-col>
+         </el-row>
+         <el-row>
+            <el-button size="small"> 取消</el-button>
+            <el-button > 审核不通过</el-button>
+            <el-button > 审核通过</el-button>
+        </el-row>
     </div>
+       
     </div>
    </template>
    
@@ -63,29 +68,12 @@
       created() {
        // console.log(this.emblemObj);
        // this.$set(this.emblemObj,'topicVoices',this.emblemObj)
-       this.getResiTuomin(emblemObj.userId)
 
      },
      mounted(){
      },
      methods:{
-        async getResiTuomin(id){
-            const url = "/data/aggregator/epmetuser/detailByType";
-            const { data, code, msg } = await requestPost(url, {
-                id:id,
-                type: "checkIcResiUser",
-            });
-            if(code == 0){
-            for(let i in this.quanzufangResiList){
-                    this.$set(this.emblemObj,'mobile',data.mobile)
-                    this.$set(this.emblemObj,'idCard',data.idCard)
-            }
-
-            }else {
-                this.$message.error(msg)
-            }
-        
-      },
+       
    
      },
     
diff --git a/src/views/modules/workSys/emblemManagement/index.vue b/src/views/modules/workSys/emblemManagement/index.vue
index fee13312c..febec02e2 100644
--- a/src/views/modules/workSys/emblemManagement/index.vue
+++ b/src/views/modules/workSys/emblemManagement/index.vue
@@ -191,6 +191,7 @@
         topicId:'',
         tableData:[],
         emblemObj:{},
+        customerId:"",
         pageNo: 1,
         pageSize: window.localStorage.getItem("pageSize") || 20,
         total: 1,
@@ -202,6 +203,7 @@
     mounted() {
       this.getOrgTreeList();
       this.getEmblemType()
+      this.customerId = localStorage.getItem("customerId");
     },
     methods: {
       async getOrgTreeList() {
@@ -244,11 +246,12 @@
         this.pageNo = 1;
         this.getTableData();
       },
-      async getResiTuomin(id){
-            const url = "/data/aggregator/epmetuser/detailByType";
+      async getEmblemIfon(row){
+            const url = "/epmetuser/more/badge/certification/detail";
             const { data, code, msg } = await requestPost(url, {
-                id:id,
-                type: "checkIcResiUser",
+                badgeId:row.badgeId,
+                recordId:row.recordId,
+                customerId:this.customerId,
             });
             if(code == 0){
                    return data
@@ -289,8 +292,7 @@
       },
       async handleWatch (row) {
         this.showhtglDialog = true
-        this.getResiTuomin(row.userId)
-        this.emblemObj = {row,...this.getResiTuomin(row.userId)}
+        this.emblemObj = {row,...this.getEmblemIfon(row)}
         console.log(row);
       },
     },

From 7a0db25bf175ddead0d2ad8af59f76b2ab934af8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 8 Mar 2023 11:11:11 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emblemManagement/cpts/emblemIfon.vue      | 61 +++++++++++++++----
 .../workSys/emblemManagement/index.vue        | 13 +++-
 2 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
index 5084704b5..00b1e5d10 100644
--- a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
+++ b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
     <div class="body">
-       <el-row type="flex"  >
+            <el-row type="flex"  >
              <el-col :span="24">
                    <span class="htgl_info_label">所属网格:</span> {{emblemObj.gridName||'--'}}
            </el-col>
@@ -9,41 +9,50 @@
       
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">审核类型:</span> <section style="flex:1">{{emblemObj.badgeName||'--'}}</section>
+               <span  class="htgl_info_label">审核类型:</span> <section style="flex:1">{{emblemObj.authResult == 'approved'?'审核通过':emblemObj.authResult == 'rejected'?'审核驳回':'审核中'||'--'}}</section>
            </el-col>
          </el-row>
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">姓名:</span> <section style="flex:1">{{emblemObj.userName||'--'}}</section>
+               <span  class="htgl_info_label">姓名:</span> <section style="flex:1">{{emblemObj.surname +emblemObj.name||'--'}}</section>
            </el-col>
          </el-row>
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">身份证号:</span> <section style="flex:1">{{emblemObj.idCard||'--'}}</section>
+               <span  class="htgl_info_label">身份证号:</span> <section style="flex:1">{{emblemObj.idcard||'--'}}</section>
            </el-col>
          </el-row>
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">手机号11111:</span> <section style="flex:1">{{emblemObj.mobile||'--'}}</section>
+               <span  class="htgl_info_label">手机号:</span> <section style="flex:1">{{emblemObj.mobile||'--'}}</section>
            </el-col>
          </el-row>
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
                    <span :class="emblemObj.topicImages?'img_label':'htgl_info_label'" >认证证件:</span>
                   <template>
-                        <img :src="emblemObj.userAvatar" alt="" width="150px" height="200px"  />
+                        <img :src="emblemObj.certificationImg" alt="" width="150px" height="200px"  />
                   </template>
            </el-col>
          </el-row>
-         <el-row type="flex"  >
+            <el-row type="flex" >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">审核原因:</span> <section style="flex:1">{{emblemObj.userName||'--'}}</section>
+               <span  class="htgl_info_label">审核原因:</span>
+               <template>
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  maxlength="200"
+                  placeholder="请输入内容"
+                  v-model="auditTextarea">
+                </el-input>
+               </template>
            </el-col>
          </el-row>
          <el-row>
-            <el-button size="small"> 取消</el-button>
-            <el-button > 审核不通过</el-button>
-            <el-button > 审核通过</el-button>
+            <el-button size="small" @click="handleDiaClose"> 取消</el-button>
+            <el-button @click="handleAudit('no')"> 审核不通过</el-button>
+            <el-button @click="handleAudit('yes')"> 审核通过</el-button>
         </el-row>
     </div>
        
@@ -57,6 +66,8 @@
    
      data() {
        return {
+        auditTextarea:'',
+        btnFlag:false
        };
      },
      props:{
@@ -73,8 +84,32 @@
      mounted(){
      },
      methods:{
-       
-   
+      async handleAudit(status){
+        if(status == 'yes'){
+        }else{
+           if (this.auditTextarea == ""){
+            this.$message.error('请填写审核原因!')
+            return
+           }
+        }
+        const url = "/epmetuser/badge/audit"
+        let params = {
+            recordId:this.emblemObj.recordId,
+            auditStatus:status == 'yes'?'approved':'rejected',
+            auditRemark:this.auditTextarea
+        }
+        let {code,msg,data} = await requestPost(url,params)
+        if(code==0){
+            this.$message.success('操作成功!')
+            this.$emit('dialogOk')
+        }else if(code>=8000){
+            this.$message.error(msg)
+        }
+       },
+       handleDiaClose(){
+        this.$emit('dialogCancle')
+       }
+      
      },
     
      components: {},
diff --git a/src/views/modules/workSys/emblemManagement/index.vue b/src/views/modules/workSys/emblemManagement/index.vue
index febec02e2..88a04b8b3 100644
--- a/src/views/modules/workSys/emblemManagement/index.vue
+++ b/src/views/modules/workSys/emblemManagement/index.vue
@@ -161,6 +161,8 @@
       @close="showhtglDialog = false"
      >
       <emblem-ifon  
+       @dialogCancle="diaClose"
+	   @dialogOk="addFormOk"
       :emblemObj="emblemObj"
       >
       </emblem-ifon>
@@ -246,6 +248,13 @@
         this.pageNo = 1;
         this.getTableData();
       },
+      diaClose() {
+		this.showhtglDialog = false;
+	  },
+      addFormOk() {
+		this.showhtglDialog = false;
+		this.getTableData();
+	  },
       async getEmblemIfon(row){
             const url = "/epmetuser/more/badge/certification/detail";
             const { data, code, msg } = await requestPost(url, {
@@ -292,8 +301,8 @@
       },
       async handleWatch (row) {
         this.showhtglDialog = true
-        this.emblemObj = {row,...this.getEmblemIfon(row)}
-        console.log(row);
+        let obj = await this.getEmblemIfon(row)
+        this.emblemObj = {row,...obj}
       },
     },
     components: {

From e3c2871d57afb696738bfa99892422ab7ee3ac4e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 8 Mar 2023 12:44:33 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=AE=A1=E6=A0=B8/?=
 =?UTF-8?q?=E7=BE=A4=E7=A7=9F=E6=88=BF=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tuceng/anquan/qunzufang/index.vue         |  5 +++-
 .../emblemManagement/cpts/emblemIfon.vue      | 23 ++++++++++++++-----
 .../workSys/emblemManagement/index.vue        |  4 ++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
index d933567b8..2e1a47873 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/qunzufang/index.vue
@@ -108,10 +108,13 @@
           <el-table-column
             prop="gridName"
             align="center"
-            min-width="180"
+            min-width="190"
             label="所属组织"
             :show-overflow-tooltip="true"
           >
+          <template slot-scope="scope">
+              <span>{{scope.row.agencyName }}-{{ scope.row.gridName}}</span>
+          </template>
           </el-table-column>
           <el-table-column
             prop="houseName"
diff --git a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
index 00b1e5d10..d91ff2acc 100644
--- a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
+++ b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
@@ -9,7 +9,7 @@
       
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
-               <span  class="htgl_info_label">审核类型:</span> <section style="flex:1">{{emblemObj.authResult == 'approved'?'审核通过':emblemObj.authResult == 'rejected'?'审核驳回':'审核中'||'--'}}</section>
+               <span  class="htgl_info_label">徽章类型:</span> <section style="flex:1">{{emblemObj.badgeName ||'--'}}</section>
            </el-col>
          </el-row>
          <el-row type="flex"  >
@@ -30,12 +30,15 @@
          <el-row type="flex"  >
              <el-col :span="24" style="display: flex;">
                    <span :class="emblemObj.topicImages?'img_label':'htgl_info_label'" >认证证件:</span>
-                  <template>
-                        <img :src="emblemObj.certificationImg" alt="" width="150px" height="200px"  />
+                  <template v-if="emblemObj.certificationImg">
+                        <img :src="emblemObj.certificationImg" alt="" width="150px" height="200px" />
+                  </template>
+                  <template v-else >
+                        <span>--</span>
                   </template>
            </el-col>
          </el-row>
-            <el-row type="flex" >
+            <el-row type="flex" v-show="emblemObj.authResult=='auditing'">
              <el-col :span="24" style="display: flex;">
                <span  class="htgl_info_label">审核原因:</span>
                <template>
@@ -49,10 +52,18 @@
                </template>
            </el-col>
          </el-row>
+         <el-row type="flex" v-show="emblemObj.authResult=='rejected'">
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">审核原因:</span>
+               <template>
+                    {{emblemObj.authReason||"--"}}
+               </template>
+           </el-col>
+         </el-row>
          <el-row>
             <el-button size="small" @click="handleDiaClose"> 取消</el-button>
-            <el-button @click="handleAudit('no')"> 审核不通过</el-button>
-            <el-button @click="handleAudit('yes')"> 审核通过</el-button>
+            <el-button v-show="emblemObj.authResult=='auditing'" @click="handleAudit('no')"> 审核不通过</el-button>
+            <el-button v-show="emblemObj.authResult=='auditing'" @click="handleAudit('yes')"> 审核通过</el-button>
         </el-row>
     </div>
        
diff --git a/src/views/modules/workSys/emblemManagement/index.vue b/src/views/modules/workSys/emblemManagement/index.vue
index 88a04b8b3..f20038491 100644
--- a/src/views/modules/workSys/emblemManagement/index.vue
+++ b/src/views/modules/workSys/emblemManagement/index.vue
@@ -127,14 +127,14 @@
             label="状态"
           >
           <template slot-scope="scope">
-                {{scope.row.auditStatus == 'approved'?'审核通过':scope.row.auditStatus == 'rejected'?'审核驳回':'审核中'}}
+                {{scope.row.auditStatus == 'approved'?'已通过':scope.row.auditStatus == 'rejected'?'未通过':'审核中'}}
           </template>
           </el-table-column>
   
           <el-table-column fixed="right" label="操作" align="center" width="100">
             <template slot-scope="scope">
               <el-button @click="handleWatch(scope.row)" type="text" size="small"
-                >{{scope.row.auditStatus=='approved'?'查看':'审核'}}</el-button
+                >{{scope.row.auditStatus=='auditing'?'审核':'查看'}}</el-button
               >
             </template>
           </el-table-column>

From 9b78cfb661637a6d07f915487cff6ca08ccca068 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 8 Mar 2023 14:32:22 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE/?=
 =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=AE=A3=E4=BC=A0=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=8A=A0=E5=BF=85=E5=A1=AB=E4=B8=94=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/article/drafts.vue |  8 +-
 .../modules/communityParty/article/index.vue  |  8 +-
 src/views/modules/workSys/articleTag/edit.vue | 82 ++++++++-----------
 3 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue
index a3b63a7ff..59906c237 100644
--- a/src/views/modules/communityParty/article/drafts.vue
+++ b/src/views/modules/communityParty/article/drafts.vue
@@ -275,7 +275,6 @@ export default {
           keyName: "tagNameList",
           type: "select",
           multiple: true,
-          filterable: true,
           allowCreate: true,
           optionUrl: "/gov/voice/tag/taglist",
           optionUrlParams: {},
@@ -286,6 +285,13 @@ export default {
               value: item.tagName,
             }));
           },
+          rules: [
+            {
+              required: true,
+              message: "文章标签不能为空",
+              trigger: "blur",
+            },
+          ],
         },
         {
           field: "内容",
diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue
index 5d2d6b034..ea064e288 100644
--- a/src/views/modules/communityParty/article/index.vue
+++ b/src/views/modules/communityParty/article/index.vue
@@ -471,7 +471,6 @@ export default {
           keyName: "tagNameList",
           type: "select",
           multiple: true,
-          filterable: true,
           allowCreate: true,
           optionUrl: "/gov/voice/tag/taglist",
           optionUrlParams: {},
@@ -482,6 +481,13 @@ export default {
               value: item.tagName,
             }));
           },
+          rules: [
+            {
+              required: true,
+              message: "文章标签不能为空",
+              trigger: "blur",
+            },
+          ],
         },
         {
           field: "内容",
diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index a5efaaeed..e4f63815f 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -14,7 +14,6 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
-                    :disabled="defaultRole==='1'"
                     placeholder="请输入角色名称"
                     clearable
                     v-model="formData.tagName">
@@ -64,10 +63,7 @@ export default {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
       orgOptions:[],
-      roleId: '',
-      sbid:'',
-      menuList: [],
-      menuListShuju: [],
+      tagId:'',
       formData: {
           tagName: '',
           agencyId:'',
@@ -82,8 +78,6 @@ export default {
         { required: true, message: '应用范围不能为空', trigger: 'blur' }
         ]
       },
-
-      defaultRole: '',
     }
   },
   components: {},
@@ -93,15 +87,25 @@ export default {
 
   methods: {
 
-    async initForm (type, row, defaultRole) {
+    async initForm (type, row) {
       this.startLoading()
       this.formType = type
-      this.formData = {...row}
+      console.log(row);
+      if(type!='add'){
+        this.formData.tagName = row.tagName
+        this.tagId = row.id
+        if(row.agencyList.length>1){
+          this.formData.agencyId = row.agencyList[0].orgIdPath.split(':')[1]
+          this.formData.orgIdPath = row.agencyList[0].orgIdPath.split(':')[0] +':'+ row.agencyList[0].orgIdPath.split(':')[1]
+        }else{
+          this.formData.agencyId = row.agencyList[0].agencyId
+          this.formData.orgIdPath = row.agencyList[0].orgIdPath
+        }
+      }
       this.endLoading()
 
     },
     async getOrgTreeList() {
-      const { user } = this.$store.state
         this.dataListLoading = true
         this.$http
           .post('/gov/org/customeragency/staffinagencylist')
@@ -111,8 +115,6 @@ export default {
             } else {
               console.log('获取查询详情成功', res.data)
               let { agencyList, subAgencyList } = res.data
-              // this.optionsA = res.data
-              // console.log(this.optionsA);
               const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
               this.orgOptions = this.deepTree(_arr)
             }
@@ -135,19 +137,17 @@ export default {
       },
     cascaderClick () {
       let obj = this.$refs["cascaderUnit"].getCheckedNodes()[0].data
-      var arr = []
+      this.formDatam = []
       if (obj) {
-        if (obj.level === "street" && obj.subAgencyList!= null) {
+        if (obj.level === "street") {
               for(let i in obj.subAgencyList){
-                this.formDatam.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.orgIdPath})
+                this.formData.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.subAgencyList[i].orgIdPath})
               }
-              console.log( this.formDatam);
         } else {
-              this.$set(this.formData,'agencyId',obj.agencyId)
-              this.$set(this.formData,'orgIdPath',obj.orgIdPath)
+                this.formDatam.push({'agencyId':obj.agencyId,'orgIdPath':obj.orgIdPath})
         }
       } else {
-        this.formData.agencyId = ''
+        this.formDatam = []
       }
   
       },
@@ -171,27 +171,26 @@ export default {
       let url = ''
       if (this.formType === 'add') {
         url = '/gov/voice/tag/save'
-
       } else {
         url = '/gov/voice/tag/update'
-
       }
-      console.log(this.formData);
-     const { tagName,orgIdPath,agencyId} = this.formData 
+     const { tagName} = this.formData 
      let params = {}
-     if(agencyId &&this.formDatam.length==0){
-        params = {
-          tagName,
-          agencyList:{
-            orgIdPath,
-            agencyId,
-          },
-        }
+   
+     if(this.formType != 'add'){
+      if(this.formDatam.length == 0){
+        this.formDatam.push({'agencyId':this.formData.agencyId,'orgIdPath':this.formData.orgIdPath})
+      }
+         params = {
+                  tagName,
+                  agencyList:this.formDatam,
+                  id:this.tagId
+                 }
      }else{
-        params = {
-          tagName,
-          agencyList:this.formDatam
-        }
+          params = {
+                      tagName,
+                      agencyList:this.formDatam,
+                  }
      }
       const { data, code, msg } = await requestPost(url,params)
       if (code === 0) {
@@ -207,7 +206,6 @@ export default {
         this.btnDisable = false
         this.$message.error(msg)
       }
-      this.formDatam = []
     },
 
     handleCancle () {
@@ -217,9 +215,6 @@ export default {
     },
 
     resetData () {
-
-      this.roleId = ''
-
       this.formData = {
         tagName: '',
       }
@@ -242,17 +237,8 @@ export default {
     }
   },
   computed: {
-    dataRule () {
-      return {
-        
-
-      }
-    },
-
   },
   props: {
-
-
   }
 }
 </script>

From 6e61d053745e1d9f19542d6cd77f544a8f568738 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 10:10:29 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=B0=E5=9D=80,?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  3 +-
 .env.production.sit                           |  3 +-
 .../modules/communityParty/article/drafts.vue |  2 +-
 .../modules/communityParty/article/index.vue  |  2 +-
 src/views/modules/workSys/articleTag/edit.vue | 67 ++++++++++++++-----
 .../modules/workSys/articleTag/index.vue      |  4 +-
 6 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/.env.development b/.env.development
index be04f184b..b9429d7e2 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,7 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://219.146.91.110/api
+#VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
diff --git a/.env.production.sit b/.env.production.sit
index 9edee48dd..abbd978f7 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -1,6 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+#VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://219.146.91.110/api
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
 VUE_APP_CUSTOMER=yantai
\ No newline at end of file
diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue
index 59906c237..606dad2c8 100644
--- a/src/views/modules/communityParty/article/drafts.vue
+++ b/src/views/modules/communityParty/article/drafts.vue
@@ -276,7 +276,7 @@ export default {
           type: "select",
           multiple: true,
           allowCreate: true,
-          optionUrl: "/gov/voice/tag/taglist",
+          optionUrl: "/gov/voice/tag/queryAgencyTag",
           optionUrlParams: {},
           optionList: [],
           optionCook(list) {
diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue
index ea064e288..9226f0d36 100644
--- a/src/views/modules/communityParty/article/index.vue
+++ b/src/views/modules/communityParty/article/index.vue
@@ -472,7 +472,7 @@ export default {
           type: "select",
           multiple: true,
           allowCreate: true,
-          optionUrl: "/gov/voice/tag/taglist",
+          optionUrl: "/gov/voice/tag/queryAgencyTag",
           optionUrlParams: {},
           optionList: [],
           optionCook(list) {
diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index e4f63815f..bd3ed8ee5 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -25,10 +25,11 @@
                           label-width="150px"
                           prop="agencyId"
                           >
+                          <!-- { checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'} -->
               <el-cascader ref="cascaderUnit"
                            v-model="formData.agencyId"
                            :options="orgOptions"
-                           :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
+                           :props="optionProps"
                            clearable 
                            @change="cascaderClick"
                            />
@@ -63,6 +64,14 @@ export default {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
       orgOptions:[],
+      optionProps: {
+        checkStrictly: true,
+        expandTrigger: 'hover',
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+      },
+      agencyIdArray:[],
       tagId:'',
       formData: {
           tagName: '',
@@ -83,6 +92,8 @@ export default {
   components: {},
   async mounted () {
     await this.getOrgTreeList()
+
+
   },
 
   methods: {
@@ -90,6 +101,7 @@ export default {
     async initForm (type, row) {
       this.startLoading()
       this.formType = type
+      
       console.log(row);
       if(type!='add'){
         this.formData.tagName = row.tagName
@@ -107,22 +119,37 @@ export default {
     },
     async getOrgTreeList() {
         this.dataListLoading = true
-        this.$http
-          .post('/gov/org/customeragency/staffinagencylist')
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-              let { agencyList, subAgencyList } = res.data
-              const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
-              this.orgOptions = this.deepTree(_arr)
-            }
-          })
-          .catch(() => {
-            this.dataListLoading = false
-            return this.$message.error('网络错误')
-          })
+        // this.$http
+        //   .post('gov/org/customeragency/agencylist', { customerId: this.customerId})
+        //   .then(({ data: res }) => {
+        //     if (res.code !== 0) {
+        //       return this.$message.error(res.msg)
+        //     } else {
+        //       console.log('获取查询详情成功', res.data)
+        //       let { agencyList, subAgencyList } = res.data
+        //       const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
+        //       this.orgOptions = this.deepTree(_arr)
+        //     }
+        //   })
+        //   .catch(() => {
+        //     this.dataListLoading = false
+        //     return this.$message.error('网络错误')
+        //   })
+        const url = '/gov/org/customeragency/agencylist'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
+
+      let params = {
+        customerId: this.customerId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.options = []
+        this.agencyIdArray.length = []
+        this.orgOptions.push(data)
+
+      } else {
+        this.$message.error(msg)
+      }
         this.dataListLoading = false
     },     
      deepTree (arr) {
@@ -141,7 +168,7 @@ export default {
       if (obj) {
         if (obj.level === "street") {
               for(let i in obj.subAgencyList){
-                this.formData.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.subAgencyList[i].orgIdPath})
+                this.formDatam.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.subAgencyList[i].orgIdPath})
               }
         } else {
                 this.formDatam.push({'agencyId':obj.agencyId,'orgIdPath':obj.orgIdPath})
@@ -239,6 +266,10 @@ export default {
   computed: {
   },
   props: {
+    customerId:{
+      type:String,
+      default:""
+    }
   }
 }
 </script>
diff --git a/src/views/modules/workSys/articleTag/index.vue b/src/views/modules/workSys/articleTag/index.vue
index 811df167b..e672ee7d2 100644
--- a/src/views/modules/workSys/articleTag/index.vue
+++ b/src/views/modules/workSys/articleTag/index.vue
@@ -151,6 +151,7 @@
 			@closed="diaClose"
 		>
 			<edit
+				:customerId="customerId"
 				ref="ref_form"
 				@dialogCancle="diaClose"
 				@dialogOk="addFormOk"
@@ -180,7 +181,7 @@ export default {
 			pageNo: 0,
 			tableLoading: false,
 			isResiUser: true,
-
+			customerId:"",
 			agencyId: "",
 
 			timeRange: [],
@@ -212,6 +213,7 @@ export default {
 		this.agencyId = user.agencyId;
 
 		await this.loadTable();
+		this.customerId = localStorage.getItem("customerId");
 	},
 
 	activated() {

From cfc1986b94f38774ca9bb1d98900fb09a2178adc Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 11:07:31 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=B2=A1=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development    | 2 +-
 .env.production.sit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index b9429d7e2..81ccbbf08 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://219.146.91.110/api
+VUE_APP_API_SERVER =  http://219.146.91.110:30802/api
 #VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
diff --git a/.env.production.sit b/.env.production.sit
index abbd978f7..a725889ac 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -1,7 +1,7 @@
 NODE_ENV=production
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 #VUE_APP_API_SERVER =  http://192.168.1.140/api
-VUE_APP_API_SERVER =  http://219.146.91.110/api
+VUE_APP_API_SERVER =  http://219.146.91.110:30802/api
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
 VUE_APP_CUSTOMER=yantai
\ No newline at end of file

From 57de118b2d93c43789cfde640e51ed1dd5448d85 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 12:19:54 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workSys/emblemManagement/cpts/emblemIfon.vue     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
index d91ff2acc..2de6aea07 100644
--- a/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
+++ b/src/views/modules/workSys/emblemManagement/cpts/emblemIfon.vue
@@ -60,6 +60,11 @@
                </template>
            </el-col>
          </el-row>
+         <el-row type="flex"  >
+             <el-col :span="24" style="display: flex;">
+               <span  class="htgl_info_label">备注:</span> <section style="flex:1">{{emblemObj.remark||'--'}}</section>
+           </el-col>
+         </el-row>
          <el-row>
             <el-button size="small" @click="handleDiaClose"> 取消</el-button>
             <el-button v-show="emblemObj.authResult=='auditing'" @click="handleAudit('no')"> 审核不通过</el-button>

From 7cc756db167e816e6fc4f6759c5d26783a7ba4be Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 16:37:05 +0800
Subject: [PATCH 14/17] bug

---
 src/views/modules/workSys/articleTag/edit.vue | 422 +++++++++---------
 1 file changed, 223 insertions(+), 199 deletions(-)

diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index bd3ed8ee5..7ef2b7397 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -1,277 +1,301 @@
 <template>
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
-
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="rules"
-               :disabled="formType==='detail'"
-               class="form">
-
-        <el-form-item label="分类名称"
-                      prop="tagName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入角色名称"
-                    clearable
-                    v-model="formData.tagName">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="rules"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="分类名称"
+          prop="tagName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_2"
+            placeholder="请输入角色名称"
+            style="width: 260px"
+            clearable
+            v-model="formData.tagName"
+          >
           </el-input>
-
         </el-form-item>
-                          <!-- :prop="'formData.'+'agencyList.' +'agencyId'" -->
-        <el-form-item label="应用范围"
-                          label-width="150px"
-                          prop="agencyId"
-                          >
-                          <!-- { checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'} -->
-              <el-cascader ref="cascaderUnit"
-                           v-model="formData.agencyId"
-                           :options="orgOptions"
-                           :props="optionProps"
-                           clearable 
-                           @change="cascaderClick"
-                           />
-            </el-form-item>
-
+        <!-- :prop="'formData.'+'agencyList.' +'agencyId'" -->
+        <el-form-item
+          label="应用范围"
+          label-width="150px"
+          prop="agencyId"
+          style="display: block"
+        >
+          <!--  -->
+          <el-cascader
+            ref="cascaderUnit"
+            style="width: 260px"
+            v-model="formData.agencyId"
+            :options="orgOptions"
+            :props="{
+              checkStrictly: true,
+              emitPath: false,
+              children: 'subAgencyList',
+              label: 'agencyName',
+              value: 'agencyId',
+            }"
+            clearable
+            @change="cascaderClick"
+          />
+        </el-form-item>
       </el-form>
     </div>
 
     <div class="form_div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'detail'"
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
-
   </div>
 </template>
 
 <script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
 
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost, requestGet } from '@/js/dai/request'
-
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
-   
+  data() {
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
-      orgOptions:[],
-      optionProps: {
-        checkStrictly: true,
-        expandTrigger: 'hover',
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-      },
-      agencyIdArray:[],
-      tagId:'',
+      orgOptions: [],
+      agencyIdArray: [],
+      tagId: "",
       formData: {
-          tagName: '',
-          agencyId:'',
-          orgIdPath:''
+        tagName: "",
+        agencyId: "",
+        orgIdPath: "",
       },
-      formDatam:[],
-      rules:{
+      formDatam: [],
+      rules: {
         tagName: [
-          { required: true, message: '分类名称不能为空', trigger: 'blur' }
+          { required: true, message: "分类名称不能为空", trigger: "blur" },
+        ],
+        agencyId: [
+          { required: true, message: "应用范围不能为空", trigger: "blur" },
         ],
-        agencyId:[
-        { required: true, message: '应用范围不能为空', trigger: 'blur' }
-        ]
       },
-    }
+    };
   },
   components: {},
-  async mounted () {
-    await this.getOrgTreeList()
-
-
+  async mounted() {
+    await this.getOrgTreeList();
   },
 
   methods: {
-
-    async initForm (type, row) {
-      this.startLoading()
-      this.formType = type
-      
+    async initForm(type, row) {
       console.log(row);
-      if(type!='add'){
-        this.formData.tagName = row.tagName
-        this.tagId = row.id
-        if(row.agencyList.length>1){
-          this.formData.agencyId = row.agencyList[0].orgIdPath.split(':')[1]
-          this.formData.orgIdPath = row.agencyList[0].orgIdPath.split(':')[0] +':'+ row.agencyList[0].orgIdPath.split(':')[1]
-        }else{
-          this.formData.agencyId = row.agencyList[0].agencyId
-          this.formData.orgIdPath = row.agencyList[0].orgIdPath
+      this.startLoading();
+      this.formType = type;
+      if (type != "add") {
+        this.formData.tagName = row.tagName;
+        this.tagId = row.id;
+        if (row.agencyList.length > 1) {
+          this.formData.agencyId = row.agencyList[0].pid;
+          if (row.agencyList[0].orgIdPath.split(":").length == 2) {
+            this.formData.orgIdPath = row.agencyList[0].orgIdPath.split(":")[0];
+          } else {
+            this.formData.orgIdPath =
+              row.agencyList[0].orgIdPath.split(":")[0] +
+              ":" +
+              row.agencyList[0].orgIdPath.split(":")[1];
+          }
+        } else if(row.agencyList.length == 0){
+          this.endLoading();
+          this.formData.agencyId = row.agencyList[0].agencyId;
+          this.formData.orgIdPath = row.agencyList[0].orgIdPath;
         }
+      } else {
       }
-      this.endLoading()
-
+      this.endLoading();
     },
     async getOrgTreeList() {
-        this.dataListLoading = true
-        // this.$http
-        //   .post('gov/org/customeragency/agencylist', { customerId: this.customerId})
-        //   .then(({ data: res }) => {
-        //     if (res.code !== 0) {
-        //       return this.$message.error(res.msg)
-        //     } else {
-        //       console.log('获取查询详情成功', res.data)
-        //       let { agencyList, subAgencyList } = res.data
-        //       const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
-        //       this.orgOptions = this.deepTree(_arr)
-        //     }
-        //   })
-        //   .catch(() => {
-        //     this.dataListLoading = false
-        //     return this.$message.error('网络错误')
-        //   })
-        const url = '/gov/org/customeragency/agencylist'
+      this.dataListLoading = true;
+      const url = "/gov/org/customeragency/agencylist";
       // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
 
       let params = {
-        customerId: this.customerId
-      }
-      const { data, code, msg } = await requestPost(url, params)
+        customerId: this.customerId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.options = []
-        this.agencyIdArray.length = []
-        this.orgOptions.push(data)
-
+        this.options = [];
+        this.agencyIdArray.length = [];
+        this.orgOptions.push(data);
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-        this.dataListLoading = false
-    },     
-     deepTree (arr) {
-        if (Array.isArray(arr)) {
-          return arr.map(item => {
-            return {
-              ...item,
-              subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
-            }
-          })
-        }
-      },
-    cascaderClick () {
-      let obj = this.$refs["cascaderUnit"].getCheckedNodes()[0].data
-      this.formDatam = []
+      this.dataListLoading = false;
+    },
+    deepTree(arr) {
+      if (Array.isArray(arr)) {
+        return arr.map((item) => {
+          return {
+            ...item,
+            subAgencyList:
+              (item.subAgencyList.length > 0 &&
+                this.deepTree(item.subAgencyList)) ||
+              null,
+          };
+        });
+      }
+    },
+    cascaderClick() {
+      let obj = this.$refs["cascaderUnit"].getCheckedNodes()[0].data;
+      this.formDatam = [];
       if (obj) {
         if (obj.level === "street") {
-              for(let i in obj.subAgencyList){
-                this.formDatam.push({'agencyId':obj.subAgencyList[i].agencyId,'orgIdPath':obj.subAgencyList[i].orgIdPath})
+          for (let i in obj.subAgencyList) {
+            this.formDatam.push({
+              agencyId: obj.subAgencyList[i].agencyId,
+              orgIdPath: obj.subAgencyList[i].orgIdPath,
+              pid: obj.subAgencyList[i].pid,
+              agencyName: obj.subAgencyList[i].agencyName,
+            });
+          }
+          console.log(this.formDatam);
+        } else if (obj.level === "district") {
+          for (let i in obj.subAgencyList) {
+            if (obj.subAgencyList[i].subAgencyList != null) {
+              for (let j in obj.subAgencyList[i].subAgencyList) {
+                this.formDatam.push({
+                  agencyId:obj.subAgencyList[i].subAgencyList[j].agencyId,
+                  orgIdPath:obj.subAgencyList[i].subAgencyList[j].orgIdPath,
+                  pid: obj.subAgencyList[i].pid,
+                  agencyName: obj.subAgencyList[i].subAgencyList[j].agencyName,
+                });
               }
-        } else {
-                this.formDatam.push({'agencyId':obj.agencyId,'orgIdPath':obj.orgIdPath})
+            }
+          }
+          console.log(this.formDatam);
+        } else if (obj.level === "community") {
+          this.formDatam.push({
+            agencyId: obj.agencyId,
+            orgIdPath: obj.orgIdPath,
+            agencyName: obj.agencyName,
+            pid: obj.pid
+          });
         }
       } else {
-        this.formDatam = []
+        this.formDatam = [];
       }
-  
-      },
-    handleComfirm () {
-      this.$refs['ref_form'].validate((valid, messageObj) => {
+    },
+    handleComfirm() {
+      this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          app.util.validateRule(messageObj);
         } else {
-          this.addNat()
+          this.addNat();
         }
-
-      })
+      });
     },
 
-    async addNat () {
-      this.btnDisable = true
+    async addNat() {
+      this.btnDisable = true;
       setTimeout(() => {
-        this.btnDisable = false
-      }, 5000)
+        this.btnDisable = false;
+      }, 5000);
 
-      let url = ''
-      if (this.formType === 'add') {
-        url = '/gov/voice/tag/save'
+      let url = "";
+      if (this.formType === "add") {
+        url = "/gov/voice/tag/save";
       } else {
-        url = '/gov/voice/tag/update'
+        url = "/gov/voice/tag/update";
       }
-     const { tagName} = this.formData 
-     let params = {}
-   
-     if(this.formType != 'add'){
-      if(this.formDatam.length == 0){
-        this.formDatam.push({'agencyId':this.formData.agencyId,'orgIdPath':this.formData.orgIdPath})
+      const { tagName } = this.formData;
+      let params = {};
+      if (this.formType != "add") {
+        if (this.formDatam.length == 0) {
+          this.formDatam.push({
+            agencyId: this.formData.agencyId,
+            orgIdPath: this.formData.orgIdPath,
+          });
+        }
+        params = {
+          tagName,
+          agencyList: this.formDatam,
+          id: this.tagId,
+        };
+      } else {
+        if (this.formDatam.length == 0) {
+          this.formDatam.push({
+            agencyId: this.formData.agencyId,
+            orgIdPath: this.formData.orgIdPath,
+          });
+        }
+        params = {
+          tagName,
+          agencyList: this.formDatam,
+        };
       }
-         params = {
-                  tagName,
-                  agencyList:this.formDatam,
-                  id:this.tagId
-                 }
-     }else{
-          params = {
-                      tagName,
-                      agencyList:this.formDatam,
-                  }
-     }
-      const { data, code, msg } = await requestPost(url,params)
+      console.log(params);
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.$emit("dialogOk");
+        this.btnDisable = false;
       } else {
-        this.btnDisable = false
-        this.$message.error(msg)
+        this.btnDisable = false;
+        this.$message.error(msg);
       }
     },
 
-    handleCancle () {
-      this.resetData()
-      this.$emit('dialogCancle')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
     },
 
-    resetData () {
+    resetData() {
       this.formData = {
-        tagName: '',
-      }
-      this.$refs['ref_form'].resetFields()
+        tagName: "",
+      };
+      this.$refs["ref_form"].resetFields();
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
-  },
-  computed: {
+    },
   },
+  computed: {},
   props: {
-    customerId:{
-      type:String,
-      default:""
-    }
-  }
-}
+    customerId: {
+      type: String,
+      default: "",
+    },
+  },
+};
 </script>
 
 

From 05adafd9e85432609ead0f2cc7e018e118019923 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 16:54:57 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/articleTag/edit.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index 7ef2b7397..c2bf1c85f 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -117,8 +117,9 @@ export default {
               ":" +
               row.agencyList[0].orgIdPath.split(":")[1];
           }
-        } else if(row.agencyList.length == 0){
+        } else if(row.agencyList.length == 1){
           this.endLoading();
+          console.log('走到这了吗');
           this.formData.agencyId = row.agencyList[0].agencyId;
           this.formData.orgIdPath = row.agencyList[0].orgIdPath;
         }

From 1869377bf2eca622ecb03224d67c9b7426749943 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 16:59:59 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E5=86=8D=E5=8A=A0=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/articleTag/edit.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index c2bf1c85f..3dfd76d76 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -119,9 +119,10 @@ export default {
           }
         } else if(row.agencyList.length == 1){
           this.endLoading();
-          console.log('走到这了吗');
           this.formData.agencyId = row.agencyList[0].agencyId;
           this.formData.orgIdPath = row.agencyList[0].orgIdPath;
+        }else{
+          return
         }
       } else {
       }

From f389a01fee6f92a489671344e01ef448947f74fa Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 9 Mar 2023 22:47:45 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/articleTag/edit.vue | 113 +++++++-----------
 1 file changed, 41 insertions(+), 72 deletions(-)

diff --git a/src/views/modules/workSys/articleTag/edit.vue b/src/views/modules/workSys/articleTag/edit.vue
index 3dfd76d76..25f49d911 100644
--- a/src/views/modules/workSys/articleTag/edit.vue
+++ b/src/views/modules/workSys/articleTag/edit.vue
@@ -24,7 +24,6 @@
           >
           </el-input>
         </el-form-item>
-        <!-- :prop="'formData.'+'agencyList.' +'agencyId'" -->
         <el-form-item
           label="应用范围"
           label-width="150px"
@@ -34,18 +33,18 @@
           <!--  -->
           <el-cascader
             ref="cascaderUnit"
-            style="width: 260px"
+            style="width: 260px;"
             v-model="formData.agencyId"
             :options="orgOptions"
+            collapse-tags
             :props="{
-              checkStrictly: true,
+              multiple: true,
               emitPath: false,
               children: 'subAgencyList',
               label: 'agencyName',
               value: 'agencyId',
             }"
             clearable
-            @change="cascaderClick"
           />
         </el-form-item>
       </el-form>
@@ -54,7 +53,6 @@
     <div class="form_div_btn">
       <el-button size="small" @click="handleCancle">取 消</el-button>
       <el-button
-        v-if="formType != 'detail'"
         size="small"
         type="primary"
         :disabled="btnDisable"
@@ -68,7 +66,7 @@
 <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
-
+import nextTick from "dai-js/tools/nextTick";
 let loading; // 加载动画
 export default {
   data() {
@@ -76,11 +74,12 @@ export default {
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
       orgOptions: [],
-      agencyIdArray: [],
       tagId: "",
+      sarr: [],
+      targetObj: {},
       formData: {
         tagName: "",
-        agencyId: "",
+        agencyId: [],
         orgIdPath: "",
       },
       formDatam: [],
@@ -105,24 +104,17 @@ export default {
       this.startLoading();
       this.formType = type;
       if (type != "add") {
+        console.log(this.formData);
         this.formData.tagName = row.tagName;
         this.tagId = row.id;
-        if (row.agencyList.length > 1) {
-          this.formData.agencyId = row.agencyList[0].pid;
-          if (row.agencyList[0].orgIdPath.split(":").length == 2) {
-            this.formData.orgIdPath = row.agencyList[0].orgIdPath.split(":")[0];
-          } else {
-            this.formData.orgIdPath =
-              row.agencyList[0].orgIdPath.split(":")[0] +
-              ":" +
-              row.agencyList[0].orgIdPath.split(":")[1];
+        this.formData.agencyId = [];
+
+        if (row.agencyList.length >= 1) {
+          for (let i in row.agencyList) {
+            this.formData.agencyId.push(row.agencyList[i].agencyId);
           }
-        } else if(row.agencyList.length == 1){
+        } else {
           this.endLoading();
-          this.formData.agencyId = row.agencyList[0].agencyId;
-          this.formData.orgIdPath = row.agencyList[0].orgIdPath;
-        }else{
-          return
         }
       } else {
       }
@@ -139,64 +131,26 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.options = [];
-        this.agencyIdArray.length = [];
         this.orgOptions.push(data);
       } else {
         this.$message.error(msg);
       }
       this.dataListLoading = false;
     },
-    deepTree(arr) {
-      if (Array.isArray(arr)) {
-        return arr.map((item) => {
-          return {
-            ...item,
-            subAgencyList:
-              (item.subAgencyList.length > 0 &&
-                this.deepTree(item.subAgencyList)) ||
-              null,
-          };
-        });
-      }
-    },
-    cascaderClick() {
-      let obj = this.$refs["cascaderUnit"].getCheckedNodes()[0].data;
-      this.formDatam = [];
-      if (obj) {
-        if (obj.level === "street") {
-          for (let i in obj.subAgencyList) {
-            this.formDatam.push({
-              agencyId: obj.subAgencyList[i].agencyId,
-              orgIdPath: obj.subAgencyList[i].orgIdPath,
-              pid: obj.subAgencyList[i].pid,
-              agencyName: obj.subAgencyList[i].agencyName,
-            });
-          }
-          console.log(this.formDatam);
-        } else if (obj.level === "district") {
-          for (let i in obj.subAgencyList) {
-            if (obj.subAgencyList[i].subAgencyList != null) {
-              for (let j in obj.subAgencyList[i].subAgencyList) {
-                this.formDatam.push({
-                  agencyId:obj.subAgencyList[i].subAgencyList[j].agencyId,
-                  orgIdPath:obj.subAgencyList[i].subAgencyList[j].orgIdPath,
-                  pid: obj.subAgencyList[i].pid,
-                  agencyName: obj.subAgencyList[i].subAgencyList[j].agencyName,
-                });
-              }
-            }
+
+
+    getLastItem(list, vals, key) {
+      let LIST = list || [];
+      for (let item of LIST) {
+        // console.log(item[key]);
+        for (let i of vals) {
+          if (item[key] === i) {
+            this.sarr.push(item);
+            break;
+          } else {
+            this.getLastItem(item.subAgencyList, vals, key);
           }
-          console.log(this.formDatam);
-        } else if (obj.level === "community") {
-          this.formDatam.push({
-            agencyId: obj.agencyId,
-            orgIdPath: obj.orgIdPath,
-            agencyName: obj.agencyName,
-            pid: obj.pid
-          });
         }
-      } else {
-        this.formDatam = [];
       }
     },
     handleComfirm() {
@@ -210,6 +164,21 @@ export default {
     },
 
     async addNat() {
+      this.newArr = [];
+      this.formDatam = [];
+      const map = new Map();
+      this.getLastItem(this.orgOptions, this.formData.agencyId, "agencyId");
+      this.newArr = this.sarr.filter(
+        (v) => !map.has(v.agencyId) && map.set(v.agencyId, 1)
+      );
+      for (let i in this.newArr) {
+        this.formDatam.push({
+          agencyId: this.newArr[i].agencyId,
+          orgIdPath: this.newArr[i].orgIdPath,
+          pid: this.newArr[i].pid,
+          agencyName: this.newArr[i].agencyName,
+        });
+      }
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;