diff --git a/src/api/sjzx/jcsj.js b/src/api/sjzx/jcsj.js index a0376fa..f7d5aa9 100644 --- a/src/api/sjzx/jcsj.js +++ b/src/api/sjzx/jcsj.js @@ -7,6 +7,7 @@ export function add(data) {return request({url: '/dmCbxxp/add', method: 'post', export function getCzplBase(data) {return request({url: '/dmCzplpNew/getCzplBase', method: 'post', data})} +export function czPlDel(data) {return request({url: '/dmCzplpNew/czPlDel', method: 'post', data})} export function wgetCzplBase(data) {return request({url: '/dmCzplpNew/getCzplBase', method: 'post', data})} export function czPlupdate(data) {return request({url: '/dmCzplpNew/czPlupdate', method: 'post', data})} export function getCzplList(data) {return request({url: '/dmCzplpNew/getCzplList', method: 'post', data})} diff --git a/src/plugins/vxe-table/formatter/index.js b/src/plugins/vxe-table/formatter/index.js index c2afee8..ac8a75e 100644 --- a/src/plugins/vxe-table/formatter/index.js +++ b/src/plugins/vxe-table/formatter/index.js @@ -11,10 +11,8 @@ import XEUtils from 'xe-utils' * flag: 是否触发更新 */ VXETable.formats.add('dictFormat',({cellValue, column},dictCode,startWith, flag = false) => { - console.log(1) const dict=window.localStorage.getItem(dictCode); if(dictCode='CLlQ'){ - console.log(dict) } if (!dict){ diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue index 3ba3c09..363df9a 100644 --- a/src/views/sjzx/bclqCX.vue +++ b/src/views/sjzx/bclqCX.vue @@ -9,19 +9,57 @@ - - - - + + + + + + + + + + + + + + + + + + + + @@ -76,15 +114,14 @@ ref="xGrid" border resizable - keep-source + :align="'center'" :height="height" - :auto-resize="true" :columns="tableColumn" highlight-current-row :data="list" :custom-config="{ storage: true }" - + :span-method="mergeRowMethod" highlight-hover-row show-overflow show-header-overflow @@ -122,7 +159,8 @@ export default { queryParam: { dcch:'', dcpl:'', - delx:'B' + delx:'B', + dcfd:'' }, list: [], @@ -136,6 +174,16 @@ export default { dictData:{}, height: '500px', + projectData:[], + projectData1:[], + projectColumns: [ + {field: 'cbbm', title: '船号',width: 110}, + { field: 'wgbs', title: '完工标识', width: 80, + slots:{ + default: 'wgbsEdit' + }, + }, + ], tableColumn: [ { type: 'seq', width: 60, title: '序号' }, @@ -144,10 +192,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xh', title: '序号', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + { field: 'dcChZ', title: '船号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -160,96 +205,100 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'qpyldZ', title: '前批余料代总', width: 100, + + + + { field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - // { field: 'ljzlZ', title: '零件重量总', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, - // }, - { field: 'ybzsZ', title: '用板总数', width: 100, + { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - { field: 'lqzlZ', title: '领取重量总', width: 100, + { field: 'zzcjZ', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'shzlZ', title: '实耗重量总', width: 100, + { field: 'xh', title: '序号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - { field: 'ylzlZ', title: '余料重量总', width: 100, + { field: 'wpgg', title: '规格', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - { field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'], + { field: 'wpxh', title: '材质', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'], + + { field: 'sl', title: '数量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zzcjZ', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'], + + { field: 'lqzl', title: '领取重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - { field: 'wpgg', title: '规格', width: 100, + { field: 'shzl', title: '实耗重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'wpxh', title: '材质', width: 100, + { field: 'ylzl', title: '余料重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'sl', title: '数量', width: 100, + { field: 'qpyld', title: '前批余料代', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'lqzl', title: '领取重量', width: 100, + { field: 'ljzl', title: '零件重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'shzl', title: '实耗重量', width: 100, + { field: 'dztlzl', title: '单张套料重量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ylzl', title: '余料重量', width: 100, + { field: 'tlshbl', title: '套料实耗比例', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qpyldZ', title: '前批余料代总', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'qpyld', title: '前批余料代', width: 100, + // { field: 'ljzlZ', title: '零件重量总', width: 100, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + { field: 'ybzsZ', title: '用板总数', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ljzl', title: '零件重量', width: 100, + { field: 'lqzlZ', title: '领取重量总', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dztlzl', title: '单张套料重量', width: 100, + { field: 'shzlZ', title: '实耗重量总', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'tlshbl', title: '套料实耗比例', width: 100, + { field: 'ylzlZ', title: '余料重量总', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -289,7 +338,23 @@ export default { }, methods: { + cellClickEvent({row}) { + this.queryParam.dcch = row.cbbm + this.$refs.xDown4.hidePanel() + }, + focusEvent4() { + this.$refs.xDown4.showPanel() + }, + keyupEvent4() { + + if (this.queryParam.dcch) { + this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1) + } else { + this.projectData = this.projectData1.slice(0) + } + + }, uploadExcel() { if (this.queryParam.cbbm === '') { this.$message.error('请选择船号！') @@ -302,13 +367,7 @@ export default { this.uploadData.isupload = this.isupload }, - czbhChange(){ - if (this.queryParam.cbbm === '') { - this.filedis=true - }else{ - this.filedis=false - } - }, + beforeAvatarUpload(file) { // 文件类型 @@ -357,6 +416,8 @@ export default { initBase(){ getCzplBase({}).then(res=>{ this.dictData = res.data + this.projectData=res.data.cbbm + this.projectData1=res.data.cbbm // const xGrid = this.$refs.xGrid // // const dwbm = xGrid.getColumnByField('dwbm') @@ -387,6 +448,40 @@ export default { this.$refs.xGrid.setActiveCell(row,column) }, + mergeRowMethod ({ row, $rowIndex, column, data }) { + const fields = [ 'dcChZ', + 'dcPlZ', + 'dcFdZ', + 'lqzlZ', + 'dcZlZ', + 'lqlbZ', + 'zzcjZ', + 'ybzsZ', + 'shzlZ', + 'ylzlZ' + ] + console.log("111"); + let tempcol=column.property + let cellValue = row[tempcol] + if (cellValue && fields.includes(column.property)) { + + let prevRow = data[$rowIndex - 1] + let nextRow = data[$rowIndex + 1] + if (prevRow && prevRow[tempcol] === cellValue) { + return {rowspan: 0, colspan: 0} + } else { + let countRowspan = 1 + while (nextRow && nextRow[tempcol] === cellValue) { + nextRow = data[++countRowspan + $rowIndex] + } + if (countRowspan > 1) { + return {rowspan: countRowspan, colspan: 1} + } + } + } + + }, + selectChange(row) { // this.$refs.xGrid.clearActived() // 清除单元格激活状态 diff --git a/src/views/sjzx/bclqCX1.vue b/src/views/sjzx/bclqCX1.vue new file mode 100644 index 0000000..3a4b918 --- /dev/null +++ b/src/views/sjzx/bclqCX1.vue @@ -0,0 +1,856 @@ + + + + diff --git a/src/views/sjzx/bctltCX.vue b/src/views/sjzx/bctltCX.vue index 0f6cd29..08f8184 100644 --- a/src/views/sjzx/bctltCX.vue +++ b/src/views/sjzx/bctltCX.vue @@ -9,14 +9,38 @@ - - - - + + + + + + @@ -135,7 +159,16 @@ export default { uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', dictData:{}, height: '500px', - + projectData:[], + projectData1:[], + projectColumns: [ + {field: 'cbbm', title: '船号',width: 110}, + { field: 'wgbs', title: '完工标识', width: 80, + slots:{ + default: 'wgbsEdit' + }, + }, + ], tableColumn: [ { type: 'seq', width: 60, title: '序号' }, @@ -153,7 +186,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], + { field: 'ylZD1z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -181,7 +214,10 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - + { field: 'wph', title: '零件编号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'ljslZ', title: '零件数量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -209,8 +245,24 @@ export default { }, methods: { + cellClickEvent({row}) { + this.queryParam.dcch = row.cbbm + this.$refs.xDown4.hidePanel() + }, + focusEvent4() { + this.$refs.xDown4.showPanel() + }, + keyupEvent4() { + if (this.queryParam.dcch) { + this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1) + } else { + this.projectData = this.projectData1.slice(0) + } + + }, + uploadExcel() { if (this.queryParam.cbbm === '') { this.$message.error('请选择船号！') @@ -278,6 +330,8 @@ export default { initBase(){ getCzplBase({}).then(res=>{ this.dictData = res.data + this.projectData=res.data.cbbm + this.projectData1=res.data.cbbm // const xGrid = this.$refs.xGrid // // const dwbm = xGrid.getColumnByField('dwbm') diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue index d429273..f8de50f 100644 --- a/src/views/sjzx/bcybCX.vue +++ b/src/views/sjzx/bcybCX.vue @@ -3,24 +3,61 @@ - + - - - - + + + + + + + + + + + + + + + + + + + @@ -122,7 +159,8 @@ export default { queryParam: { dcch:'', dcpl:'', - delx:'B' + hxfl:'B', + tzbh:'' }, list: [], @@ -135,7 +173,16 @@ export default { uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl', dictData:{}, height: '500px', - + projectData:[], + projectData1:[], + projectColumns: [ + {field: 'cbbm', title: '船号',width: 110}, + { field: 'wgbs', title: '完工标识', width: 80, + slots:{ + default: 'wgbsEdit' + }, + }, + ], tableColumn: [ { type: 'seq', width: 60, title: '序号' }, @@ -152,7 +199,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dcPl', title: '批量', width: 100,editRender: { name: 'input' }, + { field: 'dcPl', title: '批量', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -221,7 +268,23 @@ export default { }, methods: { + cellClickEvent({row}) { + this.queryParam.dcch = row.cbbm + this.$refs.xDown4.hidePanel() + }, + focusEvent4() { + this.$refs.xDown4.showPanel() + }, + keyupEvent4() { + + + if (this.queryParam.dcch) { + this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1) + } else { + this.projectData = this.projectData1.slice(0) + } + }, uploadExcel() { if (this.queryParam.cbbm === '') { @@ -290,6 +353,8 @@ export default { initBase(){ getCzplBase({}).then(res=>{ this.dictData = res.data + this.projectData=res.data.cbbm + this.projectData1=res.data.cbbm // const xGrid = this.$refs.xGrid // // const dwbm = xGrid.getColumnByField('dwbm') diff --git a/src/views/sjzx/bomcx.vue b/src/views/sjzx/bomcx.vue index cf174a0..e1a471a 100644 --- a/src/views/sjzx/bomcx.vue +++ b/src/views/sjzx/bomcx.vue @@ -311,21 +311,13 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - { field: 'fd', title: '分段', width: 120, + { field: 'fds', title: '分段', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xqdd', title: '需求地点', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'pw', title: '抛丸', width: 120, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, + { field: 'lqlb', title: '领取类别', width: 120,formatter: ['dictFormat','CLlQ'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -337,6 +329,10 @@ export default { filterRender: { name: 'FilterCombination', }, }, + + + + { field: 'sbbh', title: '设备编号', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -367,7 +363,7 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'bc', title: '版长', width: 120, + { field: 'bc', title: '板长', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, @@ -394,22 +390,55 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'bclqzl', title: '板材领取重量', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, - { field: 'pklx', title: '坡口类型', width: 120, + { field: 'bcshzl', title: '板材实耗重量', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'bcylzl', title: '板材余料重量', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + + { field: 'bcljtlzl', title: '板材零件套料重量', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'bcqpyld', title: '前批余料代', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ylbhgg', title: '余料信息', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xqdd', title: '需求地点', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + + { field: 'pw', title: '抛丸', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'qbs', title: '曲标识', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'pklx', title: '坡口类型', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'pkbs', title: '坡口标识', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pkcd', title: '坡口长度', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -429,7 +458,10 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - + { field: 'fd', title: '分段号', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'ljbh', title: '零件编号', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -455,102 +487,99 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'blgs', title: '备料', width: 120, + { field: 'blgs', title: '备料定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pwgs', title: '抛丸', width: 120, + { field: 'pwgs', title: '抛丸定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'llgs', title: '理料', width: 120, + { field: 'llgs', title: '理料定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'hxgs', title: '划线', width: 120, + { field: 'hxgs', title: '划线定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'qggs', title: '切割', width: 120, + { field: 'qggs', title: '切割定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pkgs', title: '坡口', width: 120, + { field: 'pkgs', title: '坡口定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'qgs', title: '曲', width: 120, + { field: 'qgs', title: '曲定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dmgs', title: '打磨', width: 120, + { field: 'dmgs', title: '打磨定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zpgs', title: '装配', width: 120, + { field: 'zpgs', title: '装配定额工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkblgs', title: '反馈备料', width: 120, + { field: 'fkblgs', title: '备料实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkpwgs', title: '抛丸', width: 120, + { field: 'fkpwgs', title: '抛丸实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkllgs', title: '理料', width: 120, + { field: 'fkllgs', title: '理料实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkhxgs', title: '划线', width: 120, + { field: 'fkhxgs', title: '划线实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkqggs', title: '切割', width: 120, + { field: 'fkqggs', title: '切割实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkpkgs', title: '坡口', width: 120, + { field: 'fkpkgs', title: '坡口实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkqgs', title: '曲', width: 120, + { field: 'fkqgs', title: '曲实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkdmgs', title: '打磨', width: 120, + { field: 'fkdmgs', title: '打磨实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'fkzpgs', title: '装配', width: 120, + { field: 'fkzpgs', title: '装配实动工时', width: 120, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - // { field: 'fds', title: '分段和', width: 120, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, - // }, + diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue index 86b1e6c..c0894cd 100644 --- a/src/views/sjzx/bomwh.vue +++ b/src/views/sjzx/bomwh.vue @@ -45,11 +45,11 @@ - - - - - + 保存 + @@ -1063,6 +1063,21 @@ export default { if (this.fileList.length === 0) { return this.$message.warning('请选取文件后再上传') } + // 判断是否满足条件 + if(this.bclqList.length ==0){ + return this.$message.warning('缺少板材领取数据') + } + if(this.xclqList.length ==0){ + return this.$message.warning('缺少型材领取数据') + } + + if(this.bctjList.length ==0){ + return this.$message.warning('缺少板材统计数据') + } + if(this.xctjList.length==0){ + return this.$message.warning('缺少型材统计数据') + } + // 下面的代码将创建一个空的FormData对象: const formData = new FormData() // 你可以使用FormData.append来添加键/值对到表单里面； diff --git a/src/views/sjzx/czplwh.vue b/src/views/sjzx/czplwh.vue index fe73b5f..fe83687 100644 --- a/src/views/sjzx/czplwh.vue +++ b/src/views/sjzx/czplwh.vue @@ -9,14 +9,48 @@ - - - - + + + + + + + + + + + + + + + + @@ -47,7 +81,6 @@ :before-upload="beforeAvatarUpload" :data="uploadData" :on-success="handleAvatarSuccess" - :disabled="filedis" :headers="heads" > 批量表导入 @@ -57,11 +90,11 @@ - - - - - + 删除 + @@ -104,10 +137,10 @@