From 6f7a261ec4c6704fd2dc3ffb25e94a750239070e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 25 Dec 2024 10:42:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E6=9C=88=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AE=A1=E6=A0=B8=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=202.=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA=203.=E4=BF=AE=E5=A4=8D=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E3=80=81=E5=88=87=E5=89=B2=E6=8A=A5=E5=B7=A5=E6=9C=AA?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A=E5=8C=BA=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84bug=204.=E5=A2=9E=E5=8A=A0=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=AE=A1=E5=88=92=E4=BD=9C=E4=B8=9A=E5=8C=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8A=9F=E8=83=BD=205.=E8=B0=83=E6=95=B4=E4=B8=8A?= =?UTF-8?q?=E6=96=99=E6=91=86=E6=94=BE=E5=8C=BA=E5=9F=9F=E5=8F=AF=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=206.=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/sliao/nameBg1.png | Bin 1313 -> 1876 bytes src/assets/sliao/nameBg1bak.png | Bin 0 -> 1313 bytes src/views/zyjhzx/hxianfkui/comps/pgdTable.js | 10 ++- src/views/zyjhzx/hxianfkui/comps/sljh.js | 2 +- src/views/zyjhzx/hxianpgong/comps/pgdTable.js | 10 ++- src/views/zyjhzx/ljian/bgcomps/sljh.js | 2 +- src/views/zyjhzx/ljian/comps/sljh.js | 2 +- src/views/zyjhzx/lliaofkui/comps/sljh.js | 2 +- src/views/zyjhzx/pwanfkui/comps/pgdTable.js | 15 +++- src/views/zyjhzx/pwanpgong/comps/pgdTable.js | 15 +++- src/views/zyjhzx/qgefkui/comps/pgdTable.js | 14 ++-- src/views/zyjhzx/qgefkui/comps/sljh.js | 2 +- src/views/zyjhzx/qgepgong/comps/pgdTable.js | 10 ++- src/views/zyjhzx/sliao/index.vue | 66 +++++++++++++----- 14 files changed, 110 insertions(+), 40 deletions(-) create mode 100644 src/assets/sliao/nameBg1bak.png diff --git a/src/assets/sliao/nameBg1.png b/src/assets/sliao/nameBg1.png index 2835b5999c30169f88b0ad8790784a7c42863c3f..82fc60e94a74d082ed540856faf36c11cd9329b2 100644 GIT binary patch literal 1876 zcmY*aYgkiP7QH-7Z6MGzqSOf5NWCJ25Rd>N;SnQ(<)H{t$AL*g0;I$c@*o+g62b(O zM`_F8Pz+!}MIN6TMn0>6AqB;vfIvo4q=GOEg;EFw1sqK01f?_cedq3T_CEWpwf6dR z&mD<4ghFmdLJ))s4WUPYJs5mLn-L(^Zh=`~GZRG}qCwYscT9uCGASrL2!hnbR%^^n zAb(d7azX?_Hs6^(GrPTq<={acH~JItC*fh_gw#`ROm-@Z<0d;L0NoHo36Kex2`L=$ zE*2+=%csKgEgEi_*=U7HWbV5c-f-f5m@JAsjGBQ9o#St@i z$xiY3BC?E%TL&hCv#CtL`BQ}KL~;~8_-zNssJLXYSU@Haq*AGy)YC0hm_#7@`uY;w zJqR8ic+i0t{h2Rj%J6*A?zaGRjwnIM6^Oa1{9PtMCM#7Urs5k3=F1_m*DFP5duEU-Z@nU34TId|;^*c<1`pGAjt$bUc(E6fKMY zWmucCgJa*dFuHif5B&>2iZ*a%vr|5Z=-91uOp};|KYSx+n2#7MB>Q z$f7Kot^{?S_RWzy`=^JUFnj%;R&;fQJ*kjZNz0Rqo_;+#wdL7z&m>2hw0v5lXyej* zYNlfTi8tH2MHqE)P#*Tms;eN~uF3gv3$ihPrZ05Out#308Gwy}THU$n;Bwaj#=Gr} z0k2sDhw6pRQ`HakcWzDh%^~?=HIg-IAi+wYt76Qx)3v2EYJ?lt@?%$ktAzc>#4rEPB4OrT|L zoK6*5Qc;!Og}@FbJ7mRL{>l3IP~qm@+uuLg$@RXg)Sl$dbczp@JT-r``r8p0*|_YK z;c#-91JJp$B>CNiAnv= z?Eb1cKcz~F^Z7YaSFyR592l{Rak}msSi8m?aGtU~df%*R()KH!Z{Yk&$0ez1-Wi?U}uoLo_AY84Rh0Si9zuN6>ls}J-CI3P2 zaQoX@jHKp^k6XOo$-%VV#EuG&ijG@OAsbR?cCndhnF7TLpT+Q!iVJR^R-(1j&ll<+ z+I9qV+bnn}i_9)^n-)9hI+c>4z0k1dUUU42@v+8#!5abHteRc>Y0t@9X06WcE=I+^ zBMgTxiZj#xz4$z~+btzQKI=KPyma~NdDTk{nriXjp|N~hNqY3;!^(nZk+a(tU1yS)mj&=NohQg0H&aAOaX`qXHk`J@G=-lI%@HkYr$i z^dP{zp#_XMTz&3q>a`!nfN(H~cRs38O~b3%QkDMP=AcoR1wS4; zp(%Y8IualCK-qZA&*z<0YH+qh`Nxp)mtSd|-RDa4n_Pzb=u0fg-Kk_)Q~i2oXIy`V zehiI9_ka7t=yDlNRTg2ve>Bl~vq4aZS>AK{(u_Tv>mKph`L_G#^2!&7;(EqAqthn1 zT$OA^Z#QKRE7HbC?cwtbm3_O9dL+2%$I1ki&!<}<)xHUO0j9PPgR%igD4UQE;O&i8 z-rb{zK~{*dP+cj+;3NK$R(+2nz0K{aS_udXa}3s%FX!0~Bbxfkn(6-_Mm*xA;fftT z1D)VeUm@mlZW`;1eXoyNp2q4IfS@a_=n9 literal 1313 zcmZvceKb^g7{`Z<8`e#Fp>Zdtk}1)!HMug9kkop~YnpaUveA?^(dK%am5Cv(#Uy3S z*t~4p+Z2&7(#T||(yT_CNpdCZ~I7!{N;Rclm^1aVI9xLSyVKa7#am1%u=eza2QyQ%Hrw8TI@7c!eSK2|-(-O}KUL zpuD*2Ias*5@4D~eT3r4%^WN6-jvCM;2KjYy#!%q9GcK0V;6a89(&yCDgUcY-VX$n@!!lUn)Rr0l5UM5{zPun^@ zvhHN}UgxN7Et7A*z1Yxh=K4xU5NLmkbv+}~KMo$SxM0S~IMFX_8_<Q5}9!(Ec#Gv~)QGgPT=q<9I^mr+@*6i5fpro8w*F}3=z9Je_(t5bDTPdWIpJ2*+?m_2oBG)Y%ii(%ZOqxv z@8j$@bRB0q7zR!jn!o4RR%i{wm`0POjFmm@y@&SdHk}^<6iJNLE)+vNqa%M^{B8s1 z%K<7sf4SluK|p@cXqzu(bsNdo9C}LUlTGSBvm8~H-AC?Sr8}DJ^Vu?d>wr)FL@;f; z&RFi)L>#?xu=?sNVcPhKWN}@iTg#!ODPh+=`jE zCVl@R*0#ZomHtZVSQziwTQ#V9L>&uq!gA#wd3SmYBDvGLk}E0QvacyhU)jgGL1Lo- zZuaJRu*wIf+)`4~GE^dMXx+OO1$X)yGew_#-{-HpSq5LVo(ziF^`xC=4T%Yn5Y_WA zjBHy1iECl4HP{bcN&p}#Bv$wRz_A+5=9E>8521JsimnaeaI8*Y3Ni=jd6=j!FtT_H zj9mHoG-piF%>B|f?+cKAYz+j+Nmv{4>Txx7^M?i$#RE)8Y`+{52M0&YdZ&eRhk5rk zvJw(VXU;7F5^GJeI8By4ZtJt)r8KgDhikYOVCfz6GAFn5*u{Cq?HFUwJmd0W7zuZX zNN`8dAv6a#0*RfiAn{u}Yk-^w0OVo7)ap&gPBDiqC; z>r+8GqATExB}*g)g}pGc61ztBv()9sSn7`9 zdNcdUdG-^++1BvWokbT;=G(i_?2Un&#uk8Fz62D?Py5<|^ioqutS{;xkLn9oC+6~IlI6tPMmnoL!F51NI#6s;f_QAJ)U8mHQ1kr^Y;z(5$#}P{|(2) BaYz6F diff --git a/src/assets/sliao/nameBg1bak.png b/src/assets/sliao/nameBg1bak.png new file mode 100644 index 0000000000000000000000000000000000000000..2835b5999c30169f88b0ad8790784a7c42863c3f GIT binary patch literal 1313 zcmZvceKb^g7{`Z<8`e#Fp>Zdtk}1)!HMug9kkop~YnpaUveA?^(dK%am5Cv(#Uy3S z*t~4p+Z2&7(#T||(yT_CNpdCZ~I7!{N;Rclm^1aVI9xLSyVKa7#am1%u=eza2QyQ%Hrw8TI@7c!eSK2|-(-O}KUL zpuD*2Ias*5@4D~eT3r4%^WN6-jvCM;2KjYy#!%q9GcK0V;6a89(&yCDgUcY-VX$n@!!lUn)Rr0l5UM5{zPun^@ zvhHN}UgxN7Et7A*z1Yxh=K4xU5NLmkbv+}~KMo$SxM0S~IMFX_8_<Q5}9!(Ec#Gv~)QGgPT=q<9I^mr+@*6i5fpro8w*F}3=z9Je_(t5bDTPdWIpJ2*+?m_2oBG)Y%ii(%ZOqxv z@8j$@bRB0q7zR!jn!o4RR%i{wm`0POjFmm@y@&SdHk}^<6iJNLE)+vNqa%M^{B8s1 z%K<7sf4SluK|p@cXqzu(bsNdo9C}LUlTGSBvm8~H-AC?Sr8}DJ^Vu?d>wr)FL@;f; z&RFi)L>#?xu=?sNVcPhKWN}@iTg#!ODPh+=`jE zCVl@R*0#ZomHtZVSQziwTQ#V9L>&uq!gA#wd3SmYBDvGLk}E0QvacyhU)jgGL1Lo- zZuaJRu*wIf+)`4~GE^dMXx+OO1$X)yGew_#-{-HpSq5LVo(ziF^`xC=4T%Yn5Y_WA zjBHy1iECl4HP{bcN&p}#Bv$wRz_A+5=9E>8521JsimnaeaI8*Y3Ni=jd6=j!FtT_H zj9mHoG-piF%>B|f?+cKAYz+j+Nmv{4>Txx7^M?i$#RE)8Y`+{52M0&YdZ&eRhk5rk zvJw(VXU;7F5^GJeI8By4ZtJt)r8KgDhikYOVCfz6GAFn5*u{Cq?HFUwJmd0W7zuZX zNN`8dAv6a#0*RfiAn{u}Yk-^w0OVo7)ap&gPBDiqC; z>r+8GqATExB}*g)g}pGc61ztBv()9sSn7`9 zdNcdUdG-^++1BvWokbT;=G(i_?2Un&#uk8Fz62D?Py5<|^ioqutS{;xkLn9oC+6~IlI6tPMmnoL!F51NI#6s;f_QAJ)U8mHQ1kr^Y;z(5$#}P{|(2) BaYz6F literal 0 HcmV?d00001 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;