From 06ca163d5303298d806178abe34d521b79cb1288 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 18 Jul 2024 14:02:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=88=86=E7=B1=BB=E7=A0=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/spares/materialclassification.js | 15 +++++++++++++++ src/views/spares/materialDetail.vue | 18 +++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/api/spares/materialclassification.js b/src/api/spares/materialclassification.js index c9db673..83b305c 100644 --- a/src/api/spares/materialclassification.js +++ b/src/api/spares/materialclassification.js @@ -47,3 +47,18 @@ export const update = (row) => { data: row }) } + +export const getCodeList = () => { + return request({ + url: '/api/materialclassification/getCodeList', + method: 'get' + }) +} + +export const codeAdd = (row) => { + return request({ + url: '/api/materialclassification/submit', + method: 'post', + data: row + }) +} diff --git a/src/views/spares/materialDetail.vue b/src/views/spares/materialDetail.vue index ddf5f94..5db6cb9 100644 --- a/src/views/spares/materialDetail.vue +++ b/src/views/spares/materialDetail.vue @@ -30,8 +30,8 @@ v-model="inbound_form" ref="inbound_crud"> @@ -45,8 +45,8 @@ v-model="outbound_form" ref="outbound_crud2"> @@ -83,7 +83,7 @@ import {outbound_getListByMaterialNo, update_materialDetailOut} from "@/api/spares/outbound"; import {mapGetters} from "vuex"; import request from "@/router/axios"; - import {getMaterialClassCode, materialClassCodeAdd } from "@/api/spares/materialclasscode"; + import {getCodeList, codeAdd} from "@/api/spares/materialclassification"; export default { data() { @@ -389,13 +389,13 @@ column: [ { label: "物资分类码", - prop: "materialClassCode", + prop: "code", span:22, labelWidth: 150 }, { label: "物资类型", - prop: "materialType", + prop: "type", span:22, labelWidth: 150 } @@ -496,7 +496,7 @@ }); }, SearchClassCode() { - getMaterialClassCode().then(res => { + getCodeList().then(res => { this.optionsExt = res.data.data; }); }, @@ -629,7 +629,7 @@ this.$refs.diaForm.validate((valid, done, msg) => { if (valid) { done() - materialClassCodeAdd(this.diaForm).then(() => { + codeAdd(this.diaForm).then(() => { this.$refs.diaForm.resetForm(); this.dialogVisible = false; this.SearchClassCode(); 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 2/2] =?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) {