From 12e1b685a3307c4fa289d2c478e1aa0b2b5dc096 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sun, 15 Jun 2025 14:35:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ma/person-setting.js | 28 + .../material/ma/person-setting/index.vue | 857 ++++++++++++++++++ 2 files changed, 885 insertions(+) create mode 100644 src/api/ma/person-setting.js create mode 100644 src/views/material/ma/person-setting/index.vue diff --git a/src/api/ma/person-setting.js b/src/api/ma/person-setting.js new file mode 100644 index 00000000..755355f3 --- /dev/null +++ b/src/api/ma/person-setting.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 获取人员配置列表 +export function getPersonSettingListApi(query) { + return request({ + url: '/material/ma_type_repair/getTypeManageList', + method: 'get', + params: query + }) +} + +// 人员管理--绑定 +export function bindPersonSettingApi(data) { + return request({ + url: '/material/ma_type_repair/addTypeManage', + method: 'post', + data: data + }) +} + +// 人员管理--解绑 +export function unBindPersonSettingApi(data) { + return request({ + url: '/material/ma_type_repair/unbindTypeManage', + method: 'post', + data: data + }) +} diff --git a/src/views/material/ma/person-setting/index.vue b/src/views/material/ma/person-setting/index.vue new file mode 100644 index 00000000..34e679e9 --- /dev/null +++ b/src/views/material/ma/person-setting/index.vue @@ -0,0 +1,857 @@ + + + + From ca70bb495916706dd41289ebb49b5753e4b72561 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sun, 15 Jun 2025 14:36:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/ma/person-setting/index.vue | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/views/material/ma/person-setting/index.vue b/src/views/material/ma/person-setting/index.vue index 34e679e9..df84045d 100644 --- a/src/views/material/ma/person-setting/index.vue +++ b/src/views/material/ma/person-setting/index.vue @@ -89,10 +89,28 @@ - 绑定 + + 绑定 + - 解绑 + + 解绑 +
- +
- + \ No newline at end of file + if (this.isShowComponent === 'AddTools') { + const equipmentListTemp = this.$refs[`${this.isShowComponent}Ref`].getEquipmentListTemp() + const isNew = equipmentListTemp.some(item => item.isNew) + if (equipmentListTemp.length === 0 || isNew) { + this.$message.error('当前页面有未保存的报废信息，请先保存！') + return + } + } else { + this.isShowComponent = 'Home' + } + } + } +} + From be239985a9daec6c04929209c2a991b2cdc700e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Sun, 15 Jun 2025 17:18:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2-=E7=9B=B4=E8=BD=AC?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81=E4=B8=8E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessHandlingRecord/directApplyRecord.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/business/businessHandlingRecord/directApplyRecord.vue b/src/views/business/businessHandlingRecord/directApplyRecord.vue index da48cb81..17c4ecd3 100644 --- a/src/views/business/businessHandlingRecord/directApplyRecord.vue +++ b/src/views/business/businessHandlingRecord/directApplyRecord.vue @@ -72,6 +72,9 @@ 已完成 + + 已驳回 + @@ -129,15 +132,16 @@ export default { }, // 考勤状态 statusOptions: [ - { label: '待审核', value: '1' }, - { label: '审核中', value: '2' }, - { label: '已完成', value: '3' } + { label: '待审核', value: '0' }, + { label: '审核中', value: '1' }, + { label: '已完成', value: '2' }, + { label: '已驳回', value: '3' } ], total: 0, // 总条数 // 表头 tableColumns: [ { label: '申请时间', prop: 'createTime' }, - { label: '申请人', prop: 'leaseMan' }, + { label: '申请人', prop: 'createName' }, { label: '转出单位', prop: 'backUnitName' }, { label: '转出工程', prop: 'backProName' }, { label: '转入单位', prop: 'leaseUnitName' }, From 57d086bfcb6a4474051f1df607f5529177e71735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Sun, 15 Jun 2025 17:30:54 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8-=E5=87=8F=E5=85=8D=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=EF=BC=8C=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8E=E7=BB=93=E6=9E=9C=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/reliefRecord/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/business/reliefRecord/index.vue b/src/views/business/reliefRecord/index.vue index bda9dd5a..e3b4f14b 100644 --- a/src/views/business/reliefRecord/index.vue +++ b/src/views/business/reliefRecord/index.vue @@ -33,6 +33,7 @@ + @@ -445,7 +446,7 @@ export default { uploadUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传的图片服务器地址 upload: { // 设置上传的请求头部 - headers: { Authorization: 'Bearer ' + getToken() }, + headers: { Authorization: 'Bearer ' + getToken() }, }, delBusinessFileIdList: [], // 删除的图片id @@ -584,7 +585,7 @@ export default { this.title = '查看' this.uploadKey = Date.now() // 清空附件列表 - this.dialogAppy.decreaseFile = [] + this.dialogAppy.decreaseFile = [] getDiscountViewList(row.id).then(async response => { if (response.code == 200) { @@ -614,7 +615,7 @@ export default { this.title = '修改' this.uploadKey = Date.now() // 清空附件列表 - this.dialogAppy.decreaseFile = [] + this.dialogAppy.decreaseFile = [] getDiscountViewList(row.id).then(async response => { if (response.code == 200) { From 6f262b8f230d924ddfb9281f0e8dde7a43cadbd0 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 15 Jun 2025 17:35:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/purchase/goodsBind/component/bindTools.vue | 6 +++--- src/views/system/user/index.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue index 987f8bb3..a8aec5cb 100644 --- a/src/views/material/purchase/goodsBind/component/bindTools.vue +++ b/src/views/material/purchase/goodsBind/component/bindTools.vue @@ -201,12 +201,12 @@ 查询 - + - + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 520ab763..06658083 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -84,7 +84,7 @@ - + @@ -404,7 +404,7 @@ export default { }, // 列信息 columns: [ - { key: 0, label: `用户编号`, visible: true }, + { key: 0, label: `序号`, visible: true }, { key: 1, label: `登录名`, visible: true }, { key: 2, label: `用户昵称`, visible: true }, { key: 3, label: `部门`, visible: true },