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/router/views/index.js b/src/router/views/index.js index 62be553..bdc3584 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -165,6 +165,20 @@ export default [{ component: () => import( /* webpackChunkName: "views" */ '@/views/smart/workpermitDetail') }] -} +}, + { + path: '/smart', + component: Layout, + redirect: '/smart/index', + children: [{ + path: 'operationticketDetail', + name: '操作票详情', + meta: { + menu: false + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/smart/operationticketDetail') + }] + }, ] 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/dynamicledgerDetail.vue b/src/views/leger/dynamicledgerDetail.vue index 2b70670..616379f 100644 --- a/src/views/leger/dynamicledgerDetail.vue +++ b/src/views/leger/dynamicledgerDetail.vue @@ -223,7 +223,7 @@ export default { }, { label: "工作负责人", - prop: "workPrincipal", + prop: "workChargePerson", }, { label: "许可人", @@ -235,14 +235,14 @@ export default { }, { label: "许可时间", - prop: "permissionDate", + prop: "planStartDate", type: "datetime", format: 'yyyy/MM/dd HH:mm:ss', valueFormat: "yyyyMMdd HH:mm:ss", }, { label: "状态", - prop: "workStatus", + prop: "workState", type: "select", dicUrl: "/api/daf-system/dict/dictionary?code=work_status", props: { 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) { diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue index ef03cd1..811af90 100644 --- a/src/views/smart/operationticket.vue +++ b/src/views/smart/operationticket.vue @@ -107,7 +107,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/ height: 'auto', calcHeight: 210, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 22, tip: false, border: true, index: true, 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("确定将选择数据删除?", { 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; 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();