From a1de52de8f32d9d9cf981a48ddfc1d92dd2d635f Mon Sep 17 00:00:00 2001
From: zhangtq <2452618307@qq.com>
Date: Mon, 3 Mar 2025 09:06:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E6=A0=91=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/getdata.js               |  40 +++-
 src/views/auditFlow/editFlow.vue | 314 +++++++++++++++++++++++++++++++
 src/views/auditFlow/index.vue    | 207 ++++++++++++++++++++
 3 files changed, 559 insertions(+), 2 deletions(-)
 create mode 100644 src/views/auditFlow/editFlow.vue
 create mode 100644 src/views/auditFlow/index.vue

diff --git a/src/api/getdata.js b/src/api/getdata.js
index f95b2f86..b65f4c7d 100644
--- a/src/api/getdata.js
+++ b/src/api/getdata.js
@@ -3042,7 +3042,7 @@ export function addGreenCar (data) {
     method: 'post',
     data
   })
-} 
+}
 export function delGreenCar (data) {
   return request({
     url: '/greenH5/greenWebmodul/rest/greenCar/delGreenCar',
@@ -3386,7 +3386,7 @@ export function exportByDoc (data) {
   })
 }
 
-// 
+//
 export function getCardsByUser (data) {
   return request({
     url: '/greenH5/greenWebmodul/rest/greenCard/getCardsByUser',
@@ -3836,3 +3836,39 @@ export function importFile (data) {
     data
   })
 }
+
+//获取审核流列表
+export function getAuditFlowList (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/getAuditFlowList',
+    method: 'post',
+    data
+  })
+}
+
+//查询审核流详情
+export function getAuditFlowDetails (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/getAuditFlowDetails',
+    method: 'post',
+    data
+  })
+}
+//查询审核流详情
+export function getFlowRoleList (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/getFlowRoleList',
+    method: 'post',
+    data
+  })
+}
+
+
+//新增审核流
+export function addAuditFlow (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/addAuditFlow',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/auditFlow/editFlow.vue b/src/views/auditFlow/editFlow.vue
new file mode 100644
index 00000000..a17fbb06
--- /dev/null
+++ b/src/views/auditFlow/editFlow.vue
@@ -0,0 +1,314 @@
+<template>
+  <div class="container">
+
+    <div class="left">
+      <el-timeline>
+        <el-timeline-item
+          v-for="(activity, index) in roleData"
+          :key="index"
+          :icon="activity.icon"
+          :type="activity.type"
+          :color="activity.color"
+          :size="activity.size"
+          :timestamp="activity.timestamp"
+        >
+          <span @click="handleCheckedChange(activity)" class="activity-label">{{ activity.LABEL }}</span>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
+    <div class="right">
+      <div class="right-content">
+        <div class="start-end">开始</div>
+        <div class="arrow-container">
+          <div class="line"></div>
+          <div class="arrow-down"></div>
+        </div>
+
+        <div v-for="(item, index) in auditPersonArr" :key="index" class="audit-item">
+          <div class="audit-label">
+            <span>{{ item.LABEL }}</span>
+            <i class="el-icon-error remove-icon" @click="removeItem(item, index)"></i>
+          </div>
+          <div class="arrow-container">
+            <div class="line"></div>
+            <div class="arrow-down"></div>
+          </div>
+        </div>
+        <div class="start-end">结束</div>
+      </div>
+    </div>
+    <div class="button-container">
+      <el-button type="primary" @click="submit()">提交</el-button>
+      <el-button type="info" @click="cancel()">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {addAuditFlow, getAuditFlowDetails, getFlowRoleList} from "@/api/getdata";
+
+export default {
+  props: ["row"],
+  data() {
+    return {
+      auditPersonArr: [],
+      roleData: [],
+
+    };
+  },
+  mounted() {
+    this.getDetails();
+  },
+  created() {
+    this.getRoleList();
+  },
+  methods: {
+    handleCheckedChange(data) {
+      if (!data.isSpecial && this.auditPersonArr.filter(item => item.LABEL === data.LABEL).length > 0) {
+        this.$message({
+          type: 'warning',
+          message: '已经添加过了当前角色',
+        });
+        return;
+      }
+      if (data.isSpecial && this.auditPersonArr.filter(item => item.isSpecial).length >= 2) {
+        this.$message({
+          type: 'warning',
+          message: '特殊角色最多添加两个',
+        });
+        return;
+      }
+      this.auditPersonArr.push(data);
+    },
+    removeItem(item, index) {
+      this.auditPersonArr.splice(index, 1);
+      if (item.isSpecial) {
+        this.auditPersonArr.forEach(i => {
+          if (i.isSpecial) {
+            i.num = 1;
+          }
+        });
+      }
+    },
+    getRoleList() {
+      this.roleData = [];
+      getFlowRoleList({}).then(res => {
+        console.log("res===>" + JSON.stringify(res));
+        if (res.returnCode === "1") {
+          //对roleData进行赋值
+          res.returnData.forEach(item => {
+            let obj = {
+              ...item,
+              isSpecial: false
+            };
+            if (item.LABEL === '房管经办人') {
+              obj.isSpecial = true;
+            }
+            this.roleData.push(obj);
+          });
+        } else {
+          this.$message({
+            type: 'warning',
+            message: res.returnMsg,
+          });
+        }
+      });
+      console.log(this.roleData);
+    },
+    getDetails() {
+      let params = {
+        id: this.row.ID
+      };
+      getAuditFlowDetails(params).then(res => {
+        if (res.returnCode === "1") {
+          //对auditPersonArr 进行赋值
+          res.returnData.forEach(item => {
+            if (item.LABEL === '房管经办人') {
+              this.auditPersonArr.push({
+                ...item,
+                isSpecial: true,
+              });
+            } else {
+              this.auditPersonArr.push({
+                ...item,
+                isSpecial: false,
+              });
+            }
+          });
+        } else {
+          this.$message({
+            type: 'warning',
+            message: res.returnMsg,
+          });
+        }
+      });
+    },
+    submit() {
+      let specialCount = 0; // 用于计数特殊角色的出现次数
+      let arr = [];
+      this.auditPersonArr.forEach(item => {
+        if (item.isSpecial) {
+          if (specialCount === 0) {
+            let obj = {
+              ...item,
+              checkOperate: "1",
+              checkType: "1"
+            };
+            arr.push(obj);
+          } else if (specialCount === 1) {
+            let obj = {
+              ...item,
+              checkOperate: "2",
+              checkType: "1"
+            };
+            arr.push(obj);
+          }
+          specialCount++; // 每次遇到特殊角色时递增
+        } else {
+          let obj = {
+            ...item,
+            checkOperate: "0",
+            checkType: "2"
+          };
+          arr.push(obj);
+        }
+      });
+      let param = {
+        arr: arr,
+        num: arr.length,
+        id: this.row.ID
+      };
+      //新增审核流配置
+      addAuditFlow(param).then(res => {
+        if (res.returnCode === "1") {
+          this.$message({
+            message: "配置成功",
+            type: "success"
+          });
+          this.$emit("cancel");
+        } else {
+          this.$message({
+            message: res.returnMsg,
+            type: "error"
+          });
+        }
+
+      });
+    },
+    cancel() {
+      this.$emit("cancel");
+    },
+  },
+};
+</script>
+
+<style>
+.container {
+  display: flex;
+  flex-direction: row;
+}
+
+.left {
+  width: 400px;
+  padding: 10px;
+  height: 65vh;
+  overflow: auto;
+}
+
+.right {
+  width: 380px;
+  height: 65vh;
+  overflow: auto;
+}
+
+.right-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  max-height: 70vh;
+}
+
+.start-end {
+  border-radius: 10px;
+  padding: 15px;
+  border: 1.5px solid black;
+  width: 50%;
+  text-align: center;
+  font-weight: bold;
+}
+
+.audit-item {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.audit-label {
+  border-radius: 10px;
+  padding: 15px;
+  border: 1.5px solid black;
+  width: 50%;
+  text-align: center;
+  font-weight: bold;
+  position: relative;
+}
+
+.remove-icon {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+}
+
+/* Arrow styles */
+.arrow-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.line {
+  width: 2px;
+  height: 40px;
+  background-color: black;
+}
+
+.arrow-down {
+  width: 0;
+  height: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 10px solid black;
+}
+
+/* Scrollbar styles */
+::-webkit-scrollbar {
+  width: 6px;
+  height: 12px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 10px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #a6a6a6;
+  border-radius: 10px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #737373;
+}
+
+/* 按钮容器样式 */
+.button-container {
+  position: absolute;
+  bottom: 20px;
+  right: 20px;
+}
+
+.activity-label{
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/auditFlow/index.vue b/src/views/auditFlow/index.vue
new file mode 100644
index 00000000..747e223f
--- /dev/null
+++ b/src/views/auditFlow/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <el-container class="container">
+    <el-header class="filter-container">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <!-- <el-row> -->
+        <div>
+          <el-form-item label="关键字" class="form-flex">
+            <el-input @input="e => formInline.keyWord = validForbid(e)" :value="formInline.keyWord" maxlength="20"
+                      placeholder="请输入关键字"
+            ></el-input>
+          </el-form-item>
+          <el-button type="primary" @click="onSubmit()">查询</el-button>
+          <el-button type="primary" @click="onRest()">重置</el-button>
+          <!--          <el-button type="primary" @click="edit({})">添加</el-button>-->
+        </div>
+        <!-- </el-row> -->
+      </el-form>
+    </el-header>
+    <!-- max-height="500" -->
+    <div class="table">
+      <el-table :element-loading-text="loadingMsg" v-loading="loading" :data="tableData" stripe border
+                style="width:100%"
+      >
+        <el-table-column fixed prop="num" label="序号" min-width="50" width="50" align="center">
+          <template slot-scope="scope">{{
+              page.sizePage * ((page.limit == 0 ? 1 : page.limit) - 1) + (scope.$index + 1)
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="real_name" label="流程名称" min-width="150" align="center">
+          <template slot-scope="scope">
+            <el-popover placement="top-start" title width="200" trigger="hover" :content="scope.row.NAME">
+              <div class="maxsize" slot="reference">{{ scope.row.NAME }}</div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column prop="dept_name_url" label="流程总数" min-width="50" align="center">
+          <template slot-scope="scope">
+            <el-popover placement="top-start" title width="50" trigger="hover" :content="(scope.row.NUM)">
+              <div class="maxsize" slot="reference">{{ scope.row.NUM }}</div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column prop="org_name" label="流程类型" min-width="200" align="center">
+          <template slot-scope="scope">
+            <el-popover placement="top-start" title width="200" trigger="hover" :content="(scope.row.TYPENAME)">
+              <div class="maxsize" slot="reference">{{ scope.row.TYPENAME }}</div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="200" align="center">
+          <template slot-scope="{row}">
+            <el-button type="primary" size="mini" @click="edit(row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 分页 -->
+    <div class="foot-total">
+      <Paging @currentChanges="currentChanges" :pageNum="parseInt(page.limit)" :size="parseInt(page.sizePage)"
+              :total="parseInt(page.total)"
+      />
+    </div>
+    <el-dialog
+      class="l-dialog"
+      title="审批流配置"
+      width="980px"
+      :visible.sync="isflag"
+      v-if="isflag"
+      :destroy-on-close="true"
+    >
+      <EditFlow
+        :style="{width: '980px',maxHeight: '65vh',overflow: 'auto'}"
+        :row="row"
+        v-on:cancel="closeDialog"
+      />
+    </el-dialog>
+
+  </el-container>
+</template>
+<script>
+import Paging from "@/views/Public/paging.vue";
+import {getAuditFlowList} from "@/api/getdata";
+import EditFlow from "@/views/auditFlow/editFlow.vue";
+
+export default {
+  data() {
+    return {
+      loading: false, //初始化loading
+      isShowTree: false,
+      loadingMsg: "",
+      row: {},
+      validation: false,
+      food_name: "",
+      formInline: {
+        keyWord: "",
+      },
+      page: {
+        limit: 0 /** 当前点击*/,
+        sizePage: 10 /** 当前多少页*/,
+        total: 0 /**总数 */
+      },
+      tableData: [
+        {
+          id: 1,
+          name: "流程1",
+          num: 10,
+          type: "流程类型1"
+        }
+      ],
+      isflag: false /**用于设置弹窗 */,
+      num: 3
+    };
+  },
+  components: {
+    Paging,
+    EditFlow
+  },
+  mounted() {
+    this.getlist();
+  },
+  methods: {
+    createLoad() {
+      this.loading = true;
+      this.loadingMsg = "加载中...";
+    },
+    clearLoad() {
+      this.loading = false;
+      this.loadingMsg = "";
+    },
+    // 分页
+    currentChanges(val) {
+      this.createLoad();
+      this.page.limit = val;
+      this.getlist();
+    },
+
+    getlist() {
+      let Content = {
+        pageSize: 10, //数量  必传
+        pageIndex: this.page.limit == "0" ? 1 : this.page.limit, //页码  必传
+        keyWord: this.formInline.keyWord,
+      };
+      getAuditFlowList(Content)
+        .then(res => {
+          console.log("res===>" + JSON.stringify(res));
+          if (res.returnCode == "1") {
+            this.clearLoad();
+            this.tableData = res.returnData.data;
+            this.page.total = res.returnData.total;
+            this.page.limit = res.returnData.currentPage;
+            this.tableData.id = res.returnData.data.id;
+          } else {
+            this.$message({
+              message: res.returnMsg,
+              type: "warning"
+            });
+            setTimeout(() => {
+              this.clearLoad();
+            }, 300);
+          }
+        })
+        .catch(err => {
+          setTimeout(() => {
+            this.clearLoad();
+          }, 300);
+        });
+    },
+    onSubmit() {
+      this.page.limit = 1;
+      this.createLoad();
+      this.getlist();
+    },
+    onRest() {
+      this.formInline.keyWord = "";
+      this.page.limit = 1;
+      this.createLoad();
+      this.getlist();
+    },
+    edit(data) {
+      this.row = Object.assign({}, data);
+      this.isflag = true;
+    },
+    closeDialog() {
+      this.isflag = false;
+      this.row = {};
+      this.getlist();
+    },
+  }
+};
+</script>
+<style>
+.filter-container {
+  width: 100%;
+  height: auto !important;
+  /* flex-basis: 120px; */
+}
+
+
+.table {
+  /* width:  */
+  background: #eeeeee;
+  padding: 10px;
+  margin: 10px;
+}
+
+</style>

From 1b1e7bbb6562fe395ff6ef8107231bc9fc89b9cd Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 6 Mar 2025 19:15:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/getdata.js                            |  64 +++-
 .../auditRoleManagement/index.vue             | 361 ++++++++++++++++++
 .../auditRoleManagement/popup/bandUser.vue    |  99 +++++
 .../auditRoleManagement/popup/ticketpop.vue   |  92 +++++
 4 files changed, 615 insertions(+), 1 deletion(-)
 create mode 100644 src/views/jurisdiction/auditRoleManagement/index.vue
 create mode 100644 src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue
 create mode 100644 src/views/jurisdiction/auditRoleManagement/popup/ticketpop.vue

diff --git a/src/api/getdata.js b/src/api/getdata.js
index b65f4c7d..3b31a2c6 100644
--- a/src/api/getdata.js
+++ b/src/api/getdata.js
@@ -3870,5 +3870,67 @@ export function addAuditFlow (data) {
     url: '/greenH5/greenWebmodul/rest/greenRole/addAuditFlow',
     method: 'post',
     data
-  })
+  });
 }
+
+
+// 审批角色列表
+export function auditRoleList (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/getHouseCheckRoleList',
+    method: 'post',
+    data
+  });
+}
+
+// 获取用户
+export function getCheckUserInfo (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/getCheckUserInfo',
+    method: 'post',
+    data
+  });
+}
+// 新增审批角色
+export function addHouseCheckRole (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/addHouseCheckRole',
+    method: 'post',
+    data
+  });
+}
+// 编辑审批角色
+export function editAuditRole (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/modify',
+    method: 'post',
+    data
+  });
+}
+
+// 编辑审批角色
+export function delAuditRole (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/delete',
+    method: 'post',
+    data
+  });
+}
+
+// 审批角色详情
+export function getAuditRoleDetail (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/getCheckUserByRole',
+    method: 'post',
+    data
+  });
+}
+
+// 审批角色-绑定用户
+export function bandAuditUser (data) {
+  return request({
+    url: '/greenH5/greenWebmodul/rest/greenRole/addPersonByRole',
+    method: 'post',
+    data
+  });
+}
\ No newline at end of file
diff --git a/src/views/jurisdiction/auditRoleManagement/index.vue b/src/views/jurisdiction/auditRoleManagement/index.vue
new file mode 100644
index 00000000..c366434b
--- /dev/null
+++ b/src/views/jurisdiction/auditRoleManagement/index.vue
@@ -0,0 +1,361 @@
+<template>
+  <el-container class="container">
+    <el-header class="filter-container">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <div>
+          <el-form-item label="角色名称" class="form-flex">
+            <el-input @input="e => formInline.roleName = validForbid(e)" :value="formInline.roleName" maxlength="20"
+              placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit()">查询</el-button>
+            <el-button type="primary" @click="newAdd()">新增</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-header>
+    <div class="table">
+      <el-table :element-loading-text="loadingMsg" v-loading="loading" :data="tableData" stripe border
+        style="width:100%">
+        <el-table-column fixed prop="num" label="序号" min-width="50" width="50">
+          <template slot-scope="scope">{{ page.sizePage * ((page.limit == 0 ? 1 : page.limit) - 1) + (scope.$index + 1)
+          }}</template>
+        </el-table-column>
+        <el-table-column prop="roleName" label="角色名称" min-width="150">
+          <template slot-scope="scope">
+            <el-popover placement="top-start" title width="200" trigger="hover" :content="scope.row.roleName">
+              <div class="maxsize" slot="reference">{{ scope.row.roleName }}</div>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" min-width="100" align="center">
+          <template slot-scope="{row}">
+            <el-button type="primary" size="mini" @click="editUser(row)">编辑</el-button>
+            <el-button type="primary" size="mini" @click="bandUser(row)">绑定用户</el-button>
+            <el-button type="danger" size="mini" @click="del(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 分页 -->
+    <div class="foot-total">
+      <Paging @currentChanges="currentChanges" :pageNum="parseInt(page.limit)" :size="parseInt(page.sizePage)"
+        :total="parseInt(page.total)" />
+    </div>
+
+    <!-- 编辑 -->
+    <Ticketopop v-if="isflag" :btn="num" :title="title" @closeDialog="closeDialog" @submit="submit" :dataForm="row"
+      :disabled="loading" :width="600" />
+    <!-- 绑定用户 -->
+    <BandUser v-if="isflag2" :btn="num" :title="title2" @closeDialog2="closeDialog2" @submit2="submit2" :dataForm="row2"
+      :usersList="usersList" :disabled="loading" :width="600" />
+  </el-container>
+</template>
+<script>
+import Paging from "@/views/Public/paging.vue";
+import { auditRoleList, getCheckUserInfo, addHouseCheckRole, editAuditRole, delAuditRole, bandAuditUser, getAuditRoleDetail } from "@/api/getdata";
+import Ticketopop from "./popup/ticketpop.vue";
+import BandUser from "./popup/bandUser.vue";
+export default {
+  data() {
+    return {
+      loading: false, //初始化loading
+      loadingMsg: "",
+      row: {},
+      row2: {},
+      title: '',
+      dataList: [],
+      usersList: [],
+      validation: false,
+      formInline: {
+        roleName: "",
+        roleCode: "",
+        roleType: ""
+      },
+      page: {
+        limit: 0 /** 当前点击*/,
+        sizePage: 10 /** 当前多少页*/,
+        total: 0 /**总数 */
+      },
+      tableData: [],
+      isflag: false /**用于设置弹窗 */,
+      isflag2: false /**用于绑定用户设置弹窗 */,
+      num: 3
+    };
+  },
+  components: {
+    Paging,
+    Ticketopop,
+    BandUser
+  },
+  mounted() {
+    this.createLoad();
+    if (this.$route.params.index) {
+      this.currentChanges(this.$route.params.index);
+    } else {
+      this.getlist();
+    }
+    this.getUserList();
+  },
+  methods: {
+    createLoad() {
+      this.loading = true;
+      this.loadingMsg = "加载中...";
+    },
+    clearLoad() {
+      this.loading = false;
+      this.loadingMsg = "";
+    },
+    // 分页
+    currentChanges(val) {
+      this.createLoad();
+      this.page.limit = val;
+      this.getlist();
+    },
+    getlist() {
+      this.createLoad();
+      let Content = {
+        roleName: this.formInline.roleName,
+        currentPage: this.page.limit == 0 ? 1 : this.page.limit,
+        pageIndex: this.page.limit == 0 ? 1 : this.page.limit,
+        pageSize: 10,
+      };
+      auditRoleList(Content)
+        .then(res => {
+          if (res.returnCode == "1") {
+
+            this.clearLoad();
+            this.tableData = res.returnData.data;
+            this.page.total = res.returnData.total;
+            this.page.limit = res.returnData.currentPage;
+            this.tableData.id = res.returnData.data.id;
+          } else {
+            this.$message({
+              message: res.returnMsg,
+              type: "warning"
+            });
+            setTimeout(() => {
+              this.clearLoad();
+            }, 300);
+          }
+        })
+        .catch(err => {
+          console.log(err);
+          setTimeout(() => {
+            this.clearLoad();
+          }, 300);
+        });
+    },
+    // 查询用户
+    getUserList() {
+      getCheckUserInfo({})
+        .then(res => {
+          console.log(res);
+          if (res.returnCode == '1') {
+            this.usersList = res.returnData;
+          }
+        }).catch(err => {
+          console.log(err);
+        });
+    },
+    // 审批角色绑定用户详情
+    getAuditRole(id) {
+      getAuditRoleDetail({ roleId: id })
+        .then(res => {
+          if (res.returnCode == '1') {
+            let userObjArr = res.returnData;
+            let userIdArr = [];
+            for (let i = 0; i < userObjArr.length; i++) {
+              userIdArr.push(userObjArr[i].USER_ID);
+            }
+            this.row2.userId = userIdArr;
+            this.title2 = '绑定用户';
+            this.isflag2 = true;
+            // return res.returnData;
+          }
+        }).catch(err => {
+          console.log(err);
+        });
+    },
+    onSubmit() {
+      console.log(this.formInline);
+      this.page.limit = 1;
+      this.createLoad();
+      this.getlist();
+    },
+    newAdd() {
+      var data = {
+        id: 0,
+        roleCode: '',
+        roleName: '',
+        roleType: '3',
+        isDeleted: 'N'
+      };
+      this.row = data;
+      this.title = '新增角色';
+      this.isflag = true;
+    },
+    del(id) {
+      this.$alert("确认进行删除嘛？", "确认", {
+        confirmButtonText: "确定",
+        callback: action => {
+          if (action == "confirm") {
+            this.createLoad();
+            let Content = {
+              id: id
+            };
+            delAuditRole(Content)
+              .then(res => {
+                if (res.returnCode == "1") {
+                  this.$message({
+                    message: res.returnMsg,
+                    type: "success"
+                  });
+                  this.getlist();
+                  this.dialogTableVisible = false;
+                } else {
+                  this.$message({
+                    message: res.returnMsg,
+                    type: "warning"
+                  });
+                  setTimeout(() => {
+                    this.clearLoad();
+                  }, 300);
+                }
+              })
+              .catch(err => {
+                console.log(err);
+                setTimeout(() => {
+                  this.clearLoad();
+                }, 300);
+              });
+          }
+        }
+      });
+    },
+    editUser(data) {
+      // this.row = data;      
+      this.row = Object.assign({}, data);
+      this.title = '修改角色';
+      this.isflag = true;
+    },
+    bandUser(data) {
+      data.userId = [];
+      this.row2 = Object.assign({}, data);
+      this.getAuditRole(data.id);
+    },
+    closeDialog() {
+      this.isflag = false;
+      this.row = {};
+    },
+    closeDialog2() {
+      this.isflag2 = false;
+      this.row2 = {};
+
+    },
+    // 提交
+    submit(e) {
+      this.createLoad();
+      if (e.id == 0) {
+        e.creator = 'admin';
+        e.modifier = 'admin';
+        e.id = null;
+        addHouseCheckRole(e)
+          .then(res => {
+            if (res.returnCode == '1') {
+              this.$message({
+                message: res.returnMsg,
+                type: "success"
+              });
+              this.isflag = false;
+              this.getlist();
+              this.row = {};
+            } else {
+              this.clearLoad();
+              this.$message({
+                message: res.returnMsg,
+                type: "warning"
+              });
+            }
+          })
+          .catch(err => {
+            this.clearLoad();
+          });
+      } else {
+        e.modifier = 'admin';
+        editAuditRole(e)
+          .then(res => {
+            if (res.returnCode == '1') {
+              this.$message({
+                message: res.returnMsg,
+                type: "success"
+              });
+              this.isflag = false;
+              this.getlist();
+              this.row = {};
+            } else {
+              this.clearLoad();
+              this.$message({
+                message: res.returnMsg,
+                type: "warning"
+              });
+            }
+          })
+          .catch(err => {
+            this.clearLoad();
+          });
+      }
+    },
+    submit2(e) {
+      this.createLoad();
+      bandAuditUser(e)
+        .then(res => {
+          if (res.returnCode == '1') {
+            this.$message({
+              message: res.returnMsg,
+              type: "success"
+            });
+            this.isflag2 = false;
+            this.getlist();
+            this.row2 = {};
+          } else {
+            this.clearLoad();
+            this.$message({
+              message: res.returnMsg,
+              type: "warning"
+            });
+          }
+        }).catch(err => {
+          this.clearLoad();
+        });
+    }
+  }
+};
+</script>
+<style>
+.filter-container {
+  width: 100%;
+  height: auto !important;
+  /* flex-basis: 120px; */
+}
+
+.block {
+  display: inline-block;
+}
+
+.secondrow {
+  margin-top: 16px;
+}
+
+.table {
+  /* width:  */
+  background: #eeeeee;
+  padding: 10px;
+  margin: 10px;
+}
+
+.upload-demo {
+  margin: 0 -21px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue b/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue
new file mode 100644
index 00000000..9150e0f5
--- /dev/null
+++ b/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue
@@ -0,0 +1,99 @@
+<template>
+  <!-- 小型弹窗，用于完成，删除，保存等操作 -->
+  <el-dialog class="l-dialog" :class="lDialog" :title="title" :visible.sync="dialogVisible" :showClose="false"
+    :closeOnClickModal="false">
+    <div>
+      <el-form :model="dataForm" ref="ruleForm" label-width="110px">
+        <el-form-item label="角色名称">
+          <el-input style="width:100%" v-model="dataForm.roleName" :disabled="true" maxlength="20"></el-input>
+        </el-form-item>
+        <el-form-item label="绑定用户">
+          <el-select style="width:100%" v-model="dataForm.userId" multiple filterable default-first-option placeholder="请选择用户">
+            <el-option v-for="item in usersList" :key="item.userId" :label="`${item.roleName} - ${item.userName}`" :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button class="clear-btn" @click="handleClose" :disabled="disabled">取消</el-button>
+      <el-button type="primary" class="search-btn" :disabled="disabled" @click="submitForm()">确认</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  props: ["width", "dataForm", "title", "disabled", "usersList"],
+  data() {
+    return {
+      roles: [],
+      lDialog: this.width > 500 ? "w700" : "w500",
+      dialogVisible: true,
+      isDisabled: true,
+      options: [],
+      roleIds: [],
+      menuIds: [],
+      menuList: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      roleTypes: ['WEB角色', 'APP角色'],
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    /*关闭弹窗 */
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit("closeDialog2");
+      setTimeout(() => {
+        this.dialogVisible = true;
+      });
+    },
+    /**确认弹窗 */
+    sureBtnClick() {
+      this.dialogVisible = false;
+      this.$emit("closeDialog2");
+      setTimeout(() => {
+        this.dialogVisible = true;
+      });
+    },
+    /**验证 */
+    submitForm() {
+      let data = JSON.parse(JSON.stringify(this.dataForm));
+      data.userId = data.userId.join(',');
+      data.roleId = data.id;
+      this.$emit('submit2', data);
+    }
+  }
+};
+</script>
+<style lang="scss">
+.w700 .el-dialog {
+  width: 700px;
+}
+
+.w500 .el-dialog {
+  width: 500px;
+}
+
+.w500 .el-dialog__header,
+.w700 .el-dialog__header {
+  background: #eeeeee;
+  text-align: center;
+
+  .el-dialog__title {
+    font-size: 16px;
+  }
+}
+
+.yxq .el-range-separator {
+  margin-right: 7px !important;
+}
+
+.el-date-editor--daterange.el-input__inner {
+  width: 260px;
+}
+</style>
diff --git a/src/views/jurisdiction/auditRoleManagement/popup/ticketpop.vue b/src/views/jurisdiction/auditRoleManagement/popup/ticketpop.vue
new file mode 100644
index 00000000..9904c220
--- /dev/null
+++ b/src/views/jurisdiction/auditRoleManagement/popup/ticketpop.vue
@@ -0,0 +1,92 @@
+<template>
+  <!-- 小型弹窗，用于完成，删除，保存等操作 -->
+  <el-dialog class="l-dialog" :class="lDialog" :title="title" :visible.sync="dialogVisible" :showClose="false"
+    :closeOnClickModal="false">
+    <div>
+      <el-form :model="dataForm" ref="ruleForm" label-width="110px">
+        <el-form-item label="角色名称">
+          <el-input style="width:100%" v-model="dataForm.roleName" maxlength="20"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button class="clear-btn" @click="handleClose" :disabled="disabled">取消</el-button>
+      <el-button type="primary" class="search-btn" :disabled="disabled" @click="submitForm()">确认</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  props: ["width", "dataForm", "title", "disabled", "usersList"],
+  data() {
+    return {
+      roles: [],
+      lDialog: this.width > 500 ? "w700" : "w500",
+      dialogVisible: true,
+      isDisabled: true,
+      options: [],
+      roleIds: [],
+      menuIds: [],
+      menuList: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      roleTypes: ['WEB角色', 'APP角色'],
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    /*关闭弹窗 */
+    handleClose() {
+      this.dialogVisible = false;
+      this.$emit("closeDialog");
+      setTimeout(() => {
+        this.dialogVisible = true;
+      });
+    },
+    /**确认弹窗 */
+    sureBtnClick() {
+      this.dialogVisible = false;
+      this.$emit("closeDialog");
+      setTimeout(() => {
+        this.dialogVisible = true;
+      });
+    },
+    /**验证 */
+    submitForm(formName) {
+      let data = this.dataForm;
+      data.roleType = '3';
+      this.$emit('submit', data);
+    }
+  }
+};
+</script>
+<style lang="scss">
+.w700 .el-dialog {
+  width: 700px;
+}
+
+.w500 .el-dialog {
+  width: 500px;
+}
+
+.w500 .el-dialog__header,
+.w700 .el-dialog__header {
+  background: #eeeeee;
+  text-align: center;
+
+  .el-dialog__title {
+    font-size: 16px;
+  }
+}
+
+.yxq .el-range-separator {
+  margin-right: 7px !important;
+}
+
+.el-date-editor--daterange.el-input__inner {
+  width: 260px;
+}
+</style>

From 87712228b5d2f434e0e64f7bc647c351d2dc7743 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 6 Mar 2025 19:15:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/getdata.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/getdata.js b/src/api/getdata.js
index 3b31a2c6..5a0f43dd 100644
--- a/src/api/getdata.js
+++ b/src/api/getdata.js
@@ -3902,7 +3902,7 @@ export function addHouseCheckRole (data) {
 // 编辑审批角色
 export function editAuditRole (data) {
   return request({
-    url: '/greenH5/greenWebmodul/rest/greenRole/modify',
+    url: '/greenH5/greenWebmodul/rest/greenRole/updateHouseCheckUserInfo',
     method: 'post',
     data
   });

From d45d5c9676417aacfffeaa8d5fa989f91496a9b6 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 7 Mar 2025 14:35:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auditRoleManagement/index.vue             |  2 +-
 .../auditRoleManagement/popup/bandUser.vue    | 35 +++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/jurisdiction/auditRoleManagement/index.vue b/src/views/jurisdiction/auditRoleManagement/index.vue
index c366434b..bfb1337e 100644
--- a/src/views/jurisdiction/auditRoleManagement/index.vue
+++ b/src/views/jurisdiction/auditRoleManagement/index.vue
@@ -81,7 +81,7 @@ export default {
       tableData: [],
       isflag: false /**用于设置弹窗 */,
       isflag2: false /**用于绑定用户设置弹窗 */,
-      num: 3
+      num: 3,
     };
   },
   components: {
diff --git a/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue b/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue
index 9150e0f5..a8eaa221 100644
--- a/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue
+++ b/src/views/jurisdiction/auditRoleManagement/popup/bandUser.vue
@@ -3,13 +3,15 @@
   <el-dialog class="l-dialog" :class="lDialog" :title="title" :visible.sync="dialogVisible" :showClose="false"
     :closeOnClickModal="false">
     <div>
-      <el-form :model="dataForm" ref="ruleForm" label-width="110px">
+      <el-form :model="dataForm" :rules="rules" ref="ruleForm"  label-width="110px">
         <el-form-item label="角色名称">
           <el-input style="width:100%" v-model="dataForm.roleName" :disabled="true" maxlength="20"></el-input>
         </el-form-item>
-        <el-form-item label="绑定用户">
-          <el-select style="width:100%" v-model="dataForm.userId" multiple filterable default-first-option placeholder="请选择用户">
-            <el-option v-for="item in usersList" :key="item.userId" :label="`${item.roleName} - ${item.userName}`" :value="item.userId">
+        <el-form-item label="绑定用户" prop="userId">
+          <el-select style="width:100%" v-model="dataForm.userId" multiple filterable default-first-option
+            placeholder="请选择用户">
+            <el-option v-for="item in usersList" :key="item.userId" :label="`${item.roleName} - ${item.userName}`"
+              :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -17,7 +19,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button class="clear-btn" @click="handleClose" :disabled="disabled">取消</el-button>
-      <el-button type="primary" class="search-btn" :disabled="disabled" @click="submitForm()">确认</el-button>
+      <el-button type="primary" class="search-btn" :disabled="disabled" @click="submitForm('ruleForm')">确认</el-button>
     </span>
   </el-dialog>
 </template>
@@ -38,7 +40,11 @@ export default {
         children: 'children',
         label: 'name'
       },
-      roleTypes: ['WEB角色', 'APP角色'],
+      rules: {
+        userId: [
+          { required: true, message: '至少选择一个用户', trigger: 'change'}
+        ],
+      },
     };
   },
   mounted() {
@@ -61,11 +67,18 @@ export default {
       });
     },
     /**验证 */
-    submitForm() {
-      let data = JSON.parse(JSON.stringify(this.dataForm));
-      data.userId = data.userId.join(',');
-      data.roleId = data.id;
-      this.$emit('submit2', data);
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          let data = JSON.parse(JSON.stringify(this.dataForm));
+          data.userId = data.userId.join(',');
+          data.roleId = data.id;
+          this.$emit('submit2', data);
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     }
   }
 };