From c5074e681475214710b4047f62c357a1b141ac5f Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Thu, 18 Jul 2024 14:12:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inspection/inspectionobject.vue | 2 +- src/views/inspection/inspectionobjectDetail.vue | 7 +------ src/views/leger/equipmentledger.vue | 2 +- src/views/leger/toolinventoryrecord.vue | 5 +++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/views/inspection/inspectionobject.vue b/src/views/inspection/inspectionobject.vue index c641c45..994d6a1 100644 --- a/src/views/inspection/inspectionobject.vue +++ b/src/views/inspection/inspectionobject.vue @@ -413,7 +413,7 @@ cancelButtonText: "取消", type: "warning" }).then(() => { - expUtil.excelExport(`/api/inspection/inspectionobject/export?daf-auth=${getToken()}`, this.search, ['stations', "istatus", "objectName"]); + expUtil.excelExportEasy(`/api/inspection/inspectionobject/export?daf-auth=${getToken()}`, this.search); }); }, beforeOpen(done, type) { diff --git a/src/views/inspection/inspectionobjectDetail.vue b/src/views/inspection/inspectionobjectDetail.vue index 24dd401..ff481a4 100644 --- a/src/views/inspection/inspectionobjectDetail.vue +++ b/src/views/inspection/inspectionobjectDetail.vue @@ -48,7 +48,7 @@ export default { label: "对象编号", prop: "objectNo", span:8, - disabled: true, + disabled:true, rules: [{ required: true, message: "请输入对象编号", @@ -102,8 +102,6 @@ export default { kksNo.disabled = true; if(["view"].includes(this.$route.query.frameMode)) { kksNo.disabled = false; - const objectNo = this.findObject(this.option.column, "objectNo"); - objectNo.disabled = false; } }else{ const toolsCodeId = this.findObject(this.option.column, "toolsCodeId"); @@ -112,8 +110,6 @@ export default { kksNo.disabled = false; if(["view"].includes(this.$route.query.frameMode)) { kksNo.disabled = false; - const objectNo = this.findObject(this.option.column, "objectNo"); - objectNo.disabled = false; } } } @@ -258,7 +254,6 @@ export default { }else{ const objectNo = this.findObject(this.option.column, "objectNo"); objectNo.value = ' '; - objectNo.disabled = true; const iStatus = this.findObject(this.option.column, "istatus"); iStatus.display = false; const cancelReason = this.findObject(this.option.column, "cancelReason"); diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 7c67166..5aef489 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -635,7 +635,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l cancelButtonText: "取消", type: "warning" }).then(() => { - expUtil.excelExportEasy(`/api/workorder/export?daf-auth=${getToken()}`, this.search); + expUtil.excelExportEasy(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search); }); }, beforeOpen(done, type) { diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index 5277491..78d9cd6 100644 --- a/src/views/leger/toolinventoryrecord.vue +++ b/src/views/leger/toolinventoryrecord.vue @@ -62,11 +62,13 @@ import {mapGetters} from "vuex"; import {getToken} from "@/util/auth"; import {Alert} from "element-ui"; + import expUtil from "@/util/exportUtil"; export default { data() { return { form: {}, query: {}, + search:{}, loading: true, page: { pageSize: 10, @@ -327,8 +329,7 @@ cancelButtonText: "取消", type: "warning" }).then(() => { - var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&'); - window.open(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}&${formStr}`); + expUtil.excelExportEasy(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}`, this.search); }); }, beforeOpen(done, type) { From beae581d5f6f069d6104af88728345a3534de07a Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Thu, 18 Jul 2024 14:33:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smart/operationticketDetail.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue index ce0f907..1d7485c 100644 --- a/src/views/smart/operationticketDetail.vue +++ b/src/views/smart/operationticketDetail.vue @@ -43,7 +43,7 @@ 新增 + @click="addrow">新增 @@ -144,6 +144,7 @@ export default { // value: undefined, // label: ' ' // }], + form:'', closeTicketBox: false, defaultOperationTicketNo: "", @@ -813,6 +814,11 @@ export default { this.$refs.crud.toggleSelection() }); }, + + addrow(){ + this.item_form.operationTicketNo = this.tab1_form.operationTicketNo; + this.$refs.crud2.rowAdd() + }, // 操作项目 删除按钮处理 item_rowDel (form, index,done) { this.$confirm("确定将选择数据删除?", { From 0afd65f44ac1e4b7c3599e5e3f9bfecdf8b7773d Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Thu, 18 Jul 2024 14:46:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smart/workpermitDetail.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/smart/workpermitDetail.vue b/src/views/smart/workpermitDetail.vue index 1343291..5df1678 100644 --- a/src/views/smart/workpermitDetail.vue +++ b/src/views/smart/workpermitDetail.vue @@ -34,6 +34,12 @@ @row-del="attachment_rowDel" @row-update="attachment_rowUpdate" @row-save="attachment_rowSave"> + @@ -505,7 +511,7 @@ ...mapGetters(["permission"]), permissionList() { return { - addBtn: true, + addBtn: false, viewBtn: false, delBtn: true, editBtn: true @@ -634,6 +640,10 @@ this.readonlyForm=false; this.frame_class = null; }, + addrow(){ + this.attachment_form.ticketCode = this.tab1_form.workTicketNo; + this.$refs.crud.rowAdd() + }, updateToSearch () { this.readonlyForm=true; this.shouldShowButton=true; From ea3f75bf35a6912fe8efbdc922f0163df1b325aa Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Thu, 18 Jul 2024 15:28:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B5=E6=95=B0=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledgerDetail.vue | 2 ++ src/views/leger/toolinventoryrecordDetail.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index b0b880c..7ab5584 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -614,6 +614,8 @@ { label: "页数", prop: "page", + type: 'number', + step: 1, span: 20, rules: [{ required: true, diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue index 22e5151..460e0d1 100644 --- a/src/views/leger/toolinventoryrecordDetail.vue +++ b/src/views/leger/toolinventoryrecordDetail.vue @@ -552,6 +552,8 @@ export default { label: "页数", prop: "page", span: 20, + type: 'number', + step: 1, rules: [{ required: true, message: "请输入页数",