From cb81eef3d9aabe280e506fc7971c539542cf13f7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 19 Aug 2021 15:12:01 +0800
Subject: [PATCH] 冲突
---
public/securityPrint.html | 14 +
src/views/workreport/data.js | 4
src/views/workreport/workreport.vue | 2
src/views/securityGuard/securityGuard.vue | 154 ++++++++++--------
public/papers.html | 23 ++
src/views/exam/papers.vue | 5
src/views/securityGuard/data.js | 2
src/views/desk/notice.vue | 16 +
public/papersApply.html | 142 ++++++++++-------
src/styles/element-ui.scss | 50 ++----
src/views/applydetailed/index.vue | 2
src/views/companyApply/index.vue | 10
12 files changed, 245 insertions(+), 179 deletions(-)
diff --git a/public/papers.html b/public/papers.html
index 46276e4..7e08c18 100644
--- a/public/papers.html
+++ b/public/papers.html
@@ -12,10 +12,27 @@
justify-content: center;
flex-direction: column;
}
+ /* .print-header {
+ width: 100%;
+ text-align: center;
+ } */
+
+ .print {
+ position: absolute;
+ left: 47%;
+ top: 58%;
+ width: 7%;
+ height: 30px;
+ border: 0px;
+ border-radius: 6px;
+ color: #fff;
+ background-color: #1D5CE4;
+ letter-spacing: 4px;
+ }
.user-info-table {
margin-top: 30px;
- width: 60%;
+ width: 90%;
height: 60%;
border: 1px solid #000;
background-color: #fff;
@@ -51,8 +68,8 @@
<body>
<div>
- <div>
- <button onclick="preview(1)">打印</button>
+ <div class="print-header">
+ <button onclick="preview(1)" class="print">打印</button>
</div>
<!--startprint-->
<div id="table">
diff --git a/public/papersApply.html b/public/papersApply.html
index 1e7229d..9607aa9 100644
--- a/public/papersApply.html
+++ b/public/papersApply.html
@@ -13,6 +13,25 @@
flex-direction: column;
}
+ .excelPrint {
+ width: 100%;
+ text-align: center;
+ margin-top: 50px;
+ }
+
+ .print {
+ /* position: absolute;
+ left: 47%;
+ top: 58%; */
+ width: 7%;
+ height: 30px;
+ border: 0px;
+ border-radius: 6px;
+ color: #fff;
+ background-color: #1D5CE4;
+ letter-spacing: 4px;
+ }
+
.user-info-table {
margin-top: 30px;
width: 90%;
@@ -54,35 +73,35 @@
<body>
<div>
- <div>
- <button onclick="preview(1)">打印</button>
- </div>
+
<!--startprint-->
<div id="table">
<!-- <span class="title">准考证信息</span>
<table class="user-info-table" border="1px" align="center" cellspacing="0" cellpadding="10">
- </table>
- </div> -->
- <!--endprint-->
-
+ </table> -->
</div>
- <script>
- var getData = function(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
- var r = window.location.search.substr(1).match(reg);
- if (r != null) return unescape(r[2]);
- return null;
- };
- var id = JSON.parse(getData("data")).examId;
- var name = JSON.parse(getData("data")).name;
- // console.log(JSON.parse(getData("data")), 111);
+ <!--endprint-->
+ <div class="excelPrint">
+ <button onclick="preview(1)" class="print">打印</button>
+ </div>
+ </div>
+ <script>
+ var getData = function(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ };
+ var id = JSON.parse(getData("data")).examId;
+ var name = JSON.parse(getData("data")).name;
+ // console.log(JSON.parse(getData("data")), 111);
- axios.get('http://223.82.109.183:2080/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
- // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
- var data = res.data;
- var list = data.applyList;
- console.log(data, 123);
- var str = `<span class="title">${data.examName}</span>
+ axios.get('http://223.82.109.183:2080/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ var data = res.data;
+ var list = data.applyList;
+ console.log(data, 123);
+ var str = `<span class="title">${data.examName}</span>
<table class="user-info-table" border="1px" align="center" cellspacing="0" cellpadding="10">
<tr class="user-info-tr">
<td width="80px">姓名</td>
@@ -94,8 +113,8 @@
<td width="200px">报名时间</td>
</tr>`
- for (var k in list) {
- str += `
+ for (var k in list) {
+ str += `
<tr class="user-info-tr">
<td>${list[k].realName}</td>
<td>${list[k].sex==1?"男":(data.sex==2?"女":"")}</td>
@@ -106,52 +125,51 @@
<td>${list[k].applyTime}</td>
</tr>
`
- }
+ }
- // <tr class="user-info-tr">
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // </tr>
+ // <tr class="user-info-tr">
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // </tr>
- str += ` <tr class="user-info-tr">
+ str += ` <tr class="user-info-tr">
<td>总人数</td>
<td colspan="6">${data.num}人</td>
</tr>
- </table>
- </div>`
+ </table>`
- var dom = $('#table');
- dom.empty();
- dom.append(str);
- })
+ var dom = $('#table');
+ dom.empty();
+ dom.append(str);
+ })
- function preview(oper) {
- if (oper < 10) {
- bdhtml = window.document.body.innerHTML;
- // 打印开始的标志
- sprnstr = "<!--startprint-->";
- // 打印结束的标志
- eprnstr = "<!--endprint-->";
- // 从打印开始的位置截取到末尾
- prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
- // 从开始截取到打印结束的位置
- prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
- // 替换html
- window.document.body.innerHTML = prnhtml;
- // 打印
- window.print();
- window.document.body.innerHTML = bdhtml;
- } else {
- window.print();
- }
+ function preview(oper) {
+ if (oper < 10) {
+ bdhtml = window.document.body.innerHTML;
+ // 打印开始的标志
+ sprnstr = "<!--startprint-->";
+ // 打印结束的标志
+ eprnstr = "<!--endprint-->";
+ // 从打印开始的位置截取到末尾
+ prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
+ // 从开始截取到打印结束的位置
+ prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
+ // 替换html
+ window.document.body.innerHTML = prnhtml;
+ // 打印
+ window.print();
+ window.document.body.innerHTML = bdhtml;
+ } else {
+ window.print();
}
- </script>
+ }
+ </script>
</body>
</html>
\ No newline at end of file
diff --git a/public/securityPrint.html b/public/securityPrint.html
index adb33b4..91078ae 100644
--- a/public/securityPrint.html
+++ b/public/securityPrint.html
@@ -12,13 +12,19 @@
/* display: flex; */
align-items: center;
justify-content: center;
- background-color: #666666;
}
.print {
position: absolute;
- left: 20px;
- top: 10px;
+ left: 43%;
+ top: 60%;
+ width: 7%;
+ height: 36px;
+ border-radius: 9px;
+ background-color: #1D5CE4;
+ border: 0px;
+ color: #fff;
+ letter-spacing: 4px;
}
#table {
@@ -185,6 +191,8 @@
</div>
+
+
</div>
<script>
var getData = function(name) {
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 099c829..48afb80 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -20,7 +20,7 @@
}
.el-menu--display,
-.el-menu--display + .el-submenu__icon-arrow {
+.el-menu--display+.el-submenu__icon-arrow {
display: none;
}
@@ -49,17 +49,17 @@
.el-dropdown-menu__item--divided:before,
.el-menu,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
background-color: transparent;
}
.el-dropdown-menu__item--divided:before,
.el-menu,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
-.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
-.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
+.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
+.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
background-color: transparent !important;
}
@@ -89,7 +89,6 @@
// box-shadow: none !important;
// height: 40px;
// }
-
// //取消顶部搜索栏
// .user .el-card.is-never-shadow.avue-crud__search {
// position: relative !important;
@@ -99,116 +98,93 @@
// box-shadow: none !important;
// height: auto;
// }
-
// .desk .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 360px) !important;
// }
-
// .securityGuard .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 300px) !important;
// left: 120px;
// }
-
// .securityUnit .el-card.is-never-shadow.avue-crud__search {
// left: 200px;
// width: calc(100% - 380px) !important;
// }
-
// .equipments .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px;
// }
-
// .dispatch .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px;
// }
-
// .dispatchChildoperable .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 280px) !important;
// left: 90px;
// }
-
// .workreply .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px !important;
// }
-
// .recruitmentManagement .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 120px !important;
// }
-
// .hasButOne .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 300px) !important;
// left: 120px !important;
// }
-
// .hasButTwo .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 380px) !important;
// left: 200px !important;
// }
-
// .desk1 .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 410px) !important;
// left: 200px !important;
// }
-
// .topmenu .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 220px !important;
// }
-
// .hasButThree .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 510px) !important;
// left: 310px !important;
// }
-
// .morpheus-box .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 590px) !important;
// left: 420px !important;
// }
-
// .morpheus-box-exam .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 20px !important;
// }
-
// .morpheus-box-paper .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 220px !important;
// }
-
// .morpheus-box-score .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 150px !important;
// }
-
// .morpheus-box-apply-exam .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 120px !important;
// }
-
// .desk .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 280px !important;
// }
-
// .morpheus-box-apply-exam-1 .el-card.is-never-shadow.avue-crud__search {
// width: calc(100% - 390px) !important;
// left: 220px !important;
// }
-
// .avue-form {
// position: relative;
// top: -10px;
// }
-
// //顶部按钮栏
// .avue-crud__menu {
// height: 60px;
// }
-
// //顶部按钮
// .avue-crud .avue-crud__left .el-button,
// .avue-crud .avue-crud__right .el-button,
@@ -225,6 +201,7 @@
.avue-form__menu--center .el-button {
float: left;
}
+
.avue-form__menu--center .el-button:nth-child(1) {
margin-left: 30px;
}
@@ -262,8 +239,17 @@
}
//top 导航 按钮
-.el-menu--horizontal > .el-menu-item.is-active,
+.el-menu--horizontal>.el-menu-item.is-active,
.avue-top,
.el-dropdown {
color: #fff !important;
}
+
+.securityPapers {
+ width: 100%;
+ height: 100%;
+ background-color: #f4f6f8;
+ position: absolute;
+ top: 40px;
+ left: 0;
+}
\ No newline at end of file
diff --git a/src/views/applydetailed/index.vue b/src/views/applydetailed/index.vue
index 58bfe60..519cd73 100644
--- a/src/views/applydetailed/index.vue
+++ b/src/views/applydetailed/index.vue
@@ -54,7 +54,7 @@
:type="type"
size="small"
icon="el-icon-receiving"
- :disabled="row.applyStatus == 4"
+ :disabled="row.candidateNo==''"
@click="handlePrint(row)"
>准考证打印
</el-button>
diff --git a/src/views/companyApply/index.vue b/src/views/companyApply/index.vue
index 50aac5c..bb62a01 100644
--- a/src/views/companyApply/index.vue
+++ b/src/views/companyApply/index.vue
@@ -53,7 +53,7 @@
:type="type"
size="small"
icon="el-icon-folder-checked"
- v-if="row.isApply == 2 || row.isApply == -1"
+ v-if="row.isApply == 2 || row.isApply == -1 || row.isApply == 3"
@click="questionBankRowSave(row)"
>报名
</el-button>
@@ -124,6 +124,10 @@
{
label: "已取消",
value: 2,
+ },
+ {
+ label: "考试结束",
+ value: 3,
},
],
};
@@ -379,8 +383,8 @@
value: 2,
},
{
- label: "",
- value: -1,
+ label: "考试结束",
+ value: 3,
},
],
dataType: "number",
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index ab9c6f0..606ee40 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -55,6 +55,7 @@
import { getListPage, remove, update, add, getNotice } from "@/api/desk/notice";
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
+import { mapState } from 'vuex';
export default {
data() {
@@ -223,8 +224,13 @@
});
return ids.join(",");
},
+ ...mapState({
+ userInfo: state => state.user.userInfo
+ })
},
- mounted() {},
+ mounted() {
+ this.getDeptInfo(this.userInfo.dept_id);
+ },
methods: {
//获取当前用户部门信息
getDeptInfo(deptId) {
@@ -254,7 +260,11 @@
});
},
rowSave(row, done, loading) {
- row.category = 1;
+ if (this.deptCategory) {
+ row.category = 1;
+ }else{
+ row.category = 2;
+ }
row.deptId = this.deptId;
add(row).then(
() => {
@@ -384,7 +394,7 @@
const { releaseTimeRange } = this.query;
// if (that.deptCategory) {
- params["deptId"] = this.deptId;
+ // params["deptId"] = this.deptId;
params["jurisdiction"] = this.jurisdiction;
// }
let values = {
diff --git a/src/views/exam/papers.vue b/src/views/exam/papers.vue
index 5bdc6c1..a5310da 100644
--- a/src/views/exam/papers.vue
+++ b/src/views/exam/papers.vue
@@ -1,6 +1,9 @@
<template>
- <!-- <iframe src="http://124.71.113.22/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe> -->
+<div class="securityPapers">
+
<iframe :src="url" style="width: 100%; height: 100%" frameborder="0"></iframe>
+</div>
+ <!-- <iframe src="http://124.71.113.22/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe> -->
</template>
<script>
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index d50ba09..cff9cc9 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -529,7 +529,7 @@
// prop: "deptName",
prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
value: "id",
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 3881882..097d2b8 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -107,7 +107,7 @@
>导出
</el-button>
</template>
-
+
<template slot-scope="{ type, size, row }" slot="menu">
<!-- <el-button
style="display:none"
@@ -125,12 +125,12 @@
>离职登记
</el-button>
</template>
-
+
<template slot-scope="{ row }" slot="sex">
<el-tag v-if="row.sex == 1">男</el-tag>
<el-tag v-if="row.sex == 2">女</el-tag>
</template>
-
+
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -161,7 +161,7 @@
:props="props"
>
</el-tree>
-
+
<span slot="footer" class="dialog-footer">
<el-button @click="roleBox = false">取 消</el-button>
<el-button type="primary" @click="submitRole">确 定</el-button>
@@ -238,7 +238,7 @@
</el-col>
</el-row>
</template>
-
+
<script>
import {
getUser,
@@ -262,7 +262,7 @@
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";
import { mapState } from "vuex";
-
+
export default {
data() {
const validatePass = (rule, value, callback) => {
@@ -284,6 +284,7 @@
return {
securityid: "",
excelBox1: false,
+ isSecurity: false,
excelForm1: {},
excelOption1: {
submitBtn: false,
@@ -310,7 +311,7 @@
},
],
},
-
+
form: {},
search: {},
roleBox: false,
@@ -377,7 +378,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- border: true, //liu
+ border: false,
stripe: true,
align: "center",
index: true,
@@ -399,8 +400,8 @@
label: "所属保安公司",
prop: "deptId",
type: "tree",
- dicUrl:
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
// dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
props: {
label: "title",
@@ -485,12 +486,12 @@
row: true,
prop: "myPicture",
},
-
+
// {
// label: "编号",
// prop: "code",
// },
-
+
{
label: "所属辖区",
prop: "jurisdiction",
@@ -680,7 +681,7 @@
{
prop: "UserPractitionersInfo",
type: "dynamic",
- border: true, //liu
+ border: false,
span: 24,
children: {
align: "left",
@@ -925,28 +926,18 @@
userInfo: (state) => state.user.userInfo,
}),
},
+ beforeCreate() {
+
+ },
+ created() {
+
+ },
mounted() {
// this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
if (!website.tenantMode) {
- this.initData(website.tenantId);
- }
-
- //获取当前登录人员的角色信息
- var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
- var roleAlias = res.data.data.roleAlias;
- if (
- roleAlias == "保安公司管理员" ||
- roleAlias == "保安" ||
- roleAlias == "未持证保安"
- ) {
- const column = this.findObject(this.option.column, "deptId");
- column.search = false;
+ this.initData(website.tenantId);
}
- });
- });
},
methods: {
handleImport1() {
@@ -961,7 +952,7 @@
handleTemplate1() {
window.open(`/api/examSubjectChoices/export-template`);
},
-
+
//行点击事件
rowClick(row) {
this.$router.push({
@@ -975,18 +966,18 @@
this.onLoad(this.page);
},
initData(tenantId) {
- getRoleTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
- });
+ // getRoleTree(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "roleId");
+ // column.dicData = res.data.data;
+ // });
// getDeptTree(tenantId).then((res) => {
// const column = this.findObject(this.option.group, "deptId");
// column.dicData = res.data.data;
// });
- getPostList(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
- });
+ // getPostList(tenantId).then((res) => {
+ // const column = this.findObject(this.option.group, "postId");
+ // column.dicData = res.data.data;
+ // });
},
submitRole() {
const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -1289,40 +1280,65 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- let values = {
- ...params,
- };
- values = {
- ...params,
- roleAlias: "111",
- ...this.query,
- };
-
+ var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
roleIds.forEach((roleId) => {
getRoleDetail(roleId).then((res) => {
var roleAlias = res.data.data.roleAlias;
- if (roleAlias == "保安公司管理员") {
- values["deptId"] = this.userInfo.dept_id;
+ if (
+ roleAlias == "保安公司管理员" ||
+ roleAlias == "保安" ||
+ roleAlias == "未持证保安"
+ ) {
+ //去除保安公司查询
+ const column = that.findObject(that.option.column, "deptId");
+ column.search = false;
+ const deptColumn = that.findObject(that.option.group, "deptId");
+ deptColumn.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ //禁止编辑
+ deptColumn.disabled = true;
+ deptColumn.value = that.userInfo.dept_id;
+ that.isSecurity = true;
+ //如果是保安公司管理员
+ params["deptId"] = that.userInfo.dept_id;
+ }else if (roleAlias == "公安管理员") {
+ params["jurisdiction"] = that.userInfo.jurisdiction;
+ var columnDept = that.findObject(that.option.column, "deptId");
+ columnDept.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
+ var ColumnDeptUpdate = that.findObject(that.option.group, "deptId");
+ ColumnDeptUpdate.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
+ }else{
+ var columnDept1 = that.findObject(that.option.column, "deptId");
+ columnDept1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ var ColumnDeptUpdate1 = that.findObject(that.option.group, "deptId");
+ ColumnDeptUpdate1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
+
+ let values = {
+ ...params,
+ };
+ values = {
+ ...params,
+ roleAlias: "111",
+ ...that.query,
+ };
+
+ that.loading = true;
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data;
+ that.page.total = data.total;
+ that.data = data.records;
+ that.loading = false;
+ that.selectionClear();
+ });
});
});
-
- if (this.userInfo.role_id == "1414840172333842433") {
- console.log("是公安add jurisdiction");
- values["jurisdiction"] = this.userInfo.jurisdiction;
- }
- this.loading = true;
- getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(
- (res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- }
- );
+
+
+
},
platformRowUpdate(row, index, done, loading) {
updatePlatform(row.id, row.userType, row.userExt).then(
@@ -1392,17 +1408,17 @@
},
};
</script>
-
+
<style>
.box {
height: 800px;
}
-
+
.el-scrollbar {
height: 100%;
}
-
+
.box .el-scrollbar__wrap {
overflow: scroll;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/workreport/data.js b/src/views/workreport/data.js
index 89a9a8f..f6c663c 100644
--- a/src/views/workreport/data.js
+++ b/src/views/workreport/data.js
@@ -22,6 +22,7 @@
prop: "category",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
+ cascaderItem: ["receivedIds"],
props: {
label: "dictValue",
value: "dictKey"
@@ -76,7 +77,8 @@
prop: "receivedIds",
span: 24,
type: "tree",
- // dicUrl: "/api/blade-system/dept/lazy-tree-user",
+ // lazy: true,
+ dicUrl: "/api/blade-system/dept/lazy-tree-user-app?type={{key}}",
hide: true,
props: {
label: "title",
diff --git a/src/views/workreport/workreport.vue b/src/views/workreport/workreport.vue
index 94deb65..c4906c2 100644
--- a/src/views/workreport/workreport.vue
+++ b/src/views/workreport/workreport.vue
@@ -80,6 +80,8 @@
searchMenuSpan: 6,
border: true, //liu
addBtnText: "发起",
+ saveBtnText: "发起",
+ addTitle: "发起",
index: true,
stripe: true,
viewBtn: true,
--
Gitblit v1.9.3