From fa921a7f2a42a4215299b79a995aad18a6225f74 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期三, 25 十月 2023 17:40:15 +0800 Subject: [PATCH] 各模块编码自动生成功能 --- src/views/eam/modules/precisionParameter/PrecisionParametersCategoryModel.vue | 13 + src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue | 16 +- src/views/eam/modules/processParameters/ProcessParametersModel.vue | 16 + src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue | 15 - src/views/eam/modules/transferMethod/TransferMethodModel.vue | 16 + src/views/eam/modules/processParameters/ProcessParametersCategoryModel.vue | 13 + src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue | 12 + src/views/eam/modules/riskPrevention/RiskPreventionModal.vue | 16 + src/views/eam/modules/faultType/FaultTypeModel.vue | 16 + src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateModel.vue | 12 + src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue | 16 + src/views/eam/modules/riskPrevention/RiskPreventionForm.vue | 14 + src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue | 17 - src/views/eam/modules/maintenanceSpecialty/MaintenanceSpecialtyModal.vue | 17 + src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue | 14 - src/views/eam/modules/documentType/DocumentTypeModal.vue | 16 + src/views/eam/modules/site/AreaModel.vue | 18 + src/views/eam/modules/site/ProductionLineModel.vue | 18 + src/views/eam/modules/site/SiteModel.vue | 18 + src/views/eam/modules/faultCause/FaultCauseModel.vue | 16 + src/views/eam/modules/operationCertificate/OperationCertificateForm.vue | 2 src/views/spare/modules/sparePart/SparePartModel.vue | 31 ++- src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue | 16 + src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue | 16 - src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue | 80 ++++----- src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue | 16 - 26 files changed, 303 insertions(+), 167 deletions(-) diff --git a/src/views/eam/modules/documentType/DocumentTypeModal.vue b/src/views/eam/modules/documentType/DocumentTypeModal.vue index 91186cb..fa7d210 100644 --- a/src/views/eam/modules/documentType/DocumentTypeModal.vue +++ b/src/views/eam/modules/documentType/DocumentTypeModal.vue @@ -18,7 +18,7 @@ <a-row> <a-col :span='24'> <a-form-item label='鏂囨。绫诲瀷缂栫爜' :labelCol='labelCol' :wrapperCol='wrapperCol'> - <a-input placeholder='璇疯緭鍏ユ枃妗g被鍨嬬紪鐮�' v-decorator="['num', validatorRules.num]"></a-input> + <a-input placeholder='灏嗙敱绯荤粺鑷姩鐢熸垚' v-decorator="['num', validatorRules.num]" disabled></a-input> </a-form-item> </a-col> <a-col :span='24'> @@ -60,7 +60,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -107,7 +107,8 @@ url: { add: '/momEamDocumentType/add', edit: '/momEamDocumentType/edit', - queryById: '/momEamDocumentType/queryById' + queryById: '/momEamDocumentType/queryById', + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: '' @@ -129,10 +130,17 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'num', 'name', 'remark')) }) - if (record.id) { + if (this.model.id) { this.codeDisable = true } else { this.codeDisable = false + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'DocumentType', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue index 0cba98f..760a7d1 100644 --- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue +++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue @@ -54,8 +54,8 @@ > <a-input allow-clear - :disabled="disableSubmit" - :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囧垎绫荤紪鍙�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -239,7 +239,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' import { JeecgListMixin } from '@/mixins/JeecgListMixin' @@ -305,7 +305,8 @@ url: { add: "/eam/equipmentCategory/add", edit: "/eam/equipmentCategory/edit", - list: "/eam/equipmentCategory/getAllChildren" + list: "/eam/equipmentCategory/getAllChildren", + getNum: '/eam/sysIdentity/getNumNew', }, columns: [ { @@ -416,6 +417,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'EquipmentCategory', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue index e8339af..72e15de 100644 --- a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue +++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue @@ -23,6 +23,7 @@ <a-input v-model="model.num" placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" + disabled ></a-input> </a-form-model-item> </a-col> @@ -455,17 +456,8 @@ }) }, created() { - this.initNum() }, methods: { - - initNum() { - getAction(this.url.getNum, { type: 'EquipmentScrap', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - } - }) - }, //閫夋嫨璁惧 selectEquipmentList() { @@ -530,6 +522,12 @@ if (this.model.id) { let params = { equipmentChangeId: this.model.id } this.requestSubTableData(this.url.equipmentScrapDetail.list, params, this.equipmentScrapDetailTable) + }else{ + getAction(this.url.getNum, { type: 'EquipmentScrap', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 @@ -608,39 +606,39 @@ target.removeRows(rowId) }, // 閲嶅啓add 鏂规硶 榛樿涓嶅鍔犱竴琛� - add(num = 0, forceScrollToBottom = false) { - if (num < 1) return - // let timestamp = new Date().getTime() - let rows = this.rows - let row - for (let i = 0; i < num; i++) { - rows = this.push({}, false, rows) - row = rows[rows.length - 1] - } - this.rows = rows + // add(num = 0, forceScrollToBottom = false) { + // if (num < 1) return + // // let timestamp = new Date().getTime() + // let rows = this.rows + // let row + // for (let i = 0; i < num; i++) { + // rows = this.push({}, false, rows) + // row = rows[rows.length - 1] + // } + // this.rows = rows - this.$nextTick(() => { - this.updateFormValues() - }) - // 瑙﹀彂add浜嬩欢 - this.$emit('added', { - row: (() => { - let r = Object.assign({}, row) - r.id = this.getCleanId(r.id) - return r - })(), - target: this - }) - // 璁剧疆婊氬姩鏉′綅缃� - let tbody = this.getElement('tbody') - let offsetHeight = tbody.offsetHeight - let realScrollTop = tbody.scrollTop + offsetHeight - if (forceScrollToBottom) { - this.$nextTick(() => { - this.resetScrollTop(this.$refs.scrollView.scrollHeight) - }) - } - } + // this.$nextTick(() => { + // this.updateFormValues() + // }) + // // 瑙﹀彂add浜嬩欢 + // this.$emit('added', { + // row: (() => { + // let r = Object.assign({}, row) + // r.id = this.getCleanId(r.id) + // return r + // })(), + // target: this + // }) + // // 璁剧疆婊氬姩鏉′綅缃� + // let tbody = this.getElement('tbody') + // let offsetHeight = tbody.offsetHeight + // let realScrollTop = tbody.scrollTop + offsetHeight + // if (forceScrollToBottom) { + // this.$nextTick(() => { + // this.resetScrollTop(this.$refs.scrollView.scrollHeight) + // }) + // } + // } } } diff --git a/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue b/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue index 8426851..74abf77 100644 --- a/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue +++ b/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue @@ -19,6 +19,7 @@ <a-input v-model="model.num" placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" + disabled ></a-input> </a-form-model-item> </a-col> @@ -113,6 +114,7 @@ import { validateDuplicateValue } from '@/utils/util' // import EquipmentSelection from '@/components/tools/EquipmentSelection.vue' import EquipmentSelectModal from './EquipmentSelectModal.vue' +import { getAction, postAction, requestPut } from '@api/manage' import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js' import { JVXETypes } from '@comp/jeecg/JVxeTable' import { getRefPromise, VALIDATE_FAILED } from '@/components/jeecg/JVxeTable/utils/vxeUtils.js' @@ -378,7 +380,6 @@ } }, created() { - this.initNum() }, mounted() { this.$bus.$on('selectionRows', (data) => { @@ -389,13 +390,6 @@ }, methods: { - initNum() { - getAction(this.url.getNum, { type: 'EquipmentSeal', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - } - }) - }, handleChange(value, data) { this.$nextTick(() => { this.$set(data, 'maintenanceAfterUnseal', data.maintenanceAfterUnseal) @@ -476,6 +470,12 @@ if (this.model.id) { let params = { equipmentChangeId: this.model.id } this.requestSubTableData(this.url.equipmentSealDetail.list, params, this.equipmentSealDetailTable) + }else{ + getAction(this.url.getNum, { type: 'EquipmentSeal', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 diff --git a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue index 8e5255d..cfad49b 100644 --- a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue +++ b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue @@ -19,6 +19,7 @@ <a-input v-model="model.num" placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" + disabled ></a-input> </a-form-model-item> </a-col> @@ -414,17 +415,9 @@ }) }, created() { - this.initNum() }, methods: { - initNum() { - getAction(this.url.getNum, { type: 'EquipmentUnseal', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - } - }) - }, //閫夋嫨璁惧 selectEquipmentList() { let ids = [] @@ -488,6 +481,12 @@ if (this.model.id) { let params = { equipmentChangeId: this.model.id } this.requestSubTableData(this.url.equipmentUnsealDetail.list, params, this.equipmentUnsealDetailTable) + }else{ + getAction(this.url.getNum, { type: 'EquipmentUnseal', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 diff --git a/src/views/eam/modules/faultCause/FaultCauseModel.vue b/src/views/eam/modules/faultCause/FaultCauseModel.vue index d8e176b..71fbf97 100644 --- a/src/views/eam/modules/faultCause/FaultCauseModel.vue +++ b/src/views/eam/modules/faultCause/FaultCauseModel.vue @@ -53,9 +53,9 @@ :wrapperCol="wrapperCol" > <a-input - :disabled="disableSubmit" + :disabled="true" allow-clear - :placeholder="disableSubmit?'':'璇疯緭鍏ユ晠闅滃師鍥犵紪鍙�'" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -124,7 +124,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -170,7 +170,8 @@ }, url: { add: "/eam/faultCause/add", - edit: "/eam/faultCause/edit" + edit: "/eam/faultCause/edit", + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: "" @@ -196,6 +197,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'FaultCause', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/faultType/FaultTypeModel.vue b/src/views/eam/modules/faultType/FaultTypeModel.vue index 569988c..df553a1 100644 --- a/src/views/eam/modules/faultType/FaultTypeModel.vue +++ b/src/views/eam/modules/faultType/FaultTypeModel.vue @@ -54,8 +54,8 @@ > <a-input allow-clear - :disabled="codeDisable" - :placeholder="disableSubmit?'':'璇疯緭鍏ユ晠闅滅被鍨嬬紪鍙�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -124,7 +124,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -170,7 +170,8 @@ }, url: { add: "/eam/faultType/add", - edit: "/eam/faultType/edit" + edit: "/eam/faultType/edit", + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: "" @@ -196,6 +197,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'FaultType', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/maintenanceSpecialty/MaintenanceSpecialtyModal.vue b/src/views/eam/modules/maintenanceSpecialty/MaintenanceSpecialtyModal.vue index 6ab06b5..61297ae 100644 --- a/src/views/eam/modules/maintenanceSpecialty/MaintenanceSpecialtyModal.vue +++ b/src/views/eam/modules/maintenanceSpecialty/MaintenanceSpecialtyModal.vue @@ -24,8 +24,9 @@ > <a-input allow-clear - :placeholder="'璇疯緭鍏ョ淮淇濅笓涓氱紪鐮�'" + :placeholder="'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" + disabled /> </a-form-item> </a-col> @@ -85,7 +86,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -132,7 +133,8 @@ url: { add: '/maintenanceSpecialty/maintenanceSpecialty/add', edit: '/maintenanceSpecialty/maintenanceSpecialty/edit', - queryById: '/maintenanceSpecialty/maintenanceSpecialty/queryById' + queryById: '/maintenanceSpecialty/maintenanceSpecialty/queryById', + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: '' @@ -154,10 +156,17 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'num', 'name', 'remark')) }) - if (record.id) { + if (this.model.id) { this.codeDisable = true } else { this.codeDisable = false + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'MaintenanceSpecialty', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/operationCertificate/OperationCertificateForm.vue b/src/views/eam/modules/operationCertificate/OperationCertificateForm.vue index f3cb46e..99f1be4 100644 --- a/src/views/eam/modules/operationCertificate/OperationCertificateForm.vue +++ b/src/views/eam/modules/operationCertificate/OperationCertificateForm.vue @@ -6,7 +6,7 @@ <a-row> <a-col :span='12'> <a-form-model-item label='鎿嶄綔璇佺紪鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'> - <a-input v-model='model.num' placeholder='璇疯緭鍏ユ搷浣滆瘉缂栧彿'></a-input> + <a-input v-model='model.num' placeholder='璇疯緭鍏ユ搷浣滆瘉缂栧彿' disabled></a-input> </a-form-model-item> </a-col> <a-col :span='12'> diff --git a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue index 94377f6..8fc2c25 100644 --- a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue +++ b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue @@ -6,7 +6,7 @@ <a-row> <a-col :span='12'> <a-form-model-item label='鐢宠鍗曠紪鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'> - <a-input v-model='model.num' placeholder="灏嗙敱绯荤粺鐢熸垚"></a-input> + <a-input v-model='model.num' placeholder="灏嗙敱绯荤粺鐢熸垚" disabled></a-input> </a-form-model-item> </a-col> <a-col :span='12'> @@ -238,17 +238,9 @@ } }, created() { - this.initNum() }, methods: { - initNum(){ - getAction(this.url.getNum, { type: 'OperationCertificateApply', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - } - }) - }, addBefore() { this.operationCertificateApplyDetailTable.dataSource = [] }, @@ -264,6 +256,12 @@ if (this.model.id) { let params = { id: this.model.id } this.requestSubTableData(this.url.operationCertificateApplyDetail.list, params, this.operationCertificateApplyDetailTable) + }else{ + getAction(this.url.getNum, { type: 'OperationCertificateApply', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 diff --git a/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryModel.vue b/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryModel.vue index 33116a5..1dc3a90 100644 --- a/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryModel.vue +++ b/src/views/eam/modules/precisionParameter/PrecisionParametersCategoryModel.vue @@ -46,8 +46,9 @@ > <a-input allow-clear - placeholder="璇疯緭鍏ュ弬鏁板垎绫荤紪鍙�" + placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" v-decorator="['num', validatorRules.num ]" + disabled /> </a-form-item> </a-col> @@ -161,6 +162,7 @@ add: "/eam/precisionParametersCategory/add", edit: "/eam/precisionParametersCategory/edit", loadPrecisionParametersCategoryTree: '/eam/precisionParametersCategory/loadTree', + getNum: '/eam/sysIdentity/getNumNew', }, precisionParametersCategoryTree: [], } @@ -198,6 +200,15 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'parentId', 'num', 'name', 'remark')); }); + if (!record.id) { + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'PrecisionParametersCategory', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); + } }, handleOk() { diff --git a/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue b/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue index ce8c9ad..4baaa7a 100644 --- a/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue +++ b/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue @@ -56,8 +56,8 @@ > <a-input allow-clear - :disabled="codeDisable" - :placeholder="disableSubmit?'':'璇疯緭鍏ョ簿搴﹀弬鏁扮紪鍙�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -126,7 +126,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -177,7 +177,8 @@ }, url: { add: "/eam/precisionParameters/add", - edit: "/eam/precisionParameters/edit" + edit: "/eam/precisionParameters/edit", + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: "" @@ -203,6 +204,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'PrecisionParameters', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateModel.vue b/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateModel.vue index 045b303..ab5bb80 100644 --- a/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateModel.vue +++ b/src/views/eam/modules/precisionParametersTemplate/PrecisionParametersTemplateModel.vue @@ -22,8 +22,8 @@ > <a-input allowClear - :disabled="codeDisable" - :placeholder="disableSubmit?'':'璇疯緭鍏ョ簿搴﹀弬鏁版ā鏉跨紪鐮�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="[ 'num', validatorRules.num]" /> </a-form-item> @@ -214,6 +214,7 @@ add: "/eam/precisionParametersTemplate/add", edit: "/eam/precisionParametersTemplate/edit", loadTree: "/eam/precisionParameters/loadTree", + getNum: '/eam/sysIdentity/getNumNew', }, treeData: [], TemplateDetailDataSource: [], @@ -275,6 +276,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'PrecisionParametersTemplate', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/processParameters/ProcessParametersCategoryModel.vue b/src/views/eam/modules/processParameters/ProcessParametersCategoryModel.vue index c16e4f6..081a1d4 100644 --- a/src/views/eam/modules/processParameters/ProcessParametersCategoryModel.vue +++ b/src/views/eam/modules/processParameters/ProcessParametersCategoryModel.vue @@ -46,8 +46,9 @@ > <a-input allow-clear - placeholder="璇疯緭鍏ュ弬鏁板垎绫荤紪鍙�" + placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" v-decorator="['num', validatorRules.num ]" + disabled /> </a-form-item> </a-col> @@ -161,6 +162,7 @@ add: "/eam/processParametersCategory/add", edit: "/eam/processParametersCategory/edit", loadProcessParametersCategoryTree: '/eam/processParametersCategory/loadTree', + getNum: '/eam/sysIdentity/getNumNew', }, processParametersCategoryTree: [], } @@ -198,6 +200,15 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'parentId', 'num', 'name', 'remark')); }); + if (!record.id) { + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'ProcessParametersCategory', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); + } }, handleOk() { diff --git a/src/views/eam/modules/processParameters/ProcessParametersModel.vue b/src/views/eam/modules/processParameters/ProcessParametersModel.vue index f3ce475..322f54f 100644 --- a/src/views/eam/modules/processParameters/ProcessParametersModel.vue +++ b/src/views/eam/modules/processParameters/ProcessParametersModel.vue @@ -56,8 +56,8 @@ > <a-input allow-clear - :disabled="codeDisable" - :placeholder="disableSubmit?'':'璇疯緭鍏ュ伐鑹哄弬鏁扮紪鍙�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -126,7 +126,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -177,7 +177,8 @@ }, url: { add: "/eam/processParameters/add", - edit: "/eam/processParameters/edit" + edit: "/eam/processParameters/edit", + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: "" @@ -203,6 +204,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'ProcessParameters', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue b/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue index 4013593..a8d2c74 100644 --- a/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue +++ b/src/views/eam/modules/processParametersTemplate/ProcessParametersTemplateModel.vue @@ -22,8 +22,8 @@ > <a-input allowClear - :disabled="codeDisable" - :placeholder="disableSubmit?'':'璇疯緭鍏ュ伐鑹哄弬鏁版ā鏉跨紪鐮�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="[ 'num', validatorRules.num]" /> </a-form-item> @@ -211,6 +211,7 @@ add: "/eam/processParametersTemplate/add", edit: "/eam/processParametersTemplate/edit", loadTree: "/eam/processParameters/loadTree", + getNum: '/eam/sysIdentity/getNumNew', }, treeData: [], TemplateDetailDataSource: [], @@ -268,6 +269,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'ProcessParametersTemplate', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue b/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue index 6fd0ce5..b880007 100644 --- a/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue +++ b/src/views/eam/modules/riskPrevention/RiskPreventionForm.vue @@ -5,7 +5,7 @@ <a-row> <a-col :span="24"> <a-form-model-item label="鍗遍櫓婧愮紪鐮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num"> - <a-input v-model="model.num" placeholder="璇疯緭鍏ュ嵄闄╂簮缂栫爜" ></a-input> + <a-input v-model="model.num" placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" disabled ></a-input> </a-form-model-item> </a-col> <a-col :span="24"> @@ -77,7 +77,8 @@ url: { add: '/eam/riskPrevention/add', edit: '/eam/riskPrevention/edit', - queryById: '/eam/riskPrevention/queryById' + queryById: '/eam/riskPrevention/queryById', + getNum: '/eam/sysIdentity/getNumNew', } } }, @@ -97,6 +98,15 @@ edit(record) { this.model = Object.assign({}, record) this.visible = true + if (!record.id) { + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'RiskPrevention', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); + } }, submitForm() { const that = this diff --git a/src/views/eam/modules/riskPrevention/RiskPreventionModal.vue b/src/views/eam/modules/riskPrevention/RiskPreventionModal.vue index f816e9b..402000b 100644 --- a/src/views/eam/modules/riskPrevention/RiskPreventionModal.vue +++ b/src/views/eam/modules/riskPrevention/RiskPreventionModal.vue @@ -18,7 +18,7 @@ <a-row> <a-col :span='24'> <a-form-item label='鍗遍櫓婧愮紪鐮�' :labelCol='labelCol' :wrapperCol='wrapperCol'> - <a-input placeholder='璇疯緭鍏ュ嵄闄╂簮缂栫爜' v-decorator="['num', validatorRules.num]"></a-input> + <a-input placeholder='灏嗙敱绯荤粺鑷姩鐢熸垚' v-decorator="['num', validatorRules.num]" disabled></a-input> </a-form-item> </a-col> <a-col :span='24'> @@ -70,7 +70,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -117,7 +117,8 @@ url: { add: '/eam/riskPrevention/add', edit: '/eam/riskPrevention/edit', - queryById: '/eam/riskPrevention/queryById' + queryById: '/eam/riskPrevention/queryById', + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: '' @@ -139,10 +140,17 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'num', 'name', 'remark','description','measure')) }) - if (record.id) { + if (this.model.id) { this.codeDisable = true } else { this.codeDisable = false + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'RiskPrevention', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/eam/modules/site/AreaModel.vue b/src/views/eam/modules/site/AreaModel.vue index 597032d..8f563eb 100644 --- a/src/views/eam/modules/site/AreaModel.vue +++ b/src/views/eam/modules/site/AreaModel.vue @@ -21,9 +21,9 @@ :wrapperCol="{span:18}" > <a-input - :readOnly="disableSubmit" + :readOnly="true" allow-clear - placeholder="璇疯緭鍏ュ伐鍖虹紪鍙�" + placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -105,7 +105,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -159,7 +159,8 @@ }, url: { add: "/base/area/add", - edit: "/base/area/edit" + edit: "/base/area/edit", + getNum: '/eam/sysIdentity/getNumNew', }, disableSubmit: false, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� @@ -180,6 +181,15 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'num', 'name', 'teamId', 'deptId', 'remark')) }); + if (!record.id) { + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'Area', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); + } }, close() { this.$emit('close'); diff --git a/src/views/eam/modules/site/ProductionLineModel.vue b/src/views/eam/modules/site/ProductionLineModel.vue index 9c9e33e..29db281 100644 --- a/src/views/eam/modules/site/ProductionLineModel.vue +++ b/src/views/eam/modules/site/ProductionLineModel.vue @@ -21,9 +21,9 @@ :wrapperCol="{span:18}" > <a-input - :readOnly="disableSubmit" + :readOnly="true" allow-clear - placeholder="璇疯緭鍏ュ伐娈电紪鍙�" + placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -89,7 +89,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -138,7 +138,8 @@ }, url: { add: "/base/productionLine/add", - edit: "/base/productionLine/edit" + edit: "/base/productionLine/edit", + getNum: '/eam/sysIdentity/getNumNew', }, disableSubmit: false, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� @@ -159,6 +160,15 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'num', 'name', 'shiftCategoryId', 'remark')) }); + if (!record.id) { + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'ProductionLine', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); + } }, close() { this.$emit('close'); diff --git a/src/views/eam/modules/site/SiteModel.vue b/src/views/eam/modules/site/SiteModel.vue index abd2fec..2c4eb1f 100644 --- a/src/views/eam/modules/site/SiteModel.vue +++ b/src/views/eam/modules/site/SiteModel.vue @@ -21,9 +21,9 @@ :wrapperCol="{span:18}" > <a-input - :readOnly="disableSubmit" + :readOnly="true" allow-clear - placeholder="璇疯緭鍏ュ伐鍘傜紪鍙�" + placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -71,7 +71,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -114,7 +114,8 @@ }, url: { add: "/base/site/add", - edit: "/base/site/edit" + edit: "/base/site/edit", + getNum: '/eam/sysIdentity/getNumNew', }, disableSubmit: false, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� @@ -135,6 +136,15 @@ this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'num', 'name', 'remark')) }); + if (!record.id) { + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'Site', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); + } }, close() { this.$emit('close'); diff --git a/src/views/eam/modules/transferMethod/TransferMethodModel.vue b/src/views/eam/modules/transferMethod/TransferMethodModel.vue index 9784691..034cf7e 100644 --- a/src/views/eam/modules/transferMethod/TransferMethodModel.vue +++ b/src/views/eam/modules/transferMethod/TransferMethodModel.vue @@ -40,8 +40,8 @@ > <a-input allow-clear - :disabled="codeDisable" - :placeholder="disableSubmit?'':'璇疯緭鍏ュ鍑忔柟寮忕紪鍙�'" + :disabled="true" + :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'" v-decorator="['num', validatorRules.num ]" /> </a-form-item> @@ -110,7 +110,7 @@ <script> import pick from 'lodash.pick' -import { postAction, requestPut } from '@/api/manage' +import { getAction,postAction, requestPut } from '@/api/manage' import { duplicateCheck } from '@/api/api' export default { @@ -156,7 +156,8 @@ }, url: { add: "/eam/transferMethod/add", - edit: "/eam/transferMethod/edit" + edit: "/eam/transferMethod/edit", + getNum: '/eam/sysIdentity/getNumNew', }, //鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴�� alterFlag: "" @@ -182,6 +183,13 @@ this.codeDisable = true; } else { this.codeDisable = false; + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'TransferMethod', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, diff --git a/src/views/spare/modules/sparePart/SparePartModel.vue b/src/views/spare/modules/sparePart/SparePartModel.vue index 223f820..2ee21f6 100644 --- a/src/views/spare/modules/sparePart/SparePartModel.vue +++ b/src/views/spare/modules/sparePart/SparePartModel.vue @@ -25,6 +25,7 @@ <a-input placeholder="灏嗙敱绯荤粺鐢熸垚" v-decorator="['num', validatorRules.num]" + disabled /> </a-form-item> </a-col> @@ -378,13 +379,13 @@ this.codeDisable = true; } else { this.codeDisable = false; - // this.$nextTick(() => { - // getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => { - // if (res.success) { - // this.form.setFieldsValue({ num: res.message }); - // } - // }) - // }); + this.$nextTick(() => { + getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => { + if (res.success) { + this.form.setFieldsValue({ num: res.message }); + } + }) + }); } }, @@ -396,19 +397,19 @@ handleOk() { const that = this; // 瑙﹀彂琛ㄥ崟楠岃瘉 - this.form.validateFields(async (err, values) => { + this.form.validateFields((err, values) => { if (!err) { that.confirmLoading = true; let formData = Object.assign(this.model, values); let obj; if (!this.model.id) { - if(!formData.num){ - await getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => { - if (res.success) { - formData.num = res.message; - } - }); - } + // if(!formData.num){ + // await getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => { + // if (res.success) { + // formData.num = res.message; + // } + // }); + // } formData.sparePartCategoryId = this.sparePartCategoryId obj = postAction(this.url.add, formData); } else { diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue index 886954e..2b00a89 100644 --- a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue +++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue @@ -374,18 +374,8 @@ }, created() { this.initOptions(); - this.initNum() }, methods: { - initNum() { - getAction(this.url.getNum, { type: 'SparePartReceive', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - - /* this.model.setFieldsValue({ num: res.message }); */ - } - }) - }, getSysDeparts() { getAction(this.url.getSysDeparts).then((res) => { if (res.success) { @@ -468,6 +458,12 @@ if (this.model.id) { let params = { id: this.model.id } this.requestSubTableData(this.url.sparesReceiveDetail.list, params, this.sparesReceiveDetailTable) + }else{ + getAction(this.url.getNum, { type: 'SparePartReceive', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue index ffc1d28..90927e1 100644 --- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue +++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue @@ -426,16 +426,8 @@ }, created() { this.initOptions() - this.initNum() }, methods: { - initNum() { - getAction(this.url.getNum, { type: 'SparePartScrap', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - } - }) - }, initOptions() { getAction(this.url.loadOptions).then(res => { if (res.success) { @@ -523,6 +515,12 @@ if (this.model.id) { let params = { id: this.model.id } this.requestSubTableData(this.url.sparesScrapDetail.list, params, this.sparesScrapDetailTable) + }else{ + getAction(this.url.getNum, { type: 'SparePartScrap', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue index 9c06f22..12d4781 100644 --- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue +++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue @@ -338,7 +338,6 @@ }, created() { this.initOptions() - this.initNum() }, methods: { @@ -380,16 +379,6 @@ }); } }, */ - - initNum() { - getAction(this.url.getNum, { type: 'SparePartRequirement', length: '4' }).then((res) => { - if (res.success) { - this.model.num = res.message - - /* this.model.setFieldsValue({ num: res.message }); */ - } - }) - }, initOptions() { getAction(this.url.loadOptions).then(res => { @@ -471,6 +460,12 @@ if (this.model.id) { let params = { id: this.model.id } this.requestSubTableData(this.url.sparesScrapRequirementDetail.list, params, this.sparesScrapRequirementDetailTable) + }else{ + getAction(this.url.getNum, { type: 'SparePartRequirement', length: '4' }).then((res) => { + if (res.success) { + this.model.num = res.message + } + }) } }, //鏍¢獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟 -- Gitblit v1.9.3