diff --git a/src/assets/sliao/nameBg1.png b/src/assets/sliao/nameBg1.png index 2835b59..82fc60e 100644 Binary files a/src/assets/sliao/nameBg1.png and b/src/assets/sliao/nameBg1.png differ diff --git a/src/assets/sliao/nameBg1bak.png b/src/assets/sliao/nameBg1bak.png new file mode 100644 index 0000000..2835b59 Binary files /dev/null and b/src/assets/sliao/nameBg1bak.png differ diff --git a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js index 5c31ede..d23aaa0 100644 --- a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js +++ b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js @@ -46,8 +46,14 @@ export default function () { { field: 'djh',title:'派工单号', width: 120,}, // {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat}, // {field: 'llcs', title: '层数', width: 60}, - {field: 'dcCh', title: '船号', width: 80}, - {field: 'dcPl', title: '批量', width: 80}, + {field: 'dcCh', title: '船号', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'dcPl', title: '批量', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'dcFd', title: '分段', width: 80}, {field: 'wpgg', title: '材质', width: 80}, {field: 'wpxh', title: '规格', width: 70}, diff --git a/src/views/zyjhzx/hxianfkui/comps/sljh.js b/src/views/zyjhzx/hxianfkui/comps/sljh.js index 4d8ad83..d3d12fb 100644 --- a/src/views/zyjhzx/hxianfkui/comps/sljh.js +++ b/src/views/zyjhzx/hxianfkui/comps/sljh.js @@ -137,7 +137,7 @@ export const sljh=function (width,height){ }) const nameImageObj1 = new Image(); - nameImageObj1.src = require('@/assets/sliao/nameBg1.png'); + nameImageObj1.src = require('@/assets/sliao/nameBg1bak.png'); nameImageObj1.onload = function () { const shape = new Konva.Image({ x: 0, diff --git a/src/views/zyjhzx/hxianpgong/comps/pgdTable.js b/src/views/zyjhzx/hxianpgong/comps/pgdTable.js index 95bda92..5eeaeb9 100644 --- a/src/views/zyjhzx/hxianpgong/comps/pgdTable.js +++ b/src/views/zyjhzx/hxianpgong/comps/pgdTable.js @@ -49,8 +49,14 @@ export default function () { // {field: 'slycldw', title: '垛位', width: 60,formatter: dwFormat}, // {field: 'slyclcs', title: '层数', width: 60}, {field: 'plxh', title: '工单号', }, - {field: 'dcCh', title: '船号'}, - {field: 'dcPl', title: '批量', }, + {field: 'dcCh', title: '船号', + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'dcPl', title: '批量', + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'total', title: '总数量', }, {field: 'wpg', title: '待处理数量', }, {field: 'comp', title: '已报工', }, diff --git a/src/views/zyjhzx/ljian/bgcomps/sljh.js b/src/views/zyjhzx/ljian/bgcomps/sljh.js index 4d8ad83..d3d12fb 100644 --- a/src/views/zyjhzx/ljian/bgcomps/sljh.js +++ b/src/views/zyjhzx/ljian/bgcomps/sljh.js @@ -137,7 +137,7 @@ export const sljh=function (width,height){ }) const nameImageObj1 = new Image(); - nameImageObj1.src = require('@/assets/sliao/nameBg1.png'); + nameImageObj1.src = require('@/assets/sliao/nameBg1bak.png'); nameImageObj1.onload = function () { const shape = new Konva.Image({ x: 0, diff --git a/src/views/zyjhzx/ljian/comps/sljh.js b/src/views/zyjhzx/ljian/comps/sljh.js index 4d8ad83..d3d12fb 100644 --- a/src/views/zyjhzx/ljian/comps/sljh.js +++ b/src/views/zyjhzx/ljian/comps/sljh.js @@ -137,7 +137,7 @@ export const sljh=function (width,height){ }) const nameImageObj1 = new Image(); - nameImageObj1.src = require('@/assets/sliao/nameBg1.png'); + nameImageObj1.src = require('@/assets/sliao/nameBg1bak.png'); nameImageObj1.onload = function () { const shape = new Konva.Image({ x: 0, diff --git a/src/views/zyjhzx/lliaofkui/comps/sljh.js b/src/views/zyjhzx/lliaofkui/comps/sljh.js index 2273d3c..7110bc8 100644 --- a/src/views/zyjhzx/lliaofkui/comps/sljh.js +++ b/src/views/zyjhzx/lliaofkui/comps/sljh.js @@ -137,7 +137,7 @@ export const sljh=function (width,height){ }) const nameImageObj1 = new Image(); - nameImageObj1.src = require('@/assets/sliao/nameBg1.png'); + nameImageObj1.src = require('@/assets/sliao/nameBg1bak.png'); nameImageObj1.onload = function () { const shape = new Konva.Image({ x: 0, diff --git a/src/views/zyjhzx/pwanfkui/comps/pgdTable.js b/src/views/zyjhzx/pwanfkui/comps/pgdTable.js index aa0e85f..6e88bf6 100644 --- a/src/views/zyjhzx/pwanfkui/comps/pgdTable.js +++ b/src/views/zyjhzx/pwanfkui/comps/pgdTable.js @@ -58,9 +58,18 @@ export default function () { { field: 'djh',title:'派工单号', width: 120}, // {field: 'slycldw', title: '垛位', width: 60,formatter: dwFormat}, // {field: 'slyclcs', title: '层数', width: 60}, - {field: 'dcCh', title: '船号', width: 80}, - {field: 'dcPl', title: '批量', width: 80}, - {field: 'wpgg', title: '材质', width: 80}, + {field: 'dcCh', title: '船号', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'dcPl', title: '批量', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'wpgg', title: '材质', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'wpxh', title: '规格', width: 70}, {field: 'slwlh', title: '炉批号', width: 100}, {field: 'tzbh', title: '套料图号', width: 100}, diff --git a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js index 7eb27ac..bfe1dba 100644 --- a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js +++ b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js @@ -87,12 +87,21 @@ export default function (_height=0) { { type: 'seq',title:'序号', width: 50 }, {field: 'dwId', title: '垛位', width: 100,formatter: dwFormat}, {field: 'ceng', title: '层数', width: 50}, - {field: 'czbh', title: '船号', width: 80}, - {field: 'pl', title: '批量', width: 50}, + {field: 'czbh', title: '船号', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'pl', title: '批量', width: 70, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'djh', title: '工单号', width: 100}, {field: 'fd', title: '分段',width: 50,visible:false}, {field: 'tlth', title: '套料图号',width: 120}, - {field: 'wph', title: '材质', width: 60,}, + {field: 'wph', title: '材质', width: 60, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'wpgg', title: '物品规格', width: 120,}, {field: 'lph', title: '物料号', width: 130,}, {field: 'kw', title: '垮位',width: 130,formatter: kwFormat}, diff --git a/src/views/zyjhzx/qgefkui/comps/pgdTable.js b/src/views/zyjhzx/qgefkui/comps/pgdTable.js index 4d4e5e2..393fe6d 100644 --- a/src/views/zyjhzx/qgefkui/comps/pgdTable.js +++ b/src/views/zyjhzx/qgefkui/comps/pgdTable.js @@ -46,10 +46,16 @@ export default function () { { type: 'checkbox', width: 40 }, { type: 'seq',title:'序号', width: 50 }, { field: 'djh',title:'派工单号', width: 120,}, - {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat}, - {field: 'llcs', title: '层数', width: 60}, - {field: 'dcCh', title: '船号', width: 80}, - {field: 'dcPl', title: '批量', width: 80}, + // {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat}, + // {field: 'llcs', title: '层数', width: 60}, + {field: 'dcCh', title: '船号', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'dcPl', title: '批量', width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'dcFd', title: '分段', width: 80}, {field: 'wpgg', title: '材质', width: 80}, {field: 'wpxh', title: '规格', width: 70}, diff --git a/src/views/zyjhzx/qgefkui/comps/sljh.js b/src/views/zyjhzx/qgefkui/comps/sljh.js index 4d8ad83..d3d12fb 100644 --- a/src/views/zyjhzx/qgefkui/comps/sljh.js +++ b/src/views/zyjhzx/qgefkui/comps/sljh.js @@ -137,7 +137,7 @@ export const sljh=function (width,height){ }) const nameImageObj1 = new Image(); - nameImageObj1.src = require('@/assets/sliao/nameBg1.png'); + nameImageObj1.src = require('@/assets/sliao/nameBg1bak.png'); nameImageObj1.onload = function () { const shape = new Konva.Image({ x: 0, diff --git a/src/views/zyjhzx/qgepgong/comps/pgdTable.js b/src/views/zyjhzx/qgepgong/comps/pgdTable.js index 06fe730..5452760 100644 --- a/src/views/zyjhzx/qgepgong/comps/pgdTable.js +++ b/src/views/zyjhzx/qgepgong/comps/pgdTable.js @@ -49,8 +49,14 @@ export default function () { // {field: 'slycldw', title: '垛位', width: 60,formatter: dwFormat}, // {field: 'slyclcs', title: '层数', width: 60}, {field: 'plxh', title: '工单号', }, - {field: 'dcCh', title: '船号'}, - {field: 'dcPl', title: '批量', }, + {field: 'dcCh', title: '船号', + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + {field: 'dcPl', title: '批量', + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'total', title: '总数量', }, {field: 'wpg', title: '待处理数量', }, {field: 'comp', title: '已报工', }, diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index a33951b..46b829e 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -235,9 +235,9 @@ export default { qyGroup.add(tlth) const nameGroup=new Konva.Group({ - x: 5, - y: 43, - width: 38, + x: 3, + y: 33, + width: 39, height:105, }) @@ -247,8 +247,8 @@ export default { const shape = new Konva.Image({ x: 0, y: 0, - width: 38, - height:105, + width: 39, + height:125, image: this, }); nameGroup.add(shape) @@ -286,7 +286,7 @@ export default { const name3=new Konva.Text({ x: 0, - y: 43, + y: 42, width: 38, height:20, fontSize:12, @@ -294,13 +294,13 @@ export default { fill:'#fff', align:'center', verticalAlign:'middle', - text:'规格' + text:'材质' }) nameGroup.add(name3) const name4=new Konva.Text({ x: 0, - y: 64.5, + y: 63, width: 38, height:20, fontSize:12, @@ -308,27 +308,41 @@ export default { fill:'#fff', align:'center', verticalAlign:'middle', - text:'垛位' + text:'规格' }) nameGroup.add(name4) const name5=new Konva.Text({ x: 0, - y: 86.5, + y: 84, width: 38, height:20, - fontSize:12, + fontSize:11, fontStyle:'bold', fill:'#fff', align:'center', verticalAlign:'middle', - text:'层数' + text:'炉批号' }) nameGroup.add(name5) + const name6=new Konva.Text({ + x: 0, + y: 105, + width: 38, + height:20, + fontSize:12, + fontStyle:'bold', + fill:'#fff', + align:'center', + verticalAlign:'middle', + text:'备注' + }) + nameGroup.add(name6) + const infoGroup=new Konva.Group({ x: 43, - y: 43, + y: 33, width: 65, height:105, }) @@ -367,18 +381,18 @@ export default { y: 43, width: 65, height:20, - fontSize:9, + fontSize:12, fontStyle:'bold', fill:'#fff', align:'center', verticalAlign:'middle', - text:item.wpgg + text:item.wpxh }) infoGroup.add(info3) const info4=new Konva.Text({ x: 0, - y: 64, + y: 62, width: 65, height:20, fontSize:12, @@ -386,13 +400,13 @@ export default { fill:'#fff', align:'center', verticalAlign:'middle', - text:item.slkcdw + text:item.wpgg }) infoGroup.add(info4) const info5=new Konva.Text({ x: 0, - y: 86, + y: 84, width: 65, height:20, fontSize:12, @@ -400,10 +414,24 @@ export default { fill:'#fff', align:'center', verticalAlign:'middle', - text:item.slcs + text:item.sllph }) infoGroup.add(info5) + const info6=new Konva.Text({ + x: 0, + y: 105, + width: 65, + height:20, + fontSize:12, + fontStyle:'bold', + fill:'#fff', + align:'center', + verticalAlign:'middle', + text:item.slbz + }) + infoGroup.add(info6) + const _layer=this.layer const _sljhGroup=this.sljhGroup; let touchingFlag=false;