From bc53bde3b5345f9e8db7c6c4774d730a2be89c1f Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Mon, 18 Dec 2023 14:56:19 +0800 Subject: [PATCH] xn --- src/api/jhzx/sygd.js | 4 +- src/views/jhzx/gdxqDR.vue | 149 ++++---- src/views/jhzx/qfxqCX.vue | 73 +++- src/views/jhzx/qfxqwh.vue | 69 +++- src/views/jhzx/qfzxGL.vue | 73 +++- src/views/jhzx/sygdCX.vue | 5 +- src/views/jhzx/sygdSH.vue | 5 +- src/views/jhzx/sygdWH.vue | 4 +- src/views/jhzx/symxCX.vue | 153 ++++---- src/views/jhzx/xbjhWH.vue | 2 + src/views/jhzx/ydjhzxGL.vue | 209 ++--------- src/views/jhzx/ydjhzxXF.vue | 700 +++++++++++++++++++++++------------- src/views/jhzxgl/pwjhFK.vue | 515 +------------------------- src/views/sjzx/sbcnWH.vue | 321 +++++++++-------- 14 files changed, 966 insertions(+), 1316 deletions(-) diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js index 4ac678e..70ce363 100644 --- a/src/api/jhzx/sygd.js +++ b/src/api/jhzx/sygd.js @@ -11,7 +11,9 @@ export function tqSygd() {return request({url: '/dmSygdMx/tqSygd', method: 'post export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})} export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})} export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})} -export function tjydjh() {return request({url: '/dmYdjh/tjydjh', method: 'post'})} +export function tjydjh(data) {return request({url: '/dmYdjh/tj', method: 'post', data})} +export function hz(data) {return request({url: '/dmYdjh/hz', method: 'post', data})} +export function ydjhxf(data) {return request({url: '/dmYdjh/xf', method: 'post', data})} //采购计划到货情况 export function cgjhdhqk(data={}) {return request({url: '/dmSygdMx/cgjhdhqk', method: 'post',data})} diff --git a/src/views/jhzx/gdxqDR.vue b/src/views/jhzx/gdxqDR.vue index fe09ed9..dd87651 100644 --- a/src/views/jhzx/gdxqDR.vue +++ b/src/views/jhzx/gdxqDR.vue @@ -8,8 +8,7 @@ 小组需求时间范围: 至 - - + @@ -36,7 +35,7 @@ - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -121,98 +93,98 @@ export default { height: '500px', tableColumn:[ - { field: 'dcCh', title: '船只', width: 120, + { field: 'dcCh', title: '船只', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dcPl', title: '批量号', width: 120, + { field: 'dcPl', title: '批量号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zdh', title: '总段号', width: 120, + { field: 'zdh', title: '总段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dcFd', title: '分段号', width: 120, + { field: 'dcFd', title: '分段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dzjz', title: '大组极重', width: 120, + { field: 'dzjz', title: '大组极重', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zxfdxq', title: '总装部最新分段需求期', width: 120, + { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xzglxq', title: '钢料需求（小组）', width: 120, + { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dzglxq', title: '钢料需求（大组）', width: 120, + { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xdb', title: 'X大板', width: 120, + { field: 'xdb', title: 'X大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xskj', title: 'X数控件', width: 120, + { field: 'xskj', title: 'X数控件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xpt', title: 'X平铁', width: 120, + { field: 'xpt', title: 'X平铁', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xyw', title: 'X压弯', width: 120, + { field: 'xyw', title: 'X压弯', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xxc', title: 'X型材', width: 120, + { field: 'xxc', title: 'X型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xtxc', title: 'X二次装T型材', width: 120, + { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'ddb', title: 'D大板', width: 120, + { field: 'ddb', title: 'D大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dqb', title: 'D曲板', width: 120, + { field: 'dqb', title: 'D曲板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dxc', title: 'D型材T', width: 120, + { field: 'dxc', title: 'D型材T', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dsj', title: 'D散件', width: 120, + { field: 'dsj', title: 'D散件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xqzt', title: '需求状态', width: 120,formatter:this.formatterZt, + { field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'drcs', title: '导入次数', width: 120, + { field: 'drcs', title: '导入次数', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xzglxqOld', title: '原需求期', width: 120, + { field: 'xzglxqOld', title: '原需求期', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, ], - tableColumn2:[ - { field: 'dcCh', title: '船只', width: 200, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - } - ], + // tableColumn2:[ + // { field: 'dcCh', title: '船只', width: 200, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // } + // ], isupload:'02', uploadData:{}, heads: { token: getToken() }, @@ -355,6 +327,11 @@ export default { getCzxx({}).then(res=>{ this.dictData = res.data }) + var date = new Date(); + var Y = date.getFullYear() + "/"; + var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/"; + var D = date.getDate()<10? "0" +date.getDate():date.getDate(); + this.queryParam.beginTime = Y + M + D; }, //初始化表1 数据 initList() { @@ -380,48 +357,48 @@ export default { }, generatedCol(){ //日期 - this.tableColumn2= [] ; - this.tableColumn2.push({ - key: this.tableColumn2.length + 1, - field: 'dcCh', - title: '船只', - width: 200 - }) - var a =this.monthList - for (let i = 0; i < a.length; i++) { - this.tableColumn2.push({ - key: this.tableColumn2.length + 1, - field: 'yf'+a[i], - title: a[i]+`月`, - width: 200 - }) - } + // this.tableColumn2= [] ; + // this.tableColumn2.push({ + // key: this.tableColumn2.length + 1, + // field: 'dcCh', + // title: '船只', + // width: 200 + // }) + // var a =this.monthList + // for (let i = 0; i < a.length; i++) { + // this.tableColumn2.push({ + // key: this.tableColumn2.length + 1, + // field: 'yf'+a[i], + // title: a[i]+`月`, + // width: 200 + // }) + // } }, formatDate ({ cellValue }) { return XEUtils.toDateString(cellValue, 'yyyy/MM/dd') }, getHeight() { - this.height = window.innerHeight - 200 + this.height = window.innerHeight - 150 }, format (val) { - this.monthList= [] ; + // this.monthList= [] ; var date = new Date(val); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 - var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1); + // M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1); // this.queryParam.beginTime=Y+M; - this.monthList.push(M); + // this.monthList.push(M); - date.setMonth(date.getMonth()+1); - M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) ; - this.monthList.push(M) + // date.setMonth(date.getMonth()+1); + // M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) ; + // this.monthList.push(M) - date.setMonth(date.getMonth()+1); - M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) ; - this.monthList.push(M) + // date.setMonth(date.getMonth()+1); + // M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) ; + // this.monthList.push(M) - date.setMonth(date.getMonth()+1); + date.setMonth(date.getMonth()+2); var Y = date.getFullYear() + "/"; - M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/"; + var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/"; var D = date.getDate()<10? "0" +date.getDate():date.getDate(); // var h = date.getHours() + ":"; // var m = date.getMinutes() + ":"; diff --git a/src/views/jhzx/qfxqCX.vue b/src/views/jhzx/qfxqCX.vue index 31b0e0b..7d6acf1 100644 --- a/src/views/jhzx/qfxqCX.vue +++ b/src/views/jhzx/qfxqCX.vue @@ -133,61 +133,102 @@ export default { zt:[], height: '500px', tableColumn: [ + { type: 'checkbox', width: 50 }, { type: 'seq', width: 60, title: '序号' }, - - { field: 'dcCh', title: '船号', width: 100, + { field: 'dcCh', title: '船只', minWidth: "70", 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: '批量号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dcFd', title: '分段', width: 100, editRender: { name: 'input' }, + { field: 'zdh', title: '总段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pscd', title: '配送场地', width: 120, editRender: { name: 'input' }, + { field: 'dcFd', title: '分段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'cjzg', title: '车间主管', width: 120, editRender: { name: 'input' }, + { field: 'dzjz', title: '大组极重', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'db', title: '大板', width: 120, editRender: { name: 'input' }, + { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xc', title: '型材', width: 120, editRender: { name: 'input' }, + { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'txc', title: 'T型材', width: 120, editRender: { name: 'input' }, + { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bz', title: '备注', width: 120, editRender: { name: 'input' }, + { field: 'xdb', title: 'X大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + { field: 'xskj', title: 'X数控件', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xpt', title: 'X平铁', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xyw', title: 'X压弯', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, - { field: 'bzry', title: '编制人员', width: 110, editRender: { name: 'input' }, + { field: 'xxc', title: 'X型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bzrq', title: '编制日期', width: 110, editRender: { name: 'input' }, + { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'ddb', title: 'D大板', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dqb', title: 'D曲板', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dxc', title: 'D型材T', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dsj', title: 'D散件', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'drcs', title: '导入次数', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xzglxqOld', title: '原需求期', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + }, { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - - + { field: 'shrq', title: '审核日期', width: 110, editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + } ] } }, diff --git a/src/views/jhzx/qfxqwh.vue b/src/views/jhzx/qfxqwh.vue index f316e46..25b200a 100644 --- a/src/views/jhzx/qfxqwh.vue +++ b/src/views/jhzx/qfxqwh.vue @@ -88,7 +88,6 @@ :custom-config="{ storage: true }" highlight-hover-row show-overflow - show-header-overflow > @@ -144,56 +143,95 @@ export default { uploadAction: process.env.VUE_APP_BASE_API + '/dmQfxq/upload', dictData:[], height: '500px', - tableColumn: [ + tableColumn:[ { type: 'checkbox', width: 50 }, { type: 'seq', width: 60, title: '序号' }, - - { field: 'dcCh', title: '船号', width: 100, + { field: 'dcCh', title: '船只', minWidth: "70", 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: '批量号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dcFd', title: '分段', width: 100, editRender: { name: 'input' }, + { field: 'zdh', title: '总段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pscd', title: '配送场地', width: 120, editRender: { name: 'input' }, + { field: 'dcFd', title: '分段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'cjzg', title: '车间主管', width: 120, editRender: { name: 'input' }, + { field: 'dzjz', title: '大组极重', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'db', title: '大板', width: 120, editRender: { name: 'input' }, + { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xc', title: '型材', width: 120, editRender: { name: 'input' }, + { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'txc', title: 'T型材', width: 120, editRender: { name: 'input' }, + { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bz', title: '备注', width: 120, editRender: { name: 'input' }, + { field: 'xdb', title: 'X大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + { field: 'xskj', title: 'X数控件', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xpt', title: 'X平铁', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xyw', title: 'X压弯', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xxc', title: 'X型材', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ddb', title: 'D大板', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dqb', title: 'D曲板', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, - { field: 'bzry', title: '编制人员', width: 110, editRender: { name: 'input' }, + { field: 'dxc', title: 'D型材T', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bzrq', title: '编制日期', width: 110, editRender: { name: 'input' }, + { field: 'dsj', title: 'D散件', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'drcs', title: '导入次数', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xzglxqOld', title: '原需求期', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + }, { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -202,7 +240,6 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, } - ] } }, diff --git a/src/views/jhzx/qfzxGL.vue b/src/views/jhzx/qfzxGL.vue index 53c4b95..89fd6ff 100644 --- a/src/views/jhzx/qfzxGL.vue +++ b/src/views/jhzx/qfzxGL.vue @@ -134,61 +134,102 @@ export default { zt:[], height: '500px', tableColumn: [ + { type: 'checkbox', width: 50 }, { type: 'seq', width: 60, title: '序号' }, - - { field: 'dcCh', title: '船号', width: 100, + { field: 'dcCh', title: '船只', minWidth: "70", 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: '批量号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'dcFd', title: '分段', width: 100, editRender: { name: 'input' }, + { field: 'zdh', title: '总段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'pscd', title: '配送场地', width: 120, editRender: { name: 'input' }, + { field: 'dcFd', title: '分段号', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'cjzg', title: '车间主管', width: 120, editRender: { name: 'input' }, + { field: 'dzjz', title: '大组极重', minWidth: "70", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'db', title: '大板', width: 120, editRender: { name: 'input' }, + { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'xc', title: '型材', width: 120, editRender: { name: 'input' }, + { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'txc', title: 'T型材', width: 120, editRender: { name: 'input' }, + { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bz', title: '备注', width: 120, editRender: { name: 'input' }, + { field: 'xdb', title: 'X大板', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + { field: 'xskj', title: 'X数控件', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xpt', title: 'X平铁', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xyw', title: 'X压弯', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, - { field: 'bzry', title: '编制人员', width: 110, editRender: { name: 'input' }, + { field: 'xxc', title: 'X型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - { field: 'bzrq', title: '编制日期', width: 110, editRender: { name: 'input' }, + { field: 'xtxc', title: 'X二次装T型材', minWidth: "100", filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'ddb', title: 'D大板', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dqb', title: 'D曲板', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dxc', title: 'D型材T', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dsj', title: 'D散件', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xqzt', title: '需求状态', minWidth: "100",formatter:this.formatterZt, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'drcs', title: '导入次数', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'xzglxqOld', title: '原需求期', minWidth: "100", + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX'] + }, { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - - - + { field: 'shrq', title: '审核日期', width: 110, editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + } ] } }, diff --git a/src/views/jhzx/sygdCX.vue b/src/views/jhzx/sygdCX.vue index 0ba58e5..1202af2 100644 --- a/src/views/jhzx/sygdCX.vue +++ b/src/views/jhzx/sygdCX.vue @@ -53,12 +53,11 @@ :columns="tableColumn" :data="list" :custom-config="{ storage: true }" + highlight-current-row highlight-hover-row show-overflow - show-header-overflow @cell-click="cellClickEvent" > - @@ -364,7 +363,7 @@ export default { return XEUtils.toDateString(cellValue, 'yyyy/MM/dd') }, getHeight() { - this.height = window.innerHeight - 190 + this.height = window.innerHeight - 160 }, } diff --git a/src/views/jhzx/sygdSH.vue b/src/views/jhzx/sygdSH.vue index e2c939b..1bdd414 100644 --- a/src/views/jhzx/sygdSH.vue +++ b/src/views/jhzx/sygdSH.vue @@ -60,13 +60,12 @@ :columns="tableColumn" :data="list" :custom-config="{ storage: true }" + highlight-current-row highlight-hover-row show-overflow - show-header-overflow @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" > - @@ -452,7 +451,7 @@ export default { return XEUtils.toDateString(cellValue, 'yyyy/MM/dd') }, getHeight() { - this.height = window.innerHeight - 190 + this.height = window.innerHeight - 160 }, // 全选 selectAllEvent() { diff --git a/src/views/jhzx/sygdWH.vue b/src/views/jhzx/sygdWH.vue index 936220c..4d5361d 100644 --- a/src/views/jhzx/sygdWH.vue +++ b/src/views/jhzx/sygdWH.vue @@ -77,9 +77,9 @@ :columns="tableColumn" :data="list" :custom-config="{ storage: true }" + highlight-current-row highlight-hover-row - show-overflow - show-header-overflow + show-overflows @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" > diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue index 3878e74..8316cd6 100644 --- a/src/views/jhzx/symxCX.vue +++ b/src/views/jhzx/symxCX.vue @@ -5,10 +5,11 @@ - 时间范围: - - 至 - + 小组需求时间范围: + + 至 + + @@ -38,7 +39,6 @@ :height="height" :auto-resize="true" :columns="tableColumn" - highlight-current-row :data="list" :custom-config="{ storage: true }" :edit-config="{ @@ -48,8 +48,10 @@ }" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" + highlight-current-row highlight-hover-row show-overflow + > @@ -95,13 +97,12 @@ :height="height" :auto-resize="true" :columns="tableColumn2" - highlight-current-row :data="list2" :custom-config="{ storage: true }" :cell-style="cellStyle" + highlight-current-row highlight-hover-row show-overflow - show-header-overflow > @@ -145,6 +146,8 @@ highlight-current-row :data="list3" :custom-config="{ storage: true }" + :span-method="rowspanMethod" + :scroll-y="{enabled: false}" highlight-hover-row show-overflow show-header-overflow @@ -261,8 +264,8 @@ export default { haveTltBoms: [], activeName: 'first', queryParam: { - beginTime: '2023/08/01', - endTime: '2023/10/01' + beginTime: '', + endTime: '' }, list: [], list1: [], @@ -275,7 +278,7 @@ export default { tableColumn: [ {type: 'seq', width: 60, title: '序号', fixed: "left"}, { - field: 'dcCh', title: '船号', width: 100, + field: 'dcCh', title: '船号', minWidth: "70", filters: [{ data: { checks: [], @@ -291,7 +294,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'dcCh1', title: '目标船号', width: 90, + field: 'dcCh1', title: '目标船号', minWidth: "90", filters: [{ data: { checks: [], @@ -307,7 +310,7 @@ export default { filterRender: {name: 'FilterCombination',} },//数据来源船，真实数据时，为空 { - field: 'dcPl', title: '批量', width: 80, + field: 'dcPl', title: '批量', minWidth: "70", filters: [{ data: { checks: [], @@ -323,7 +326,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'dcFd', title: '分段号', width: 100, + field: 'dcFd', title: '分段号', minWidth: "150", filters: [{ data: { checks: [], @@ -339,7 +342,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'zl', title: '组立', width: 80, formatter: ['dictFormat', 'ZLLB'], + field: 'zl', title: '组立', minWidth: "70", formatter: ['dictFormat', 'ZLLB'], filters: [{ data: { checks: [], @@ -355,7 +358,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'jssj', title: '钢料滚动需求期', width: 110, + field: 'jssj', title: '钢料滚动需求期', minWidth: "130", filters: [{ data: { checks: [], @@ -497,21 +500,6 @@ export default { }], filterRender: {name: 'FilterCombination',} }, - // { field: 'jsqLqb', title: '领取表接收',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'jsqTlt', title: '套料图接收',width: 80, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'dhqd', title: '订货清单号',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'orderBs', title: '订货数量',width: 80, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'arrivalBs', title: '到货数量',width: 80, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, { field: 'jzbs', title: '矫正标识', width: 100, filters: [{ @@ -529,7 +517,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'hxcd', title: '划线长度(米)', width: 100, + field: 'hxcd', title: '划线长度(米)', minWidth: "110", filters: [{ data: { checks: [], @@ -545,7 +533,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'hxcdKc', title: '划线空程长度(米)', width: 100, + field: 'hxcdKc', title: '划线空程长度(米)', minWidth: "140", filters: [{ data: { checks: [], @@ -561,7 +549,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'qgcd', title: '切割长度（米)', width: 100, + field: 'qgcd', title: '切割长度（米)', minWidth: "120", filters: [{ data: { checks: [], @@ -577,7 +565,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'qgcdKc', title: '切割空程长度（米)', width: 100, + field: 'qgcdKc', title: '切割空程长度（米)', minWidth: "140", filters: [{ data: { checks: [], @@ -593,7 +581,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'slrq', title: '上料计划日期', width: 100, + field: 'slrq', title: '上料计划日期', minWidth: "120", filters: [{ data: { checks: [], @@ -609,7 +597,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'pwrq', title: '抛丸计划日期', width: 100, + field: 'pwrq', title: '抛丸计划日期', minWidth: "120", filters: [{ data: { checks: [], @@ -625,7 +613,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'hxrq', title: '划线计划日期', width: 100, + field: 'hxrq', title: '划线计划日期', minWidth: "120", filters: [{ data: { checks: [], @@ -641,7 +629,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'qgrq', title: '切割计划日期', width: 100, + field: 'qgrq', title: '切割计划日期', minWidth: "120", filters: [{ data: { checks: [], @@ -656,14 +644,10 @@ export default { }], filterRender: {name: 'FilterCombination',} }, - // { field: 'slry', title: '上料人员',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'pw', title: '抛丸',width: 100}, { field: 'jzsb', title: '矫正设备', - width: 100, + minWidth: "110", filters: [{ data: { checks: [], @@ -679,19 +663,10 @@ export default { filterRender: {name: 'FilterCombination'}, editRender: {name: "$select", options: [], props: {clearable: true}} }, - // { field: 'jzry', title: '矫正人员',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'jzrq', title: '矫正计划日期',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - // { field: 'pw', title: '抛丸位置',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, { field: 'pwsb', title: '抛丸设备', - width: 100, + minWidth: "110", filters: [{ data: { checks: [], @@ -707,14 +682,10 @@ export default { filterRender: {name: 'FilterCombination'}, editRender: {name: "$select", options: [], props: {clearable: true}} }, - // { field: 'pwry', title: '抛丸人员',width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }}, - { field: 'hxsb', title: '划线设备', - width: 100, + minWidth: "110", filters: [{ data: { checks: [], @@ -737,7 +708,7 @@ export default { { field: 'qgsb', title: '切割设备', - width: 100, + minWidth: "110", filters: [{ data: { checks: [], @@ -757,7 +728,7 @@ export default { // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filterRender: { name: 'FilterCombination', }}, { - field: 'pklx', title: '坡口类型', width: 100, + field: 'pklx', title: '坡口类型', minWidth: "110", filters: [{ data: { checks: [], @@ -773,7 +744,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'pkcd', title: '坡口长度', width: 100, + field: 'pkcd', title: '坡口长度', minWidth: "110", filters: [{ data: { checks: [], @@ -791,7 +762,7 @@ export default { { field: 'pksb', title: '坡口设备', - width: 100, + minWidth: "110", filters: [{ data: { checks: [], @@ -808,7 +779,7 @@ export default { editRender: {name: "$select", options: [], props: {clearable: true,}} }, { - field: 'pkrq', title: '坡口计划日期', width: 100, + field: 'pkrq', title: '坡口计划日期', minWidth: "130", filters: [{ data: { checks: [], @@ -842,7 +813,7 @@ export default { { field: 'qjgsb', title: '曲加工设备', - width: 100, + minWidth: "120", filters: [{ data: { checks: [], @@ -862,7 +833,7 @@ export default { // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filterRender: { name: 'FilterCombination', }}, { - field: 'qjgrq', title: '曲加工计划日期', width: 100, + field: 'qjgrq', title: '曲加工计划日期', minWidth: "140", filters: [{ data: { checks: [], @@ -896,7 +867,7 @@ export default { { field: 'dmsb', title: '打磨设备', - width: 100, + minWidth: "110", filters: [{ data: { checks: [], @@ -913,7 +884,7 @@ export default { editRender: {name: "$select", options: [], props: {clearable: true,}} }, { - field: 'dmrq', title: '打磨计划日期', width: 100, + field: 'dmrq', title: '打磨计划日期', minWidth: "130", filters: [{ data: { checks: [], @@ -929,7 +900,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'gjjsDz', title: '钢加大组结束', width: 100, + field: 'gjjsDz', title: '钢加大组结束', minWidth: "130", filters: [{ data: { checks: [], @@ -1025,7 +996,7 @@ export default { filterRender: {name: 'FilterCombination',} }, { - field: 'gxsj', title: '数据更新时间', width: 100, + field: 'gxsj', title: '数据更新时间', minWidth: "130", filters: [{ data: { checks: [], @@ -1402,7 +1373,7 @@ export default { filterRender: {name: 'FilterCombination',}, }, { - field: 'dhsl', title: '到货数量', width: 120, + field: 'lhsl', title: '到货数量', width: 120, filters: [{ data: { checks: [], @@ -2372,6 +2343,13 @@ export default { this.getHeight() this.initBase() }, + watch: { + 'queryParam.beginTime'(newValue, Value){ + if (newValue){ + this.format(newValue); + } + } + }, methods: { rowClassName({row, rowIndex}) { if (row.dcCh === '合计') { @@ -2402,7 +2380,7 @@ export default { rowspanMethod({row, _rowIndex, column, visibleData}) { //不要忘记在vxe-grid上配置 :scroll-y="{enabled: false}" 防止下拉时样式变化 // 需要合并的列字段 - let fields = ['nf', 'yf', 'rq', 'tzxqq'];// 需要合并的列 + let fields = ['nf', 'yf', 'rq', 'tzxqq','kw','ch',];// 需要合并的列 const cellValue = row[column.property];// 合并行的相同的唯一标识 if (cellValue && fields.includes(column.property)) { const prevRow = visibleData[_rowIndex - 1]; @@ -2468,7 +2446,7 @@ export default { } }) } else { - this.$message.warning('请先将三月明细预排产！'); + this.$message.warning('请先提取明细！'); } }) }, @@ -2536,6 +2514,7 @@ export default { getCzxx({}).then(res => { this.dictData = res.data }) + this.queryParam.beginTime = new Date(); }, //初始化表1 数据 initList() { @@ -2562,18 +2541,36 @@ export default { sygdPC() { this.$store.dispatch('app/closeSideBar', true) sygdPC().then((res) => { - if (res.data.no_tlt) { - this.selectMbch = res.data - this.haveTltBoms = res.data.haveTltBoms - this.dialogVisible = true; - } else { - this.list = res.data.mxList + if (!res.success){ + this.$message.warning(res.message) + }else{ + this.list = res.data if (this.$refs.xGrid) { this.$refs.xGrid.loadData(this.list) } } + // if (res.data.no_tlt) { + // this.selectMbch = res.data + // this.haveTltBoms = res.data.haveTltBoms + // this.dialogVisible = true; + // } else { + // this.list = res.data + // if (this.$refs.xGrid) { + // this.$refs.xGrid.loadData(this.list) + // } + // } }) this.activeName = 'first' + }, + format (val) { + var date = new Date(val); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 + + date.setMonth(date.getMonth()+2); + var Y = date.getFullYear() + "/"; + var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/"; + var D = date.getDate()<10? "0" +date.getDate():date.getDate(); + this.queryParam.endTime=Y + M + D; + } } } diff --git a/src/views/jhzx/xbjhWH.vue b/src/views/jhzx/xbjhWH.vue index b7fbc7c..21b4b28 100644 --- a/src/views/jhzx/xbjhWH.vue +++ b/src/views/jhzx/xbjhWH.vue @@ -220,6 +220,7 @@ export default { }, // 格式转换 getTableList(data) { + Object.keys(data).forEach((item, index) => { data[item].sort(this.compare("nf")); data[item].sort(this.compare("yf")); @@ -384,6 +385,7 @@ export default { }, // 表尾列求和 total(list, field) { + let count = 0; list.forEach((item) => { if (item !== "dcCh" && item !== "zt") { diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue index 0deae52..e0d5bf5 100644 --- a/src/views/jhzx/ydjhzxGL.vue +++ b/src/views/jhzx/ydjhzxGL.vue @@ -92,7 +92,6 @@ highlight-current-row highlight-hover-row show-overflow - @cell-click="cellClickEvent_xb" > @@ -117,7 +116,6 @@ highlight-hover-row show-overflow show-header-overflow - @cell-click="cellClickEvent_xb" > @@ -141,7 +139,6 @@ highlight-hover-row show-overflow show-header-overflow - @cell-click="cellClickEvent_xb" > @@ -165,7 +162,6 @@ highlight-hover-row show-overflow show-header-overflow - @cell-click="cellClickEvent_xb" > @@ -173,57 +169,18 @@ - - - - + diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue index 30d3e20..cd8b3e8 100644 --- a/src/views/jhzx/ydjhzxXF.vue +++ b/src/views/jhzx/ydjhzxXF.vue @@ -12,7 +12,7 @@ 查询 - 下发 + 下发 @@ -35,7 +35,6 @@ :height="height" :auto-resize="true" :columns="tableColumn" - highlight-current-row :data="list" :custom-config="{ storage: true }" :edit-config="{ @@ -45,6 +44,7 @@ }" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" + highlight-current-row highlight-hover-row show-overflow > @@ -63,16 +63,11 @@ :height="height" :auto-resize="true" :columns="tableColumn2" - highlight-current-row :data="list2" :custom-config="{ storage: true }" - :span-method="rowspanMethod" - :cell-style="cellStyle" - :scroll-y="{enabled: false}" + highlight-current-row highlight-hover-row show-overflow - show-header-overflow - @cell-click="cellClickEvent_xb" > @@ -93,10 +88,9 @@ :data="list3" :custom-config="{ storage: true }" :cell-style="cellStyle" + highlight-current-row highlight-hover-row show-overflow - show-header-overflow - @cell-click="cellClickEvent_xb" > @@ -121,12 +115,11 @@ highlight-hover-row show-overflow show-header-overflow - @cell-click="cellClickEvent_xb" > - +
+ +
+ + +
+
@@ -153,54 +168,20 @@ - - - - + diff --git a/src/views/jhzxgl/pwjhFK.vue b/src/views/jhzxgl/pwjhFK.vue index 5ac6a21..2ae794d 100644 --- a/src/views/jhzxgl/pwjhFK.vue +++ b/src/views/jhzxgl/pwjhFK.vue @@ -1,531 +1,22 @@ diff --git a/src/views/sjzx/sbcnWH.vue b/src/views/sjzx/sbcnWH.vue index f274891..441ef2f 100644 --- a/src/views/sjzx/sbcnWH.vue +++ b/src/views/sjzx/sbcnWH.vue @@ -56,6 +56,7 @@ keep-source :height="height" :auto-resize="true" + :align="'center'" :columns="tableColumn" :data="list" :custom-config="{ storage: true }" @@ -69,24 +70,6 @@ @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent" > - - @@ -117,29 +100,6 @@ export default { tableColumn: [ { type: "checkbox", width: "50", align: "center" }, { type: "seq", width: "50", title: "序号", align: "center" }, - // { - // field: "sbbh", - // title: "设备编号", - // align: "center", - // minWidth: "90", - // slots: { edit: "sbbh_edit" }, - // filters: [ - // { - // data: { - // checks: [], - // sVal: "", - // sMenu: "", - // fType1: "", - // fVal1: "", - // fMode: "and", - // fType2: "", - // fVal2: "", - // }, - // }, - // ], - // filterRender: { name: "FilterCombination" }, - // }, - { field: "gx", title: "工序", @@ -166,163 +126,194 @@ export default { ], filterRender: { name: "FilterCombination" }, }, - { - field: "kw", - title: "跨位", - align: "center", - minWidth: "70", + { field: 'kw', title: '跨位', width: 120, editRender: { name: "$select", options: [], props: { clearable: true }, }, - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: '', title: '白班', + children:[ + { field: 'zxcn_bb', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_bb', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], - filterRender: { name: "FilterCombination" }, }, - { - field: "szcs", - title: "设备所属部门", - align: "center", - minWidth: "90", + { field: '', title: '夜班', + children:[ + { field: 'zxcn_yb', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_yb', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + ], + }, + { field: 'cndw', title: '产能单位', width: 120, editRender: { name: "$select", options: [], props: { clearable: true }, - events: { - change: this.changeSzcs, - }, }, - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'cnhj', title: '合计', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: '', title: '划线白班', + children:[ + { field: 'zxcn_bb1', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_bb1', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], - filterRender: { name: "FilterCombination" }, }, - { - field: "sbmc", - title: "设备名称", - align: "center", - minWidth: "90", + { field: '', title: '划线夜班', + children:[ + { field: 'zxcn_yb1', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_yb1', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + ], + }, + { field: 'cnhj1', title: '合计', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: '', title: '坡口白班', + children:[ + { field: 'zxcn_bb2', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_bb2', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + ], + }, + { field: '', title: '坡口夜班', + children:[ + { field: 'zxcn_yb2', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_yb2', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + ], + }, + { field: 'cndw2', title: '产能单位', width: 120, editRender: { name: "$select", options: [], - props: { - clearable: true, - }, + props: { clearable: true }, }, - slots: { edit: "sbmc_edit" }, - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'cnhj2', title: '合计', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: '', title: '打磨白班', + children:[ + { field: 'zxcn_bb3', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_bb3', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], - filterRender: { name: "FilterCombination" }, }, - { - field: "sbcn", - title: "产能（每小时）", - align: "center", - minWidth: "110", - editRender: { name: "input" }, - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, + { field: '', title: '打磨夜班', + children:[ + { field: 'zxcn_yb3', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_yb3', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], - filterRender: { name: "FilterCombination" }, }, - { - field: "dw", - title: "产能单位", - align: "center", - minWidth: "90", + { field: 'cndw3', title: '产能单位', width: 120, editRender: { name: "$select", options: [], props: { clearable: true }, }, - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'cnhj3', title: '合计', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: '', title: '曲加工白班', + children:[ + { field: 'zxcn_bb4', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_bb4', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], - filterRender: { name: "FilterCombination" }, }, - { - field: "", - title: "设备默认排产顺序", - align: "center", - minWidth: "90", - editRender: { name: "input" }, - filters: [ - { - data: { - checks: [], - sVal: "", - sMenu: "", - fType1: "", - fVal1: "", - fMode: "and", - fType2: "", - fVal2: "", - }, + { field: '', title: '曲加工夜班', + children:[ + { field: 'zxcn_yb4', title: '最小产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zdcn_yb4', title: '最大产能', width: 120,editRender: { name: "$input"}, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], - filterRender: { name: "FilterCombination" }, + }, + { field: 'cndw4', title: '产能单位', width: 120, + editRender: { + name: "$select", + options: [], + props: { clearable: true }, + }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'cnhj4', title: '合计', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, }, ], validRules: { - sbbh: [{ required: true, message: "设备编号不可为空" }], + // sbbh: [{ required: true, message: "设备编号不可为空" }], }, kwOptions: [], departmentOptions: [], @@ -366,7 +357,11 @@ export default { const dwList =JSON.parse(dict) this.$nextTick(() => { const tableRef = this.$refs.tableRef; - const dw = tableRef.getColumnByField("dw"); + const cndw = tableRef.getColumnByField("cndw"); + // const cndw1 = tableRef.getColumnByField("cndw1"); + const cndw2 = tableRef.getColumnByField("cndw2"); + const cndw3 = tableRef.getColumnByField("cndw3"); + const cndw4 = tableRef.getColumnByField("cndw4"); const testList = []; for (let i = 0; i < dwList.length; i++) { const temp = { @@ -375,7 +370,11 @@ export default { }; testList.push(temp); } - dw.editRender.options = testList; + cndw.editRender.options = testList; + // cndw1.editRender.options = testList; + cndw2.editRender.options = testList; + cndw3.editRender.options = testList; + cndw4.editRender.options = testList; }); },