From a581bc5e8a6c9322207a86ebf381a27ddf5c4caf 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, 27 Dec 2024 16:37:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=92=E7=BA=BF=E5=88=87=E5=89=B2=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=9B=BE=E5=8F=B7=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?= =?UTF-8?q?=202.=E4=BD=9C=E4=B8=9A=E5=8F=8D=E9=A6=88=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=8C=89?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=9F=A5=E8=AF=A2=202.=E5=88=92=E7=BA=BF?= =?UTF-8?q?=E5=88=87=E5=89=B2=E5=8F=8D=E9=A6=88=E4=BD=9C=E4=B8=9A=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=8C=89=E7=85=A7=E4=BD=9C=E4=B8=9A=E5=8C=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/zyjh.js | 8 ++++++++ src/views/zyjhzx/components/SelectComp.vue | 8 +++++--- src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue | 2 +- src/views/zyjhzx/hxianfkui/comps/pgdTable.js | 5 ++++- src/views/zyjhzx/hxianfkui/index.vue | 7 +++++-- src/views/zyjhzx/pwanfkui/index.vue | 4 ++-- src/views/zyjhzx/qgefkui/comps/QgePgd.vue | 2 +- src/views/zyjhzx/qgefkui/comps/pgdTable.js | 5 ++++- src/views/zyjhzx/qgefkui/index.vue | 8 +++++--- src/views/zyjhzx/sliao/index.vue | 6 ++++-- 10 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/api/zyjh.js b/src/api/zyjh.js index 7fda8a0..c3d9e26 100644 --- a/src/api/zyjh.js +++ b/src/api/zyjh.js @@ -1,5 +1,13 @@ import request from '@/utils/request' +export function getBzryByBz(params) { + return request({ + url: "/zyjh/getBzryByBz", + method: "get", + params + }); +} + export const exportPW=function(data){ return request({ url: '/pgdSljh/exportPW', diff --git a/src/views/zyjhzx/components/SelectComp.vue b/src/views/zyjhzx/components/SelectComp.vue index 200ffc3..790b9cb 100644 --- a/src/views/zyjhzx/components/SelectComp.vue +++ b/src/views/zyjhzx/components/SelectComp.vue @@ -8,8 +8,10 @@ 打磨报工 - 白班 - 二班 + 一班 + 二班 + 三班 + 四班 @@ -25,7 +27,7 @@ export default { zyTypeWidth:'31%', data:{ zyType:'0', - bzType:'01', + bzType:'一班', }, nextPath:'', nextPathName: { diff --git a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue index 02d9eba..9d1752a 100644 --- a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue +++ b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue @@ -163,7 +163,7 @@ export default { getDw({type:'llj'}).then(res=>{ this.gridOptions.ycldw=res.data getForemanByWorker({worker:worker}).then(res=>{ - getYdjhByZtOrForeman({foreman:res.data.userCode,zt:zt,field:'hxpgry',zyq:this.zyq}).then(res=>{ + getYdjhByZtOrForeman({foreman:res.data.userCode,zt:zt,field:'hxpgry',zyq:this.zyq,userCode:worker}).then(res=>{ res.data.forEach(item=>{ item._lx=item.tzbh.substring(5,6) }) diff --git a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js index 331f629..81ca16d 100644 --- a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js +++ b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js @@ -81,7 +81,10 @@ export default function () { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'tzbh', title: '套料图号', width: 100}, + {field: 'tzbh', title: '套料图号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'hxry', title: '接收人', width: 80,formatter: nameFormat}, {field: 'hxfkry', title: '报工人', width: 80,formatter:nameFormat}, {field: 'hxfkrq', title: '报工时间', width: 100}, diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue index 6c920d6..89cf7b0 100644 --- a/src/views/zyjhzx/hxianfkui/index.vue +++ b/src/views/zyjhzx/hxianfkui/index.vue @@ -16,7 +16,7 @@ import drawDw from './comps/dw' import drawPgd from './comps/pgd' import drawSb from './comps/sb' import baifang from "./comps/baifang"; -import {getPgd, getYcldw} from "@/api/zyjh"; +import {getBzryByBz, getPgd, getYcldw} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; @@ -164,7 +164,8 @@ export default { this.layer.add(bgGroup) } - getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ + getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ + res.data=res.data.filter(item=>item.position==='数控'||item.position==='班长') this.workers=res.data this.setWorkers(res.data) const that=this @@ -177,6 +178,8 @@ export default { }) this.workerGroup.add(worker) } + this.workerGroup.x(0) + this.workerGroup.y(0) }) }, initKonvaStage(){ diff --git a/src/views/zyjhzx/pwanfkui/index.vue b/src/views/zyjhzx/pwanfkui/index.vue index b17961d..33ebdab 100644 --- a/src/views/zyjhzx/pwanfkui/index.vue +++ b/src/views/zyjhzx/pwanfkui/index.vue @@ -17,7 +17,7 @@ import drawDw from './comps/dw' import drawPgd from './comps/pgd' import baifang from "./comps/baifang"; import drawCsd from './comps/csd' -import { getYcldw} from "@/api/zyjh"; +import {getBzryByBz, getYcldw} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; import TipsComp from "@/views/zyjhzx/components/TipsComp.vue"; @@ -160,7 +160,7 @@ export default { this.workerGroup=group this.layer.add(bgGroup) } - getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ + getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ this.workers=res.data that.setWorkers(res.data) diff --git a/src/views/zyjhzx/qgefkui/comps/QgePgd.vue b/src/views/zyjhzx/qgefkui/comps/QgePgd.vue index b69f940..043d146 100644 --- a/src/views/zyjhzx/qgefkui/comps/QgePgd.vue +++ b/src/views/zyjhzx/qgefkui/comps/QgePgd.vue @@ -113,7 +113,7 @@ export default { getForemanByWorker({worker:worker}).then(result=>{ getDw({type:'llj'}).then(res=>{ this.gridOptions.ycldw=res.data - getYdjhByZtOrForeman({foreman:result.data.userCode,zt:zt,field:'qgpgry',zyq:this.zyq}).then(res => { + getYdjhByZtOrForeman({foreman:result.data.userCode,zt:zt,field:'qgpgry',zyq:this.zyq,userCode:worker}).then(res => { res.data.forEach(item=>{ item._lx=item.tzbh.substring(5,6) }) diff --git a/src/views/zyjhzx/qgefkui/comps/pgdTable.js b/src/views/zyjhzx/qgefkui/comps/pgdTable.js index 85d743b..ecfbff8 100644 --- a/src/views/zyjhzx/qgefkui/comps/pgdTable.js +++ b/src/views/zyjhzx/qgefkui/comps/pgdTable.js @@ -81,7 +81,10 @@ export default function () { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, - {field: 'tzbh', title: '套料图号', width: 100}, + {field: 'tzbh', title: '套料图号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, {field: 'qgry', title: '接收人', width: 80,formatter: nameFormat}, {field: 'qgfkry', title: '报工人', width: 80,formatter:nameFormat}, {field: 'qgfkrq', title: '报工时间', width: 100}, diff --git a/src/views/zyjhzx/qgefkui/index.vue b/src/views/zyjhzx/qgefkui/index.vue index f253929..2d854bc 100644 --- a/src/views/zyjhzx/qgefkui/index.vue +++ b/src/views/zyjhzx/qgefkui/index.vue @@ -16,7 +16,7 @@ import drawDw from './comps/dw' import drawPgd from './comps/pgd' import drawSb from './comps/sb' import baifang from "./comps/baifang"; -import {getPgd, getYcldw, shangLiao} from "@/api/zyjh"; +import {getBzryByBz, getPgd, getYcldw, shangLiao} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; import QgePgd from "@/views/zyjhzx/qgefkui/comps/QgePgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; @@ -165,9 +165,9 @@ export default { this.workerGroup=group this.layer.add(bgGroup) } - getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res => { + getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res => { + res.data=res.data.filter(item=>item.position==='数控'||item.position==='班长') this.workers=res.data - this.setWorkers(res.data) const that=this for (let i=0;i{ + getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ this.workers=res.data for (let i=0;i