From 3dfb22e8b4d9d6f33fe181e3e1ddb42a05314b35 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Sep 2021 16:38:07 +0800
Subject: [PATCH] 派遣人员查询修改，通知公告附近上传修改，保安员上传附件刷新，出资人，管理人，设备附件上传修改
---
src/api/system/user.js | 3 +
src/views/resource/uploadNotice.vue | 3 -
src/views/securityGuard/securityGuard.vue | 4 +-
src/views/resource/uploadPolicyRelease.vue | 3 -
src/views/securityUnitChild/index.vue | 12 +++---
src/views/resource/uploadNotification.vue | 3 -
src/views/dispatch/dispatchChildoperable.vue | 4 +-
src/views/securityEquipment/equipments.vue | 38 +++++++++++++-----
8 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 097f4ed..0c21d46 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -14,12 +14,13 @@
}
-export const getListByDeptId = (deptId) => {
+export const getListByDeptId = (deptId, status) => {
return request({
url: '/api/blade-user/page-security-units',
method: 'get',
params: {
deptId,
+ status
}
})
}
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 72bad92..175a1aa 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -138,7 +138,7 @@
value: "id",
},
// dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
dicData: [],
rules: [
{
@@ -534,7 +534,7 @@
);
dispatcherUnitIdColumn.dicData = res.data.data;
});
- getListByDeptId(that.userInfo.dept_id).then((res) => {
+ getListByDeptId(that.userInfo.dept_id,1).then((res) => {
const userIdsColumn = that.findObject(this.option1.column, "userIds");
userIdsColumn.dicData = res.data.data;
});
diff --git a/src/views/resource/uploadNotice.vue b/src/views/resource/uploadNotice.vue
index ba64a2a..84d884e 100644
--- a/src/views/resource/uploadNotice.vue
+++ b/src/views/resource/uploadNotice.vue
@@ -23,7 +23,6 @@
type="primary"
size="small"
plain
- v-if="permission.attach_upload"
icon="el-icon-upload2"
@click="handleUpload"
>上 传
@@ -33,7 +32,6 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.attach_delete"
@click="handleDelete"
>删 除
</el-button>
@@ -43,7 +41,6 @@
type="text"
icon="el-icon-download"
size="small"
- v-if="permission.attach_download"
@click="handleDownload(scope.row)"
>下载
</el-button>
diff --git a/src/views/resource/uploadNotification.vue b/src/views/resource/uploadNotification.vue
index 80036ba..a0b3460 100644
--- a/src/views/resource/uploadNotification.vue
+++ b/src/views/resource/uploadNotification.vue
@@ -23,7 +23,6 @@
type="primary"
size="small"
plain
- v-if="permission.attach_upload"
icon="el-icon-upload2"
@click="handleUpload"
>上 传
@@ -33,7 +32,6 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.attach_delete"
@click="handleDelete"
>删 除
</el-button>
@@ -43,7 +41,6 @@
type="text"
icon="el-icon-download"
size="small"
- v-if="permission.attach_download"
@click="handleDownload(scope.row)"
>下载
</el-button>
diff --git a/src/views/resource/uploadPolicyRelease.vue b/src/views/resource/uploadPolicyRelease.vue
index 9f99ab2..ad976c2 100644
--- a/src/views/resource/uploadPolicyRelease.vue
+++ b/src/views/resource/uploadPolicyRelease.vue
@@ -23,7 +23,6 @@
type="primary"
size="small"
plain
- v-if="permission.attach_upload"
icon="el-icon-upload2"
@click="handleUpload"
>上 传
@@ -33,7 +32,6 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.attach_delete"
@click="handleDelete"
>删 除
</el-button>
@@ -43,7 +41,6 @@
type="text"
icon="el-icon-download"
size="small"
- v-if="permission.attach_download"
@click="handleDownload(scope.row)"
>下载
</el-button>
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 1452fe0..1d7800b 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -114,7 +114,7 @@
align: "center",
selection: true,
column: column,
- labelWidth:110,
+ labelWidth: 110,
},
};
},
@@ -263,17 +263,33 @@
// console.log(params.deptId);
if (this.fromDeptId != undefined) {
params["deptId"] = this.fromDeptId;
- this.option.column[4].search = false;
- this.option.column[6].search = false;
- this.option.column[6].hide = true;
- this.option.column[6].addDisplay = false;
- this.option.column[6].editDisplay = false;
+ for (let k in this.option.column) {
+ if (this.option.column[k].prop == "deptId") {
+ this.option.column[k].search = false;
+ this.option.column[k].hide = true;
+ this.option.column[k].addDisplay = false;
+ this.option.column[k].editDisplay = false;
+ }
+ }
+ // this.option.column[4]. = false;
+ // this.option.column[6].search = false;
+ // this.option.column[6].hide = true;
+ // this.option.column[6].addDisplay = false;
+ // this.option.column[6].editDisplay = false;
} else {
- this.option.column[4].search = true;
- this.option.column[6].search = true;
- this.option.column[6].hide = false;
- this.option.column[6].addDisplay = true;
- this.option.column[6].editDisplay = true;
+ for (let k in this.option.column) {
+ if (this.option.column[k].prop == "deptId") {
+ this.option.column[k].search = true;
+ this.option.column[k].hide = false;
+ this.option.column[k].addDisplay = true;
+ this.option.column[k].editDisplay = true;
+ }
+ }
+ // this.option.column[4].search = true;
+ // this.option.column[6].search = true;
+ // this.option.column[6].hide = false;
+ // this.option.column[6].addDisplay = true;
+ // this.option.column[6].editDisplay = true;
}
getdata(
page.currentPage,
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 0a53084..e6f6f0f 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -904,7 +904,7 @@
uploadAfter1(res, done, loading, column) {
window.console.log(column);
this.excelBox1 = false;
- // this.refreshChange();
+ this.refreshChange();
done();
},
handleTemplate1() {
@@ -916,7 +916,7 @@
uploadAfter2(res, done, loading, column) {
window.console.log(column);
this.excelBox2 = false;
- // this.refreshChange();
+ this.refreshChange();
done();
},
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index d58ac7d..58e1696 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -303,7 +303,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/car/import-examSubject",
+ action: "/api/shareholder/import-share",
},
{
label: "模板下载",
@@ -331,7 +331,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/examSubjectChoices/import-examSubject",
+ action: "/api/member/import-member",
},
{
label: "模板下载",
@@ -521,11 +521,11 @@
uploadAfter(res, done, loading, column) {
window.console.log(column);
this.excelBox = false;
- this.refreshChange();
+ this.refreshChange1();
done();
},
handleTemplate() {
- window.open(`/api/car/export-template`);
+ window.open(`/api/shareholder/export-template`);
},
handleImport1() {
@@ -535,11 +535,11 @@
uploadAfter1(res, done, loading, column) {
window.console.log(column);
this.excelBox1 = false;
- // this.refreshChange();
+ this.refreshChange2();
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template`);
+ window.open(`/api/member/export-template`);
},
handleChangeTABS(column) {
--
Gitblit v1.9.3