diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_EQUIPMENTFILE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_EQUIPMENTFILE01.wql index fc1dbf39..ab345cda 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_EQUIPMENTFILE01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_EQUIPMENTFILE01.wql @@ -25,6 +25,7 @@ 输入.workprocedure_id TYPEAS s_string 输入.is_produceuse TYPEAS s_string 输入.devicerecord_id TYPEAS s_string + 输入.device_level TYPEAS s_string 输入.classIds TYPEAS f_string 输入.deptIds TYPEAS f_string @@ -72,6 +73,9 @@ OPTION 输入.status <> "" equipmentfile.status = 输入.status ENDOPTION + OPTION 输入.device_level <> "" + equipmentfile.device_level = 输入.device_level + ENDOPTION OPTION 输入.use_deptid <> "" equipmentfile.use_deptid in 输入.deptIds ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls index 968ce29d..90b011a6 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls differ diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue index 81ca82ab..e6334cb7 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/AddDialog.vue @@ -126,6 +126,21 @@ /> + + + + + @@ -283,6 +298,7 @@ const defaultForm = { setting_place: '', device_bom_id: '', theory_beat: '', + device_level: '', oraginal_value: '', net_amount: '', remark: '' @@ -297,7 +313,7 @@ export default { default: false } }, - dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status'], + dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status', 'device_level'], data() { return { dialogVisible: false, diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog.vue index 01c6c113..83eb5353 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog.vue @@ -111,6 +111,22 @@ /> + + + + + @@ -233,7 +249,7 @@ export default { type: Object } }, - dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status'], + dicts: ['device_type', 'workorder_type', 'is_produceuse', 'device_status', 'device_level'], data() { return { dialogVisible: false, diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue index b6f51976..f476514d 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue @@ -66,18 +66,6 @@ @keyup.enter.native="crud.toQuery" /> - - - + + + + + + + + @@ -143,7 +160,7 @@ :disabled="sub_flag" @click="submit('10')" > - 启用 + 启用 - 档案维护 + 档案维护 @@ -219,30 +237,31 @@ {{ scope.row.device_code }} - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -275,7 +294,7 @@ import { download } from '@/api/data' import { downloadFile } from '@/utils' export default { - name: 'equipmentfile', + name: 'Equipmentfile', components: { Treeselect, ChangeDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination }, cruds() { return CRUD({ title: '设备档案', idField: 'devicerecord_id', url: 'api/equipmentfile', crudMethod: { ...equipmentfile }, @@ -290,7 +309,7 @@ export default { }, mixins: [presenter(), header(), crud()], // 数据字典 - dicts: ['workorder_status', 'workorder_type', 'product_series', 'device_type', 'is_produceuse', 'device_status'], + dicts: ['device_level', 'workorder_status', 'workorder_type', 'product_series', 'device_type', 'is_produceuse', 'device_status'], data() { return { height: document.documentElement.clientHeight - 180 + 'px;', @@ -421,10 +440,13 @@ export default { this.open_flag = true } } - }else{ + } else { this.handleCurrentChange() } }, + device_levelFormat(row) { + return this.dict.label.device_level[row.device_level] + }, stateFormat(row) { return this.dict.label.device_status[row.status] }, @@ -449,18 +471,18 @@ export default { }, submit(status) { this.checkrows = this.$refs.table.selection - if(this.checkrows.length === 0 ){ + if (this.checkrows.length === 0) { this.crud.notify('请勾选需要操作的记录！') return false } - equipmentfile.submit({ 'status': status, rows: this.checkrows}).then(res => { + equipmentfile.submit({ 'status': status, rows: this.checkrows }).then(res => { this.crud.notify('操作成功！') this.querytable() }) }, openWork(row) { this.checkrows = this.$refs.table.selection - if(this.checkrows.length === 0 ){ + if (this.checkrows.length === 0) { this.crud.notify('请勾选一条需要操作的记录！') return false } @@ -480,6 +502,22 @@ export default { crud.downloadLoading = false }) }, + cellstyle({ row, column, rowIndex, columnIndex }) { + const stylejson = {} + if (column.label === '设备等级') { + if (row.device_level === 'A') { + stylejson.background = 'red' + stylejson.color = 'white' + } else if (row.device_level === 'B') { + stylejson.background = 'blue' + stylejson.color = 'white' + } else if (row.device_level === 'C') { + stylejson.background = 'green' + stylejson.color = 'white' + } + return stylejson + } + }, printCard() { const _selectData = this.$refs.table.selection if (_selectData.length > 1 || _selectData.length === 0) { @@ -578,7 +616,6 @@ export default { color: "#CCCFD6"; - } .vue-treeselect--has-value .vue-treeselect__input { diff --git a/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue b/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue index 6184536c..deeba1d7 100644 --- a/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue +++ b/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue @@ -259,6 +259,7 @@ style="width: 100%;" size="mini" show-summary + :summary-method="getSummaries" border :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > @@ -534,6 +535,29 @@ export default { this.form.accept_pcsn = res.accept_pcsn }) }, + getSummaries(param) { + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计' + return + } + const values = data.map(item => Number(item[column.property])) + if (column.property === 'formula_qty') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] + } + }) + return sums + }, autoCalculation() { this.fullscreenLoading = true crudacceptformula.autoCalculation(this.form).then(res => { diff --git a/mes/qd/src/views/wms/pf/acceptformula/ViewDialog.vue b/mes/qd/src/views/wms/pf/acceptformula/ViewDialog.vue index 9187f887..d56fef5e 100644 --- a/mes/qd/src/views/wms/pf/acceptformula/ViewDialog.vue +++ b/mes/qd/src/views/wms/pf/acceptformula/ViewDialog.vue @@ -228,6 +228,8 @@ :data="tableData" style="width: 100%;" size="mini" + show-summary + :summary-method="getSummaries" border :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > @@ -362,6 +364,29 @@ export default { this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty / 100.0 }) }, + getSummaries(param) { + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计' + return + } + const values = data.map(item => Number(item[column.property])) + if (column.property === 'formula_qty') { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] + } + }) + return sums + }, close() { this.$emit('update:dialogShow', false) this.form = {}