1.划线切割反馈图号增加筛选

2.作业反馈人员查询条件改为按班组查询
2.划线切割反馈作业计划按照作业区查询

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',

src/views/zyjhzx/components/SelectComp.vue

@@ -8,8 +8,10 @@
       <el-radio class="custom-radio-red" v-if="ljbs" label="12" style="color: white">打磨报工</el-radio>
     </el-radio-group>
     <el-radio-group class="radio-group-label1" v-model="data.bzType" @change="init">
-      <el-radio class="custom-radio-green" label="01" style="color: white">白班</el-radio>
-      <el-radio class="custom-radio-red" label="02" style="color: white">二班</el-radio>
+      <el-radio class="custom-radio-green" label="一班" style="color: white">一班</el-radio>
+      <el-radio class="custom-radio-red" label="二班" style="color: white">二班</el-radio>
+      <el-radio class="custom-radio-red" label="三班" style="color: white">三班</el-radio>
+      <el-radio class="custom-radio-red" label="四班" style="color: white">四班</el-radio>
     </el-radio-group>
   </div>
 </template>
@@ -25,7 +27,7 @@ export default {
       zyTypeWidth:'31%',
       data:{
         zyType:'0',
-        bzType:'01',
+        bzType:'一班',
       },
       nextPath:'',
       nextPathName: {

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)
             })

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},

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(){

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)

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)
             })

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},

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<res.data.length;i++){
@@ -179,6 +179,8 @@ export default {
           })
           this.workerGroup.add(worker)
         }
+        this.workerGroup.x(0)
+        this.workerGroup.y(0)
       })
     },
     initKonvaStage() {

src/views/zyjhzx/sliao/index.vue

@@ -17,7 +17,7 @@ import workers from "@/views/zyjhzx/sliao/comps/person";
 import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
 import liliao from "@/views/zyjhzx/sliao/comps/liliao";
 import baifang from "@/views/zyjhzx/sliao/comps/baifang";
-import {dict, getSljhPgd, getYcldw, shangLiao} from "@/api/zyjh";
+import {dict, getBzryByBz, getSljhPgd, getYcldw, shangLiao} from "@/api/zyjh";
 import {getBzryList} from "@/api/sjzx/bzzGL";
 import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
 import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
@@ -189,6 +189,8 @@ export default {
       this.list=list
       if (this.sljhGroup){
         this.sljhGroup.destroyChildren()
+        this.sljhGroup.x(0)
+        this.sljhGroup.y(0)
       }
       const itemWith=111;
       const itemHeight=108
@@ -551,7 +553,7 @@ export default {
       }
       this.workerGroup.x(0)
       this.workerGroup.y(0)
-      getBzryList({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{
+      getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{
         this.workers=res.data
         for (let i=0;i<res.data.length;i++){
           const item=res.data[i]