From a0cd1c9fcd64092d0a567d54a98e2eb58765872f Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Wed, 18 Sep 2024 19:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzxgl/dmjhD.vue |  74 ++++----
 src/views/jhzxgl/hxjhD.vue |  39 ++--
 src/views/jhzxgl/pkjhD.vue | 376 +++++++++++++++++++++++++++----------
 src/views/jhzxgl/pwjhD.vue |  49 +++--
 src/views/jhzxgl/qgjhD.vue |  40 ++--
 src/views/jhzxgl/qmjhD.vue |  63 ++++---
 src/views/jhzxgl/yppCX.vue |   2 +-
 src/views/jhzxgl/yppFK.vue |   2 +-
 src/views/jhzxgl/yppGL.vue |   8 +-
 9 files changed, 446 insertions(+), 207 deletions(-)

diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue
index 45fb0eb..4023dc0 100644
--- a/src/views/jhzxgl/dmjhD.vue
+++ b/src/views/jhzxgl/dmjhD.vue
@@ -6,7 +6,7 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="20">
+          <el-col :span="22">
 
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@@ -54,21 +54,21 @@
 
 
             </el-form-item>
-            <el-form-item label="批量:">
+            <el-form-item label="批量:" label-width="50px">
               <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-            <el-form-item label="分段:">
+            <el-form-item label="分段:" label-width="50px">
               <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
             <el-form-item label="套料图:">
-              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" style="width: 130px" ></el-input>
             </el-form-item>
 
 
 
 
             <el-form-item label="跨位:">
-              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
+              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable  style="width: 140px">
                 <el-option
                   v-for="item in this.dictData.qgkw"
                   :key="item.bm"
@@ -81,8 +81,9 @@
 
 
 
+
           </el-col>
-          <el-col :span="4">
+          <el-col :span="2">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
@@ -96,51 +97,52 @@
 
 
 
-
-            <span style="width:6%" >班组:</span>
-            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+            <span style="width:6%" >作业区:</span>
+            <el-select v-model="inParam.scdw" placeholder="作业区" clearable style="width: 15%" @change="bzClick">
               <el-option
                 v-for="item in this.dictData.resourcesCodes"
-                :key="item.resourcesCode"
-                :label="item.resourcesCode"
-                :value="item.resourcesCode"
+                :key="item.zyq"
+                :label="item.zyq"
+                :value="item.zyq"
               >
               </el-option>
             </el-select>
 
-            <span style="width:6%" >作业区:</span>
-            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.zyq" placeholder="班组" clearable style="width: 15%" @change="bzClick1">
               <el-option
                 v-for="item in this.dictData.zyqs"
-                :key="item.resourcesCode+item.zyq"
-                :label="item.resourcesCode+item.zyq"
-                :value="item.zyq"
+                :key="item.zyq+item.resourcesCode"
+                :label="item.zyq+item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
+
+
+
             <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
                 v-for="item in this.dictData.zyrys"
                 :key="item.id"
-                :label="item.resourcesCode+item.zyq+item.userName"
+                :label="item.zyq+item.resourcesCode+item.userName"
                 :value="item.userName"
               >
               </el-option>
             </el-select>
 
-            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨计划日期"/>
+            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="曲面计划日期"/>
             <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
-<!--            <span style="width:6%" >反馈人员:</span>-->
-<!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
-<!--            <span style="width:6%" >反馈日期:</span>-->
-<!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>-->
-<!--            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>-->
+            <!--            <span style="width:6%" >反馈人员:</span>-->
+            <!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
+            <!--            <span style="width:6%" >反馈日期:</span>-->
+            <!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>-->
+            <!--            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>-->
           </el-col>
           <el-col :span="4" >
             <el-form-item style="float: right" >
               <el-button type="success" @click="slpgclick">派工</el-button>
-<!--              <el-button type="success" @click="xdClick">接收</el-button>-->
               <el-button type="success" @click="saveclick">报工</el-button>
 
             </el-form-item>
@@ -169,7 +171,7 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
+              :header-cell-style="headerCellStyle"
             >
 
 
@@ -281,7 +283,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 120,
+        { field: 'zl', title: '组立', width: 120,formatter: ['dictFormat', 'ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -604,7 +606,14 @@ export default {
 
   },
   methods: {
-
+    headerCellStyle ({ column, columnIndex }) {
+      if (['dmjhrq','dmXfry','dmXfrq','dscry','dmFkry','dmFkrq  '].includes(column.property)) {
+        return {
+          backgroundColor: '#2db7f5',
+          color: '#ffffff'
+        }
+      }
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -628,15 +637,16 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
       console.log(this.dictData.zyqs)
     },
     bzClick1(){
       console.log(this.dictData.zyrys)
       console.log(this.zyrys)
-      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.zyq+fst.resourcesCode===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
+
     updates2(){
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
@@ -833,10 +843,10 @@ export default {
 
 .el-header{margin:0;padding: 5px;height:auto;
   .el-input{
-    width: 140px;
+    width: 80px;
   }
   .el-select{
-    width: 140px;
+    width: 80px;
   }
 
 }
diff --git a/src/views/jhzxgl/hxjhD.vue b/src/views/jhzxgl/hxjhD.vue
index d56dcf4..171a0cb 100644
--- a/src/views/jhzxgl/hxjhD.vue
+++ b/src/views/jhzxgl/hxjhD.vue
@@ -87,33 +87,36 @@
 
 
 
-            <span style="width:6%" >班组:</span>
-            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+            <span style="width:6%" >作业区:</span>
+            <el-select v-model="inParam.scdw" placeholder="作业区" clearable style="width: 15%" @change="bzClick">
               <el-option
                 v-for="item in this.dictData.resourcesCodes"
-                :key="item.resourcesCode"
-                :label="item.resourcesCode"
-                :value="item.resourcesCode"
+                :key="item.zyq"
+                :label="item.zyq"
+                :value="item.zyq"
               >
               </el-option>
             </el-select>
 
-            <span style="width:6%" >作业区:</span>
-            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.zyq" placeholder="班组" clearable style="width: 15%" @change="bzClick1">
               <el-option
                 v-for="item in this.dictData.zyqs"
-                :key="item.resourcesCode+item.zyq"
-                :label="item.resourcesCode+item.zyq"
-                :value="item.zyq"
+                :key="item.zyq+item.resourcesCode"
+                :label="item.zyq+item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
+
+
+
             <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
                 v-for="item in this.dictData.zyrys"
                 :key="item.id"
-                :label="item.resourcesCode+item.zyq+item.userName"
+                :label="item.zyq+item.resourcesCode+item.userName"
                 :value="item.userName"
               >
               </el-option>
@@ -158,7 +161,7 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
+              :header-cell-style="headerCellStyle"
             >
 
 
@@ -369,6 +372,14 @@ export default {
 
   },
   methods: {
+    headerCellStyle ({ column, columnIndex }) {
+      if (['hxry','hxpgrq','hxpgry','hxfkry','hxfkrq'].includes(column.property)) {
+        return {
+          backgroundColor: '#2db7f5',
+          color: '#ffffff'
+        }
+      }
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -392,13 +403,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
       console.log(this.dictData.zyqs)
     },
     bzClick1(){
       console.log(this.dictData.zyrys)
       console.log(this.zyrys)
-      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.zyq+fst.resourcesCode===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
diff --git a/src/views/jhzxgl/pkjhD.vue b/src/views/jhzxgl/pkjhD.vue
index ce6fe17..3191afb 100644
--- a/src/views/jhzxgl/pkjhD.vue
+++ b/src/views/jhzxgl/pkjhD.vue
@@ -6,7 +6,7 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="18">
+          <el-col :span="22">
 
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@@ -54,18 +54,36 @@
 
 
             </el-form-item>
-            <el-form-item label="批量:">
+            <el-form-item label="批量:" label-width="50px">
               <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-            <el-form-item label="分段:">
+            <el-form-item label="分段:" label-width="50px">
               <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" style="width: 130px" ></el-input>
+            </el-form-item>
+
+
+
+
+            <el-form-item label="跨位:">
+              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable  style="width: 140px">
+                <el-option
+                  v-for="item in this.dictData.qgkw"
+                  :key="item.bm"
+                  :label="item.bmsm"
+                  :value="item.bm"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
 
 
 
           </el-col>
-          <el-col :span="6">
+          <el-col :span="2">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
@@ -79,40 +97,52 @@
 
 
 
+            <span style="width:6%" >作业区:</span>
+            <el-select v-model="inParam.scdw" placeholder="作业区" clearable style="width: 15%" @change="bzClick">
+              <el-option
+                v-for="item in this.dictData.resourcesCodes"
+                :key="item.zyq"
+                :label="item.zyq"
+                :value="item.zyq"
+              >
+              </el-option>
+            </el-select>
 
             <span style="width:6%" >班组:</span>
-            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+            <el-select v-model="inParam.zyq" placeholder="班组" clearable style="width: 15%" @change="bzClick1">
               <el-option
-                v-for="item in this.dictData.bmbm"
-                :key="item.bm"
-                :label="item.bmsm"
-                :value="item.bm"
+                v-for="item in this.dictData.zyqs"
+                :key="item.zyq+item.resourcesCode"
+                :label="item.zyq+item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
-            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+
+
+
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
-                v-for="item in this.dictData.gxry"
-                :key="item.dlzh"
-                :label="item.dlzh"
-                :value="item.dlzh"
+                v-for="item in this.dictData.zyrys"
+                :key="item.id"
+                :label="item.zyq+item.resourcesCode+item.userName"
+                :value="item.userName"
               >
               </el-option>
             </el-select>
 
-
+            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="曲面计划日期"/>
             <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
-<!--            <span style="width:6%" >反馈人员:</span>-->
-<!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
-<!--            <span style="width:6%" >反馈日期:</span>-->
-<!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>-->
-<!--            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>-->
+            <!--            <span style="width:6%" >反馈人员:</span>-->
+            <!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
+            <!--            <span style="width:6%" >反馈日期:</span>-->
+            <!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>-->
+            <!--            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>-->
           </el-col>
           <el-col :span="4" >
             <el-form-item style="float: right" >
               <el-button type="success" @click="slpgclick">派工</el-button>
-<!--              <el-button type="success" @click="xdClick">接收</el-button>-->
               <el-button type="success" @click="saveclick">报工</el-button>
 
             </el-form-item>
@@ -141,7 +171,7 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
+              :header-cell-style="headerCellStyle"
             >
 
 
@@ -157,7 +187,7 @@
 
 <script>
 import {
-  savePkPgdJs,savePkPgdXd,savePkPgdXdBack,getPkPgd,savePkPgdFk,getPgdBase
+  savePkPgdJs, savePkPgdXd, savePkPgdXdBack, getPkPgd, savePkPgdFk, getPgdBase, getQmPgd
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -166,7 +196,7 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'PwjhD',
+  name:'PkjhD',
   data() {
     return {
       queryParam: {
@@ -174,7 +204,10 @@ export default {
         pl:'',
         fd:'',
         fkyy:'',
-        zt:'01'
+        zt:'01',
+        'lx':'p',
+        qgkw:'',
+        tlth:'',
       },
       statusOptions: [
         {
@@ -197,8 +230,12 @@ export default {
         sljs:'',
         dw:'',
         scry:'',
-        scdw:''
+        scdw:'',
+        zyq:'',
+
       },
+      zyqs:[],
+      zyrys:[],
       list: [],
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
@@ -218,15 +255,15 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-        { field: 'lsh', title: '工单号', width: 100,
+        { field: 'pgdh', title: '坡口工单号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+
         { field: 'pkZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
         { field: 'czbh', title: '船号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -242,12 +279,12 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'kw', title: '跨位', width: 120,
+        { field: 'kw', title: '跨位', width: 120,formatter: ['dictFormat', 'QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 120,
+        { field: 'zl', title: '组立', width: 120,formatter: ['dictFormat', 'ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -257,10 +294,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ptblx', title: '套料图号', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+
 
         { field: 'ljbh', title: '零件编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -296,9 +330,6 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-
-
         { field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -309,19 +340,15 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        // { field: 'gylx', title: '工艺路线', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'pkjhrq', title: '坡口计划日期', width: 120,
+
+
+
+        { field: 'pkjhrq', title: '坡口计划日期', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        // { field: 'pkfzry', title: '坡口负责人', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
+
 
         { field: 'pksbbh', title: '坡口设备编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -337,84 +364,222 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        //
-        // { field: 'pkry', title: '坡口人员', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        //
-        // { field: 'pkksrq', title: '坡口开始日期', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        //
-        // { field: 'pkjsrq', title: '坡口结束日期', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
+        { field: 'pkXfry', title: '坡口派工人员', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkXfrq', title: '坡口派工日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pscry', title: '坡口生产人员', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkFkrq', title: '坡口反馈日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkFkry', title: '坡口反馈人', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgdh', title: '  曲工单号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'qsbbh', title: '曲设备编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'qscry', title: '曲生产人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'qjgXfry', title: '曲派工人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
-        // { field: 'pscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'pkXfry', title: '派工人员', width: 120,
+        { field: 'qjgXfrq', title: '曲派工日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkXfrq', title: '派工日期', width: 120,
+        { field: 'qjgFkry', title: '曲反馈人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pscry', title: '生产人员', width: 100,editRender: { name: 'input' },
+
+        { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        // { field: 'fkry', title: '派工人员', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'fkrq', title: '派工日期', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'pjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'pjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'pkFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
+
+        //-------------------------------------------
+
+        // --------------------------------------------------------------
+        { field: 'dgdh', title: '打磨工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pkFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
+        { field: 'dmsbbh', title: '打磨设备编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        // { field: 'pkFkyy', title: '反馈原因', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'pkBzry', title: '编制人', width: 120,
+        { field: 'dmcd', title: '打磨打磨长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dmXfry', title: '打磨派工人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkBzrq', title: '编制日期', width: 120,
+        { field: 'dmXfrq', title: '打磨派工日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
+        { field: 'dscry', title: '打磨生产人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
 
 
+        { field: 'dmFkry', title: '打磨反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
+        { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        {
+          field: 'slfkry',
+          title: '上料反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slfkrq',
+          title: '上料反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwfkry',
+          title: '抛丸反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwfkrq',
+          title: '抛丸反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llfkry',
+          title: '理料反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llfkrq',
+          title: '理料反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
 
+        {
+          field: 'hxfkrq',
+          title: '划线反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxfkry',
+          title: '划线反馈人员',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
 
+        {
+          field: 'qgfkry',
+          title: '切割反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgfkrq',
+          title: '切割反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'sljhrq',
+          title: '上料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwjhrq',
+          title: '抛丸计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'lljhrq',
+          title: '理料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjhrq',
+          title: '划线计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjhrq',
+          title: '切割计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
 
 
 
@@ -432,7 +597,14 @@ export default {
 
   },
   methods: {
-
+    headerCellStyle ({ column, columnIndex }) {
+      if (['pkjhrq','pkXfry','pkXfrq','pscry','pkFkrq','pkFkry'].includes(column.property)) {
+        return {
+          backgroundColor: '#2db7f5',
+          color: '#ffffff'
+        }
+      }
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -456,7 +628,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      console.log(this.dictData.zyrys)
+      console.log(this.zyrys)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.zyq+fst.resourcesCode===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
@@ -468,6 +646,8 @@ export default {
 
           selectRecords[i].pscdw = this.inParam.scdw
           selectRecords[i].pscry = this.inParam.scry
+          selectRecords[i].pkjhrq = this.inParam.sljs
+
 
 
         }
@@ -508,6 +688,8 @@ export default {
     initBase(){
       getPgdBase({}).then(res=>{
         console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.zyrys=res.data.zyrys
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
@@ -626,7 +808,7 @@ export default {
         this.$message.warning('选择船只编号')
         return
       }
-      getPkPgd(this.queryParam).then((res) => {
+      getQmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
@@ -652,10 +834,10 @@ export default {
 
 .el-header{margin:0;padding: 5px;height:auto;
   .el-input{
-    width: 140px;
+    width: 80px;
   }
   .el-select{
-    width: 140px;
+    width: 80px;
   }
 
 }
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
index 377673a..3a6d7c4 100644
--- a/src/views/jhzxgl/pwjhD.vue
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -7,7 +7,7 @@
         <el-row>
 
           <el-col :span="22">
-            <el-col :span="4" >
+            <el-col :span="5" >
               <el-form-item label="状态:">
                 <el-select v-model="queryParam.zt" placeholder="状态"  @change="ztChange">
                   <el-option
@@ -88,33 +88,36 @@
 
 
 
-            <span style="width:6%" >班组:</span>
-            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+            <span style="width:6%" >作业区:</span>
+            <el-select v-model="inParam.scdw" placeholder="作业区" clearable style="width: 15%" @change="bzClick">
               <el-option
                 v-for="item in this.dictData.resourcesCodes"
-                :key="item.resourcesCode"
-                :label="item.resourcesCode"
-                :value="item.resourcesCode"
+                :key="item.zyq"
+                :label="item.zyq"
+                :value="item.zyq"
               >
               </el-option>
             </el-select>
 
-            <span style="width:6%" >作业区:</span>
-            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.zyq" placeholder="班组" clearable style="width: 15%" @change="bzClick1">
               <el-option
                 v-for="item in this.dictData.zyqs"
-                :key="item.resourcesCode+item.zyq"
-                :label="item.resourcesCode+item.zyq"
-                :value="item.zyq"
+                :key="item.zyq+item.resourcesCode"
+                :label="item.zyq+item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
+
+
+
             <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
                 v-for="item in this.dictData.zyrys"
                 :key="item.id"
-                :label="item.resourcesCode+item.zyq+item.userName"
+                :label="item.zyq+item.resourcesCode+item.userName"
                 :value="item.userName"
               >
               </el-option>
@@ -153,6 +156,7 @@
               :auto-resize="true"
               :columns="tableColumn"
               highlight-current-row
+              :header-cell-style="headerCellStyle"
               :data="list"
               :scroll-y="{enabled: true}"
               :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
@@ -332,16 +336,17 @@ export default {
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination' }
           },
+
           {
-            field: 'pwry',
-            title: '抛丸人员',
+            field: 'pwpgrq',
+            title: '抛丸派工日期',
             width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination' }
           },
           {
-            field: 'pwpgrq',
-            title: '抛丸派工日期',
+            field: 'pwry',
+            title: '抛丸人员',
             width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination' }
@@ -385,6 +390,14 @@ export default {
 
   },
   methods: {
+    headerCellStyle ({ column, columnIndex }) {
+      if (['pwry','pwpgrq','pwpgry','pwfkry','pwfkrq'].includes(column.property)) {
+        return {
+          backgroundColor: '#2db7f5',
+          color: '#ffffff'
+        }
+      }
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -408,13 +421,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
       console.log(this.dictData.zyqs)
     },
     bzClick1(){
       console.log(this.dictData.zyrys)
       console.log(this.zyrys)
-      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.zyq+fst.resourcesCode===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
index bd28847..5753a44 100644
--- a/src/views/jhzxgl/qgjhD.vue
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -80,33 +80,36 @@
 
 
 
-            <span style="width:6%" >班组:</span>
-            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+            <span style="width:6%" >作业区:</span>
+            <el-select v-model="inParam.scdw" placeholder="作业区" clearable style="width: 15%" @change="bzClick">
               <el-option
                 v-for="item in this.dictData.resourcesCodes"
-                :key="item.resourcesCode"
-                :label="item.resourcesCode"
-                :value="item.resourcesCode"
+                :key="item.zyq"
+                :label="item.zyq"
+                :value="item.zyq"
               >
               </el-option>
             </el-select>
 
-            <span style="width:6%" >作业区:</span>
-            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.zyq" placeholder="班组" clearable style="width: 15%" @change="bzClick1">
               <el-option
                 v-for="item in this.dictData.zyqs"
-                :key="item.resourcesCode+item.zyq"
-                :label="item.resourcesCode+item.zyq"
-                :value="item.zyq"
+                :key="item.zyq+item.resourcesCode"
+                :label="item.zyq+item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
+
+
+
             <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
                 v-for="item in this.dictData.zyrys"
                 :key="item.id"
-                :label="item.resourcesCode+item.zyq+item.userName"
+                :label="item.zyq+item.resourcesCode+item.userName"
                 :value="item.userName"
               >
               </el-option>
@@ -150,7 +153,7 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
+              :header-cell-style="headerCellStyle"
             >
 
 
@@ -357,7 +360,14 @@ export default {
 
   },
   methods: {
-
+    headerCellStyle ({ column, columnIndex }) {
+      if (['qgry','qgpgrq','qgpgry','qgfkry','qgfkrq'].includes(column.property)) {
+        return {
+          backgroundColor: '#2db7f5',
+          color: '#ffffff'
+        }
+      }
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -381,13 +391,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
       console.log(this.dictData.zyqs)
     },
     bzClick1(){
       console.log(this.dictData.zyrys)
       console.log(this.zyrys)
-      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.zyq+fst.resourcesCode===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
index 69fa903..555c579 100644
--- a/src/views/jhzxgl/qmjhD.vue
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -6,7 +6,7 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="20">
+          <el-col :span="22">
 
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@@ -54,21 +54,21 @@
 
 
             </el-form-item>
-            <el-form-item label="批量:">
+            <el-form-item label="批量:" label-width="50px">
               <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-            <el-form-item label="分段:">
+            <el-form-item label="分段:" label-width="50px">
               <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
             <el-form-item label="套料图:">
-              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" style="width: 130px" ></el-input>
             </el-form-item>
 
 
 
 
             <el-form-item label="跨位:">
-              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
+              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable  style="width: 140px">
                 <el-option
                   v-for="item in this.dictData.qgkw"
                   :key="item.bm"
@@ -83,7 +83,7 @@
 
 
           </el-col>
-          <el-col :span="4">
+          <el-col :span="2">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
@@ -97,34 +97,36 @@
 
 
 
-
-            <span style="width:6%" >班组:</span>
-            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+            <span style="width:6%" >作业区:</span>
+            <el-select v-model="inParam.scdw" placeholder="作业区" clearable style="width: 15%" @change="bzClick">
               <el-option
                 v-for="item in this.dictData.resourcesCodes"
-                :key="item.resourcesCode"
-                :label="item.resourcesCode"
-                :value="item.resourcesCode"
+                :key="item.zyq"
+                :label="item.zyq"
+                :value="item.zyq"
               >
               </el-option>
             </el-select>
 
-            <span style="width:6%" >作业区:</span>
-            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.zyq" placeholder="班组" clearable style="width: 15%" @change="bzClick1">
               <el-option
                 v-for="item in this.dictData.zyqs"
-                :key="item.resourcesCode+item.zyq"
-                :label="item.resourcesCode+item.zyq"
-                :value="item.zyq"
+                :key="item.zyq+item.resourcesCode"
+                :label="item.zyq+item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
+
+
+
             <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
                 v-for="item in this.dictData.zyrys"
                 :key="item.id"
-                :label="item.resourcesCode+item.zyq+item.userName"
+                :label="item.zyq+item.resourcesCode+item.userName"
                 :value="item.userName"
               >
               </el-option>
@@ -169,7 +171,7 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
+              :header-cell-style="headerCellStyle"
             >
 
 
@@ -280,7 +282,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 120,
+        { field: 'zl', title: '组立', width: 120,formatter: ['dictFormat', 'ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -436,6 +438,10 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        { field: 'dmjhrq', title: '打磨计划日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
         { field: 'dmXfry', title: '打磨派工人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -587,7 +593,14 @@ export default {
 
   },
   methods: {
-
+    headerCellStyle ({ column, columnIndex }) {
+      if (['qjgjhrq','qscry','qjgXfry','qjgXfrq','qjgFkry','qjgFkrq'].includes(column.property)) {
+        return {
+          backgroundColor: '#2db7f5',
+          color: '#ffffff'
+        }
+      }
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -611,13 +624,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.zyq===this.inParam.scdw)
       console.log(this.dictData.zyqs)
     },
     bzClick1(){
       console.log(this.dictData.zyrys)
       console.log(this.zyrys)
-      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.zyq+fst.resourcesCode===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
@@ -817,10 +830,10 @@ export default {
 
 .el-header{margin:0;padding: 5px;height:auto;
   .el-input{
-    width: 140px;
+    width: 80px;
   }
   .el-select{
-    width: 140px;
+    width: 80px;
   }
 
 }
diff --git a/src/views/jhzxgl/yppCX.vue b/src/views/jhzxgl/yppCX.vue
index d496b9f..744f592 100644
--- a/src/views/jhzxgl/yppCX.vue
+++ b/src/views/jhzxgl/yppCX.vue
@@ -309,7 +309,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 100,
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue
index aaa0322..d81343a 100644
--- a/src/views/jhzxgl/yppFK.vue
+++ b/src/views/jhzxgl/yppFK.vue
@@ -283,7 +283,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 100,
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue
index 603ea81..ab55069 100644
--- a/src/views/jhzxgl/yppGL.vue
+++ b/src/views/jhzxgl/yppGL.vue
@@ -61,7 +61,7 @@
               <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
             <el-form-item label="套料图:">
-              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" style="width: 130px" ></el-input>
             </el-form-item>
 
 
@@ -301,7 +301,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 100,
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -902,10 +902,10 @@ export default {
 
 .el-header{margin:0;padding: 5px;height:auto;
   .el-input{
-    width: 140px;
+    width: 80px;
   }
   .el-select{
-    width: 140px;
+    width: 90px;
   }
 
 }