diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index bf756f62..553ad286 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -174,7 +174,18 @@ module.exports = { updateReason: '修改理由', lookUpdateBeforeContent: '查看修改前内容', proposingDepartment: '提出部门', - introducer: '提出人' + introducer: '提出人', + levelCode: '更改级别代号', + isHasGraph: '有无二维或三维图', + customerConfirmation: '顾客确认(适用军品)', + refreshFileNumber: '刷新文件号(三维)', + inventory: '库存', + workInProgress: '在制品', + spareParts: '备件', + relatedChanges: '关联更改项', + changeTag: '更改标记', + treatmentCount: '处数', + effectiveDate: '生效日期' }, // 企标复审流程 enStandardRecheck: { diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 0dc6aae7..9c43ee97 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -51,6 +51,199 @@ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.levelCode') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.isHasGraph') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.customerConfirmation') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.refreshFileNumber') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.inventory') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.workInProgress') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.spareParts') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.relatedChanges') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.changeTag') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.treatmentCount') }} + +
+ + + +
+ +
+
+ * + + {{ $t('workCenter.enStandardChange.effectiveDate') }} + +
+ + + + +
+
+
+ @@ -134,7 +327,98 @@ export default { } ], dataSource: [], - loading: false + loading: false, + formInline: {}, + rules: { + // 更改级别代号 + levelCode: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.levelCode') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 有无二维或三维图 + has2d3dGraph: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.isHasGraph') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 顾客确认(适用军品) + customerConfirmation: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.customerConfirmation') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 刷新文件号(三维) + refreshFileNumber: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.refreshFileNumber') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 库存 + inventory: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.inventory') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 在制品 + workInProgress: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.workInProgress') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 备件 + spareParts: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.spareParts') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 关联更改项 + relatedChanges: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.relatedChanges') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 更改标记 + changeTag: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.changeTag') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 处数 + treatmentCount: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.treatmentCount') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ], + // 生效日期 + effectiveDate: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.effectiveDate') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + } } }, methods: { @@ -142,6 +426,30 @@ export default { initData (data) { // 给表格赋值,在线编辑不知道要怎么赋值? this.dataSource = data.list + const formInline = {} + // 更改级别代号 + formInline.levelCode = data.levelCode + // 有无二维或三维图 + formInline.has2d3dGraph = data.has2d3dGraph + // 顾客确认(适用军品) + formInline.customerConfirmation = data.customerConfirmation + // 刷新文件号(三维) + formInline.refreshFileNumber = data.refreshFileNumber + // 库存 + formInline.inventory = data.inventory + // 在制品 + formInline.workInProgress = data.workInProgress + // 备件 + formInline.spareParts = data.spareParts + // 关联更改项 + formInline.relatedChanges = data.relatedChanges + // 更改标记 + formInline.changeTag = data.changeTag + // 处数 + formInline.treatmentCount = data.treatmentCount + // 生效日期 + formInline.effectiveDate = data.effectiveDate + this.formInline = Object.assign({}, formInline) // 给表单赋值 this.$nextTick(() => { this.$refs.baseInfoForm.initData(data) @@ -151,23 +459,30 @@ export default { getData () { // 把数据抛出,在线编辑不知道要不要抛 const data = {} - data.formInline = this.$refs.baseInfoForm.getData() + data.formInline = { + ...this.$refs.baseInfoForm.getData(), + ...this.formInline + } data.dataSource = this.dataSource return data }, // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { let data = {} - const formInline = await this.$refs.baseInfoForm.getDataValidate() - if (formInline && this.dataSource.length > 0) { - data.formInline = formInline - data.dataSource = this.dataSource - } else if (this.dataSource.length <= 0) { - this.$message.warning(this.$t('addAtLeastOneRowOfData')) - data = false - } else { - data = false - } + await this.$refs.ruleForm.validate(async valid => { + if (valid) { + const formInline = await this.$refs.baseInfoForm.getDataValidate() + if (formInline && this.dataSource.length > 0) { + data.formInline = { ...formInline, ...this.formInline } + data.dataSource = this.dataSource + } else if (this.dataSource.length <= 0) { + this.$message.warning(this.$t('addAtLeastOneRowOfData')) + data = false + } else { + data = false + } + } + }) return data }, // 企标编号和名称修改触发流程名称的修改 @@ -227,4 +542,11 @@ export default { margin-right: 20px; } } +/deep/ .ant-form-item-children > * { + width: 100% !important; +} + +.update-list-form { + margin-top: 20px; +}