From 23d04b7a747f15b943fa11098a3d888159ed8dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Fri, 28 Feb 2025 09:28:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=89=B9=E9=87=8F=E4=B8=8A?= =?UTF-8?q?=E6=96=99=E9=A2=84=E5=A4=84=E7=90=86=E5=9E=9B=E4=BD=8D=E5=B1=82?= =?UTF-8?q?=E6=95=B0=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E5=A2=9E=E5=8A=A0=E5=88=87=E5=89=B2=E5=90=8E?= =?UTF-8?q?=E6=91=86=E6=94=BE=E5=8A=9F=E8=83=BD=203.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E8=81=8C=E4=BD=8D=E4=B8=BA?= =?UTF-8?q?=E5=88=92=E7=BA=BF=E6=97=B6=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=204.=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=BF=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A5=97?= =?UTF-8?q?=E6=96=99=E5=9B=BE=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/assets/KHCFDC_PDF.png | Bin 0 -> 1304 bytes src/components/ProjectSelect/index.vue | 4 +- src/views/jhzx/ydjhzxCX.vue | 2 +- src/views/jhzxgl/dwGL.vue | 41 +--- src/views/jhzxgl/yppyz.vue | 226 ++++++++------------ src/views/zyjhzx/bfang/comps/BFangShow.vue | 86 ++++++++ src/views/zyjhzx/bfang/comps/BFangTable.vue | 19 +- src/views/zyjhzx/bfang/index.vue | 4 +- src/views/zyjhzx/components/SelectComp.vue | 1 - src/views/zyjhzx/hxianfkui/index.vue | 4 +- 11 files changed, 204 insertions(+), 185 deletions(-) create mode 100644 src/assets/KHCFDC_PDF.png create mode 100644 src/views/zyjhzx/bfang/comps/BFangShow.vue diff --git a/package.json b/package.json index c6f4819..5313e36 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vue-cli-service serve", "local": "vue-cli-service serve --mode local", - "server": "vue-cli-service serve --mode server", + "serve": "vue-cli-service serve --mode server", "test": "vue-cli-service serve --mode test", "lint": "eslint --ext .js,.vue src", "build:test": "vue-cli-service build --mode test", diff --git a/src/assets/KHCFDC_PDF.png b/src/assets/KHCFDC_PDF.png new file mode 100644 index 0000000000000000000000000000000000000000..cd1996b4343d6c3c3c2ee14ae8a42d88b2526016 GIT binary patch literal 1304 zcmV+z1?T#SP)Px((n&-?RCr$PoWX9>KoCI3PI>_KjARf}df+>nh$H+%8;Juyz=1A4lHWbon}0B@{&Pn+%DJ^XUhDAPXU0gsU-te_K@wD6|(L)(x@*V$3K2Ib;qp#5zGLA$|$|g(oa}~roKq?`oE3&hyjG&4j+6I{m@lzO`Gw^PxN}0~Q z${^YVnG4Z%d#EFc{D-jNM?QLpHYBo#xDiPciR>W?2KG>pJw$1hIs{}7F=wf-3bKc& z@RzE9>@37LtDg`g4>~TTvW+gt&O&?@|Ao`&j}b&&_ouTEk68q7SHA#XO|LSE>?}kC zhX7F;P1U+gB0CL{OCUl-pwF3^jr`_6`SAY5@mE>09|c5Hb>{b{8P552Fqrlb4T$y- z4dC^XXaQaiv4?1pfQ7DloA}ruGJvHAY)P&1!U;)4c-O(;gbNL?KuiB7Q3vD%#3A@6 zv%p)*nn$G`$O(v7!60`BMWrf@JVbGVsKzTuZnoe)g;9r zEk<|RvX4$clzl{0VR;AB=0f8D#BC@n+b{orICF0+*p_OOhbS*7e7~F}t&%AZOvw2c zJOKdzmp+HMPAjDSd}r$<7rysK33#UfFt%X=$U~GD6mhGEAdkSGcVs3sIIrT$P6~T;|!ot!-mt1|A+MGp_>KG%iUF zqH5I@rA&mTDk;(F2m3UYLSj)Iw%`eJ{`c zGWFebzPznAjYHgbT`&PJJHIrN^16^4g(we}MPvYWcMt9zq17lvvBE3wSEiJ~)0M); z{lubRfvW%;ho~BmLb9of6zr;@_VRu){Y1WRo|D(+*yj$CZ7apJpM;VSz;_v51S7^M(xm0;Naa*gy@nAYGk zD22!ywpEGM2r6k1owP0M9@U(*f O0000{ + return {width:'150px'} } } }, diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue index 9846b14..974bafa 100644 --- a/src/views/jhzx/ydjhzxCX.vue +++ b/src/views/jhzx/ydjhzxCX.vue @@ -177,7 +177,7 @@ export default { filterRender: { name: 'FilterCombination', }, editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }} }, - { field: 'bs', title: '板数',width: 80, + { field: 'bs', title: '套料图数',width: 80, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, { field: 'ylbs', title: '余料板数',width: 80, diff --git a/src/views/jhzxgl/dwGL.vue b/src/views/jhzxgl/dwGL.vue index 9bf8564..49fd4b7 100644 --- a/src/views/jhzxgl/dwGL.vue +++ b/src/views/jhzxgl/dwGL.vue @@ -5,7 +5,7 @@ - + - - - - - - - - - + 查询 新增 保存 @@ -78,7 +65,6 @@ export default { height: "500px", list:[], qyList:[], - dwList:[], projectData:[], request:{ qy:'', @@ -97,21 +83,6 @@ export default { filterRender: { name: 'FilterCombination', }, editRender:{ name: '$input', props: { placeholder: '请输入垛位号' }} }, - { field: 'dcCh', title: '船号', width: 120,align: "center", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - editRender:{ name: '$input', props: { placeholder: '请输入船号' }} - }, - { field: 'dcPl', title: '批量', width: 120,align: "center", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - editRender:{ name: '$input', props: { placeholder: '请输入批量' }} - }, - { field: 'dcFd', title: '分段', width: 120,align: "center", - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - editRender:{ name: '$input', props: { placeholder: '请输入分段' }} - }, ], } }, @@ -139,13 +110,15 @@ export default { getBfwz(this.request).then(res=>{ this.list=res.data const _qyList=[] - const _dwhList=[] + const tmp=[] this.list.forEach(item=>{ + if (tmp.includes(item.qy)){ + return + } + tmp.push(item.qy) _qyList.push({label:item.qy,value:item.qy}) - _dwhList.push({label:item.dwh,value:item.dwh}) }) this.qyList=_qyList; - this.dwList=_dwhList }) }, cellClickEvent({row}){ diff --git a/src/views/jhzxgl/yppyz.vue b/src/views/jhzxgl/yppyz.vue index cbe6411..d975ff7 100644 --- a/src/views/jhzxgl/yppyz.vue +++ b/src/views/jhzxgl/yppyz.vue @@ -1,47 +1,15 @@ @@ -17,10 +18,11 @@ import BFangTable from "@/views/zyjhzx/bfang/comps/BFangTable.vue"; import workers from "@/views/zyjhzx/bfang/comps/person"; import {getBzryByBz} from "@/api/zyjh"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import BFangShow from "@/views/zyjhzx/bfang/comps/BFangShow.vue"; export default { name: 'BFang', - components: {ZyjhSelectComp, BFangTable, SliaoSearch, BFangSearch}, + components: {BFangShow, ZyjhSelectComp, BFangTable, SliaoSearch, BFangSearch}, data(){ return{ workers:[], diff --git a/src/views/zyjhzx/components/SelectComp.vue b/src/views/zyjhzx/components/SelectComp.vue index 06ade2e..d60e0a5 100644 --- a/src/views/zyjhzx/components/SelectComp.vue +++ b/src/views/zyjhzx/components/SelectComp.vue @@ -48,7 +48,6 @@ export default { this.deviceId=this.$route.query.deviceId||'' this.data.zyType=this.$route.query.zyType||'0' const path=this.$route.path.replace('/','') - console.log(path) this.nextPath=this.nextPathName[path]?.path if (path==='sliao'||path==='llfk'||path==='bfang'){ this.qtbs=false diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue index e3e0c60..35ad2fc 100644 --- a/src/views/zyjhzx/hxianfkui/index.vue +++ b/src/views/zyjhzx/hxianfkui/index.vue @@ -163,10 +163,10 @@ export default { const {bgGroup,group}=container() this.workerGroup=group this.layer.add(bgGroup) - } + const enablePosition=['班长','数控','龙门','划线'] getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ - res.data=res.data.filter(item=>item.position==='数控'||item.position==='龙门'||item.position==='班长') + res.data=res.data.filter(item=>enablePosition.includes(item.position)) this.workers=res.data this.setWorkers(res.data) const that=this