diff --git a/cclqms-vue/src/i18n/locales/qc.cn.js b/cclqms-vue/src/i18n/locales/qc.cn.js index 2fd942b..a0ab979 100644 --- a/cclqms-vue/src/i18n/locales/qc.cn.js +++ b/cclqms-vue/src/i18n/locales/qc.cn.js @@ -1278,6 +1278,7 @@ module.exports = { dataStorageModeWholeLine: '整行储存', dataStorageModeColumn: '整列储存', serialNo: '序列号', + fileReadColumnCount: '文件读取列数', enterEquipmentNo: '请输入设备编码!', selectRecordsToDelete: '请选择要删除的记录', confirmDeleteCount: '确认删除选中的 {count} 条记录吗?' diff --git a/cclqms-vue/src/i18n/locales/qc.en.js b/cclqms-vue/src/i18n/locales/qc.en.js index 65b84ba..925b56d 100644 --- a/cclqms-vue/src/i18n/locales/qc.en.js +++ b/cclqms-vue/src/i18n/locales/qc.en.js @@ -1279,6 +1279,7 @@ module.exports = { dataStorageModeWholeLine: 'Store whole line', dataStorageModeColumn: 'Store by column', serialNo: 'Serial No.', + fileReadColumnCount: 'File read column count', enterEquipmentNo: 'Please enter equipment code!', selectRecordsToDelete: 'Please select records to delete', confirmDeleteCount: 'Delete {count} selected record(s)?' diff --git a/cclqms-vue/src/views/modules/qc/qcDeviceMaintenance.vue b/cclqms-vue/src/views/modules/qc/qcDeviceMaintenance.vue index 7bc3e74..b4c5eef 100644 --- a/cclqms-vue/src/views/modules/qc/qcDeviceMaintenance.vue +++ b/cclqms-vue/src/views/modules/qc/qcDeviceMaintenance.vue @@ -347,6 +347,7 @@ export default { equipmentClassification: '', dataStorageMode: 'standard', serialNo: '', + dataColumn: '', createBy: this.$store.state.user.name } this.modalFlag = true @@ -398,10 +399,9 @@ export default { this.modalData.equipmentDesc = val.ObjectDesc } }, - handleDataStorageModeChange (mode) { - if (mode === 'standard') { - this.$set(this.modalData, 'serialNo', '') - } + handleDataStorageModeChange () { + this.$set(this.modalData, 'serialNo', '') + this.$set(this.modalData, 'dataColumn', '') }, async saveModalData(){ if (!this.modalData.bu||this.modalData.bu==null ||this.modalData.bu==''){ @@ -415,6 +415,11 @@ export default { if (this.modalData.dataStorageMode === 'standard') { this.$set(this.modalData, 'serialNo', '') } + if (this.modalData.dataStorageMode !== 'column') { + this.$set(this.modalData, 'dataColumn', null) + } else if (this.modalData.dataColumn === '' || this.modalData.dataColumn === undefined) { + this.$set(this.modalData, 'dataColumn', null) + } saveEquipmentFolderLocationList(this.modalData).then(({data})=>{ if (data.code==0){ this.modalFlag = false @@ -737,6 +742,11 @@ export default { :label="$t('qc.deviceMaintenancePage.serialNo')"> + + +