From 31d8e912f6190e6f2edfc050c71d394df530a9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Sun, 21 Jul 2024 16:19:49 +0800
Subject: [PATCH] 1.111

---
 src/views/jhzx/sygdCX.vue  | 488 +++++++++++++++++++++----------------
 src/views/jhzx/sygdSH.vue  | 423 ++++++++++++++++----------------
 src/views/jhzx/wzxq.vue    |   5 +-
 src/views/jhzxgl/dmjhD.vue |   2 +-
 src/views/jhzxgl/pkjhD.vue |   2 +-
 src/views/jhzxgl/pwjhD.vue |   2 +-
 src/views/jhzxgl/qgjhD.vue |   2 +-
 src/views/jhzxgl/qmjhD.vue |   2 +-
 src/views/jhzxgl/sljhD.vue |   7 +-
 src/views/jhzxgl/tzjhD.vue |  10 +-
 src/views/sjzx/bomwh.vue   |   2 +-
 11 files changed, 503 insertions(+), 442 deletions(-)

diff --git a/src/views/jhzx/sygdCX.vue b/src/views/jhzx/sygdCX.vue
index 96fc9e6..bd522a5 100644
--- a/src/views/jhzx/sygdCX.vue
+++ b/src/views/jhzx/sygdCX.vue
@@ -3,17 +3,17 @@
     <el-header style="width: 100%; height: 60px;font-size: 12px">
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
-          <el-col :span="22">
-            <el-form-item  >
+          <el-col :span="15" >
+            <el-form-item  style="margin-left: 4px;">
               <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
               <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date"  style="width: 33%;" />
               <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
               <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%" />
             </el-form-item>
-            <el-form-item label="状态:">
+            <el-form-item label="状态:" >
               <el-select
                 v-model="queryParam.gdZt"
-                placeholder="状态"
+                clearable
               >
                 <el-option
                   v-for="item in gdZtOptions"
@@ -25,31 +25,54 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="9">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
+              <el-button
+                class="out-item"
+                type="primary"
+                icon="el-icon-download"
+                @click="handleExport"
+              >导出</el-button>
+              <div style="float: right;margin-left: 5px" >
+                <el-upload
+                  :action="uploadAction"
+                  :show-file-list="false"
+                  :before-upload="beforeAvatarUpload"
+                  :data="uploadData"
+                  :on-success="handleAvatarSuccess"
+                  :disabled="filedis"
+                  :headers="heads"
+                >
+                  <el-button type="success" @click="uploadExcel" >导入</el-button>
+                </el-upload>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col >
             <el-form-item style="float: right" >
-<!--              <span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>-->
+              <!--              <span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>-->
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
+
     </el-header>
     <el-container  style="padding-top: 0px">
       <el-container>
         <el-main>
+
           <div class="mytable">
+
             <vxe-grid
               id="id"
               ref="xGrid"
               border
               resizable
               keep-source
+              show-overflow
               :align="'center'"
               :height="height"
               :auto-resize="true"
@@ -58,7 +81,10 @@
               :custom-config="{ storage: true }"
               highlight-current-row
               highlight-hover-row
-              show-overflow
+              :span-method="rowspanMethod"
+              @checkbox-all="selectAllEvent"
+              @checkbox-change="selectChangeEvent"
+              :scroll-y="{ enabled: true }"
             >
             </vxe-grid>
           </div>
@@ -70,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList} from '@/api/jhzx/sygd'
+import {getSygdList,tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -78,13 +104,13 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'SygdCX',
+  name:'SygdWH',
   data() {
     return {
       queryParam: {
         beginTime:'',
         endTime:'',
-        gdZt:''
+        gdZt:'0'
       },
       gdZtOptions:[
         {
@@ -102,11 +128,15 @@ export default {
       ],
       list: [],
       gcrl: [],
+      isupload:'02',
       filedis:false,
       uploadData:{},
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
       dictData:[],
       height: '500px',
       tableColumn:[
+        { type: 'checkbox', width: 50 ,},
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -117,220 +147,132 @@ export default {
         { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsDz', title: '钢加大组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqTlt', title: '套料图接收',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqLqb', title: '板材领取表接收',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dhqd', title: '订货清单号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gdZt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'],filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'orderBs', title: '订货板数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'arrivalB', title: '到货板数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'tltSl', title: '套料图板数',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'slSl', title: '上料张数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'slSj', title: '上料时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pwSl', title: '抛丸数量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pwSj', title: '抛丸时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'xcpwSl', title: '型材抛丸',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'xcpwSj', title: '型材抛丸时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ad', title: '1跨平直大板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1adSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ax', title: '1跨平直大板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1axSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ld', title: '1跨进线板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ldSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bd', title: '2跨超长超宽板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bx', title: '2跨超长超宽板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cx', title: '2跨超长超宽曲板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cd', title: '2跨超长超宽曲板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2tx', title: '2跨T型材腹板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2txSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2td', title: '2跨T型材腹板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2tdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jx', title: '2跨激光切割板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jd', title: '2跨激光切割板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cx', title: '3跨曲板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cd', title: '3跨曲板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hx', title: '3跨厚板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hd', title: '3跨厚板（大组）',width: 100,
+        { field: 'bs', title: '板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sl', title: '上料', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4px', title: '4跨普通板（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xcpw', title: '型材抛丸', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4pxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pw', title: '抛丸', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4pd', title: '4跨普通板（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'yklm', title: '一垮龙门板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4pdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'yksk', title: '一垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4xx', title: '4跨普通板（机器人）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ykpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4xxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'eksk', title: '二垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n8gx', title: '光电',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ekskks', title: '数控切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n8gxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ekpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xx', title: '7跨型板（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sksk', title: '三垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skskqgks', title: '数控切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xd', title: '7跨型板（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skpt', title: '三垮平铁板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2tx', title: '2跨T型材面板（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ptks', title: '平铁切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2txSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ptjs', title: '平铁切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2td', title: '2跨T型材面板（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qptZjs', title: '曲平铁转结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2tdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qptjs', title: '曲平铁结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3px', title: '3跨平铁（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qwbjs', title: '曲外板结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3pxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zl', title: '组立', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3pd', title: '3跨平铁（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skbs', title: '数控   板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3pdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skqgks', title: '数控切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3xx', title: '3跨平铁（机器人）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkqgjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3xxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'mbjb', title: '面板挤边', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjks', title: '钢加开始',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qkxcms', title: '七垮型  材米数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jhwgDz', title: '计划大组完成时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xcmb', title: '型材  面板', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jhwgXz', title: '计划小组完成时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fdxq', title: '分段需求', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'sjlyCh', title: '数据来源船',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'gdjs', title: '光电  结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gxsj', title: '数据更新时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bz', title: '备注', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-
-  ]
+          filterRender: { name: 'FilterCombination', },
+        },
+        // { field: 'zt', title: '状态', width: 120,formatter:this.formatterZt,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: 'id', title: '流水号（禁止修改）',width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }}
 
+      ],
+      checkedList: [],
     }
   },
   computed: {
@@ -346,9 +288,134 @@ export default {
     'queryParam.beginTime'(newValue, Value){
       this.queryParam.endTime= XEUtils.toDateString(XEUtils.getWhatMonth(newValue, 3),'yyyy/MM/dd')
     },
+    '$route'(){
+      this.getParams();
+    },
   },
   methods: {
-    cellClickEvent  ( column )  {
+    getParams(){
+      var a=[]
+      a= this.$route.params.list
+      if (a===undefined){
+        return;
+      }
+      this.list=a
+      if (this.$refs.xGrid) {
+        this.$refs.xGrid.loadData(this.list)
+      }
+    },
+    formatterZt({cellValue}) {
+      if (cellValue === "0") {
+        return '编辑'
+      }
+      if (cellValue === "1") {
+        return '提交'
+      }
+      if (cellValue === "2") {
+        return '审核'
+      }
+      return cellValue
+    },
+    rowspanMethod({row, _rowIndex, column, visibleData}) {
+      //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
+      // 需要合并的列字段
+      let fields = ['dcCh','dcPl'];// 需要合并的列
+      const cellValue = row[column.property];// 合并行的相同的唯一标识
+      if (cellValue && fields.includes(column.property)) {
+        const prevRow = visibleData[_rowIndex - 1];
+        let nextRow = visibleData[_rowIndex + 1];
+        if(_rowIndex%2==0){
+          return {rowspan: 2, colspan: 1};
+        }else {
+          return {rowspan: 0, colspan: 0};
+        }
+      }
+    },
+    handleExport() {
+      this.$refs.xGrid.exportData({
+        filename: '三月滚动计划',// 文件名字
+        sheetName: 'Sheet1',
+        type: 'xlsx',//导出文件类型 xlsx 和 csv
+        data: this.data, // 数据源
+        // sheetMethod: this.sheetMethod,
+        // useStyle: true,
+        // 过滤那个字段导出
+        columnFilterMethod: function(column, $columnIndex) {
+          return !(column.$columnIndex === 0 )
+          // 0是复选框 不导出
+        }
+      })
+    },
+    sheetMethod({ options, worksheet }){
+      const data = options.data
+      const columns = options.columns
+      let fields = ['dcCh','dcPl'];// 需要合并的列
+      // 获取当前添加样式的列的key
+      const key = columns.find((f) => f.field === 'dcCh').id
+      data.forEach((item, i) => {
+        const row = worksheet.getRow(i + 1)
+        const cells = row._cells
+        const address = cells.find((f) => f._column._key == key).address
+        //截取单元格列序号（英文字母）
+        const chartAt = address.replace(/[^a-zA-Z]/g, '')
+        if (i%2==0){
+          // 通过worksheet操作表格样式，这里只是填充了背景色，还可以操作其它表格的功能
+          //(i+2)过滤表头（例如表头A1，i=0，所以从A2开始添加样式）
+          worksheet.getCell(chartAt + (i + 2))
+            .fill = {
+            type: "pattern",
+            pattern: "solid",
+            fgColor: { argb: "ef7d7d" }
+          }
+        }else {
+          worksheet.getCell(chartAt + (i + 2))
+            .fill = {
+            type: "pattern",
+            pattern: "solid",
+            fgColor: { argb: "ef7d7d" }
+          }
+        }
+      })
+    },
+    uploadExcel() {
+      this.uploadData.isupload = this.isupload
+    },
+    beforeAvatarUpload(file) {
+      // 文件类型
+      const isType = file.type === 'application/vnd.ms-excel'
+      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const fileType = isType || isTypeComputer
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
+        return
+      }
+      startLoading()
+      return fileType
+    },
+    handleAvatarSuccess(res, file) {
+      endLoading()
+      if (res.success) {
+        this.$message({ message: '导入成功', type: 'success' })
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.gjjsXz)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
     },
     initBase(){
       getCzxx({}).then(res=>{
@@ -356,34 +423,45 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
+      if (this.queryParam.beginTime === ''||
+        this.queryParam.beginTime === null||
+        this.queryParam.beginTime === ''||
+        this.queryParam.endTime === null) {
         this.$message.warning('选择时间范围')
         return
       }
       getSygdList(this.queryParam).then((res) => {
         this.list = res.data.list
-        this.gcrl=res.data.gcrl
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
 
       })
     },
-    cellStyle2({row}) {
-      if (this.gcrl.includes(row.gjjsXz)) {
-        return {
-          color: 'red',
-          cursor: 'pointer'
+    tj(){
+      tj(this.checkedList).then((res)=>{
+        if (res){
+          this.$message({ message: '提交成功', type: 'success' })
+          this.initList()
         }
-      }
+      })
     },
     formatDate ({ cellValue }) {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 160
+      this.height = window.innerHeight - 150
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
     },
-
   }
 }
 </script>
diff --git a/src/views/jhzx/sygdSH.vue b/src/views/jhzx/sygdSH.vue
index 5c8ed90..a0db426 100644
--- a/src/views/jhzx/sygdSH.vue
+++ b/src/views/jhzx/sygdSH.vue
@@ -3,8 +3,8 @@
     <el-header style="width: 100%; height: 60px;font-size: 12px">
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
-          <el-col :span="15">
-            <el-form-item  >
+          <el-col :span="15" >
+            <el-form-item  style="margin-left: 4px;">
               <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
               <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date"  style="width: 33%;" />
               <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
@@ -13,7 +13,6 @@
             <el-form-item label="状态:" >
               <el-select
                 v-model="queryParam.gdZt"
-                placeholder="状态"
                 clearable
                 disabled
               >
@@ -30,30 +29,52 @@
           <el-col :span="9">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
-              <el-button type="success" @click="tj">退回</el-button>
-              <el-button type="success" @click="sh">审核</el-button>
+              <el-button type="success" @click="tj">审核</el-button>
+              <el-button
+                class="out-item"
+                type="primary"
+                icon="el-icon-download"
+                @click="handleExport"
+              >导出</el-button>
+              <div style="float: right;margin-left: 5px" >
+                <el-upload
+                  :action="uploadAction"
+                  :show-file-list="false"
+                  :before-upload="beforeAvatarUpload"
+                  :data="uploadData"
+                  :on-success="handleAvatarSuccess"
+                  :disabled="filedis"
+                  :headers="heads"
+                >
+                  <el-button type="success" @click="uploadExcel" >导入</el-button>
+                </el-upload>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col >
             <el-form-item style="float: right" >
-<!--              <span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>-->
+              <!--              <span style="font-size: 12px;color: red; float: right;"> * 表中红色数据：钢加小组结束期为休息日</span>-->
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
+
     </el-header>
     <el-container  style="padding-top: 0px">
       <el-container>
         <el-main>
+
           <div class="mytable">
+
             <vxe-grid
               id="id"
               ref="xGrid"
               border
               resizable
               keep-source
+              show-overflow
               :align="'center'"
               :height="height"
               :auto-resize="true"
@@ -62,9 +83,10 @@
               :custom-config="{ storage: true }"
               highlight-current-row
               highlight-hover-row
-              show-overflow
+              :span-method="rowspanMethod"
               @checkbox-all="selectAllEvent"
               @checkbox-change="selectChangeEvent"
+              :scroll-y="{ enabled: true }"
             >
             </vxe-grid>
           </div>
@@ -76,7 +98,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList,tj,sh} from '@/api/jhzx/sygd'
+import {getSygdList, sh, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -84,7 +106,7 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'SygdSH',
+  name:'SygdWH',
   data() {
     return {
       queryParam: {
@@ -127,221 +149,132 @@ export default {
         { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsDz', title: '钢加大组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqTlt', title: '套料图接收',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqLqb', title: '板材领取表接收',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dhqd', title: '订货清单号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gdZt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'],filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'orderBs', title: '订货板数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'arrivalB', title: '到货板数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'tltSl', title: '套料图板数',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'slSl', title: '上料张数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'slSj', title: '上料时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pwSl', title: '抛丸数量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pwSj', title: '抛丸时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'xcpwSl', title: '型材抛丸',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'xcpwSj', title: '型材抛丸时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ad', title: '1跨平直大板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1adSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ax', title: '1跨平直大板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1axSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ld', title: '1跨进线板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n1ldSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bd', title: '2跨超长超宽板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bx', title: '2跨超长超宽板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2bxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cx', title: '2跨超长超宽曲板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cd', title: '2跨超长超宽曲板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2cdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2tx', title: '2跨T型材腹板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2txSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2td', title: '2跨T型材腹板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2tdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jx', title: '2跨激光切割板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jxSj', title: '加工时间',width: 100,
+        { field: 'bs', title: '板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jd', title: '2跨激光切割板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n2jdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cx', title: '3跨曲板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cd', title: '3跨曲板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3cdSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hx', title: '3跨厚板（小组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hxSj', title: '加工时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hd', title: '3跨厚板（大组）',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n3hdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sl', title: '上料', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4px', title: '4跨普通板（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xcpw', title: '型材抛丸', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4pxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pw', title: '抛丸', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4pd', title: '4跨普通板（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'yklm', title: '一垮龙门板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4pdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'yksk', title: '一垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4xx', title: '4跨普通板（机器人）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ykpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n4xxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'eksk', title: '二垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n8gx', title: '光电',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ekskks', title: '数控切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'n8gxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ekpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xx', title: '7跨型板（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sksk', title: '三垮数控板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skskqgks', title: '数控切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xd', title: '7跨型板（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skpkjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'x7xdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skpt', title: '三垮平铁板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2tx', title: '2跨T型材面板（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ptks', title: '平铁切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2txSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ptjs', title: '平铁切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2td', title: '2跨T型材面板（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qptZjs', title: '曲平铁转结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's2tdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qptjs', title: '曲平铁结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3px', title: '3跨平铁（小组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qwbjs', title: '曲外板结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3pxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zl', title: '组立', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3pd', title: '3跨平铁（大组）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skbs', title: '数控   板数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3pdSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skqgks', title: '数控切割开始', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3xx', title: '3跨平铁（机器人）',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkqgjs', title: '坡口切割结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 's3xxSj', title: '加工时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'mbjb', title: '面板挤边', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjks', title: '钢加开始',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qkxcms', title: '七垮型  材米数', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jhwgDz', title: '计划大组完成时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xcmb', title: '型材  面板', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jhwgXz', title: '计划小组完成时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fdxq', title: '分段需求', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'sjlyCh', title: '数据来源船',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'gdjs', title: '光电  结束', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gxsj', title: '数据更新时间',width: 100,
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bz', title: '备注', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
+          filterRender: { name: 'FilterCombination', },
+        },
+        // { field: 'zt', title: '状态', width: 120,formatter:this.formatterZt,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: 'id', title: '流水号（禁止修改）',width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }}
 
-  ],
+      ],
       checkedList: [],
-
     }
   },
   computed: {
@@ -359,7 +292,7 @@ export default {
     },
     '$route'(){
       this.getParams();
-    }
+    },
   },
   methods: {
     getParams(){
@@ -373,17 +306,77 @@ export default {
         this.$refs.xGrid.loadData(this.list)
       }
     },
+    formatterZt({cellValue}) {
+      if (cellValue === "0") {
+        return '编辑'
+      }
+      if (cellValue === "1") {
+        return '提交'
+      }
+      if (cellValue === "2") {
+        return '审核'
+      }
+      return cellValue
+    },
+    rowspanMethod({row, _rowIndex, column, visibleData}) {
+      //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
+      // 需要合并的列字段
+      let fields = ['dcCh','dcPl'];// 需要合并的列
+      const cellValue = row[column.property];// 合并行的相同的唯一标识
+      if (cellValue && fields.includes(column.property)) {
+        const prevRow = visibleData[_rowIndex - 1];
+        let nextRow = visibleData[_rowIndex + 1];
+        if(_rowIndex%2==0){
+          return {rowspan: 2, colspan: 1};
+        }else {
+          return {rowspan: 0, colspan: 0};
+        }
+      }
+    },
     handleExport() {
       this.$refs.xGrid.exportData({
         filename: '三月滚动计划',// 文件名字
         sheetName: 'Sheet1',
         type: 'xlsx',//导出文件类型 xlsx 和 csv
         data: this.data, // 数据源
+        // sheetMethod: this.sheetMethod,
+        // useStyle: true,
         // 过滤那个字段导出
-        // columnFilterMethod: function(column, $columnIndex) {
-        //   return !(column.$columnIndex === 0 )
-        //   // 0是复选框 不导出
-        // }
+        columnFilterMethod: function(column, $columnIndex) {
+          return !(column.$columnIndex === 0 )
+          // 0是复选框 不导出
+        }
+      })
+    },
+    sheetMethod({ options, worksheet }){
+      const data = options.data
+      const columns = options.columns
+      let fields = ['dcCh','dcPl'];// 需要合并的列
+      // 获取当前添加样式的列的key
+      const key = columns.find((f) => f.field === 'dcCh').id
+      data.forEach((item, i) => {
+        const row = worksheet.getRow(i + 1)
+        const cells = row._cells
+        const address = cells.find((f) => f._column._key == key).address
+        //截取单元格列序号（英文字母）
+        const chartAt = address.replace(/[^a-zA-Z]/g, '')
+        if (i%2==0){
+          // 通过worksheet操作表格样式，这里只是填充了背景色，还可以操作其它表格的功能
+          //(i+2)过滤表头（例如表头A1，i=0，所以从A2开始添加样式）
+          worksheet.getCell(chartAt + (i + 2))
+            .fill = {
+            type: "pattern",
+            pattern: "solid",
+            fgColor: { argb: "ef7d7d" }
+          }
+        }else {
+          worksheet.getCell(chartAt + (i + 2))
+            .fill = {
+            type: "pattern",
+            pattern: "solid",
+            fgColor: { argb: "ef7d7d" }
+          }
+        }
       })
     },
     uploadExcel() {
@@ -418,19 +411,29 @@ export default {
         })
       }
     },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.gjjsXz)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
+    },
     initBase(){
       getCzxx({}).then(res=>{
         this.dictData = res.data
       })
     },
     initList() {
-      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
+      if (this.queryParam.beginTime === ''||
+        this.queryParam.beginTime === null||
+        this.queryParam.beginTime === ''||
+        this.queryParam.endTime === null) {
         this.$message.warning('选择时间范围')
         return
       }
       getSygdList(this.queryParam).then((res) => {
         this.list = res.data.list
-        this.gcrl=res.data.gcrl
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
@@ -438,25 +441,9 @@ export default {
       })
     },
     tj(){
-      tj(this.checkedList).then((res)=>{
-        if (res){
-          this.$message({ message: '提交成功', type: 'success' })
-          this.initList()
-        }
-      })
-    },
-    cellStyle2({row}) {
-      if (this.gcrl.includes(row.gjjsXz)) {
-        return {
-          color: 'red',
-          cursor: 'pointer'
-        }
-      }
-    },
-    sh(){
       sh(this.checkedList).then((res)=>{
         if (res){
-          this.$message({ message: '审核成功', type: 'success' })
+          this.$message({ message: '提交成功', type: 'success' })
           this.initList()
         }
       })
@@ -465,7 +452,7 @@ export default {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 160
+      this.height = window.innerHeight - 150
     },
     // 全选
     selectAllEvent() {
diff --git a/src/views/jhzx/wzxq.vue b/src/views/jhzx/wzxq.vue
index 0094436..7af7dda 100644
--- a/src/views/jhzx/wzxq.vue
+++ b/src/views/jhzx/wzxq.vue
@@ -104,6 +104,7 @@ export default {
         },
       ],
       projectData:[],
+      projectData1:[],
       ShipNoList:[],
       ghsList:[],
       request:{
@@ -177,13 +178,13 @@ export default {
   methods: {
     initList(){
       getList(this.request).then((res) => {
-        this.list = res.data
+        this.list = res.data.list
       })
     },
     initProject(){
       getCzplBase({}).then(res=>{
-        console.log(res)
         this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
       })
     },
     initGhs(){
diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue
index 642515c..d4c1b9f 100644
--- a/src/views/jhzxgl/dmjhD.vue
+++ b/src/views/jhzxgl/dmjhD.vue
@@ -221,7 +221,7 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-        { field: 'lsh', title: '流水号', width: 100,
+        { field: 'lsh', title: '工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/pkjhD.vue b/src/views/jhzxgl/pkjhD.vue
index bb160dc..ddb03c4 100644
--- a/src/views/jhzxgl/pkjhD.vue
+++ b/src/views/jhzxgl/pkjhD.vue
@@ -221,7 +221,7 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-        { field: 'lsh', title: '流水号', width: 100,
+        { field: 'lsh', title: '工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
index 3ce48a7..7a39ec3 100644
--- a/src/views/jhzxgl/pwjhD.vue
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -228,7 +228,7 @@ export default {
       { type: 'checkbox', width: 40 },
       { type: 'seq', width: 40, title: '序号' },
 
-          { field: 'pwlsh', title: '流水号', width: 100,
+          { field: 'pwlsh', title: '工单号', width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination', },
           },
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
index 8c9d1d2..b7e6fd7 100644
--- a/src/views/jhzxgl/qgjhD.vue
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -230,7 +230,7 @@ export default {
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
 
-        { field: 'qglsh', title: '流水号', width: 100,
+        { field: 'qglsh', title: '工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
index 4053036..98ff5ad 100644
--- a/src/views/jhzxgl/qmjhD.vue
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -222,7 +222,7 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-        { field: 'lsh', title: '流水号', width: 100,
+        { field: 'lsh', title: '工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index c191538..fb3fda7 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -112,11 +112,6 @@
 
 
             <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>
           </el-col>
           <el-col :span="4" >
             <el-form-item style="float: right" >
@@ -235,7 +230,7 @@ export default {
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
 
-        { field: 'sllsh', title: '流水号', width: 100,
+        { field: 'sllsh', title: '工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/jhzxgl/tzjhD.vue b/src/views/jhzxgl/tzjhD.vue
index 0b45216..d17659d 100644
--- a/src/views/jhzxgl/tzjhD.vue
+++ b/src/views/jhzxgl/tzjhD.vue
@@ -156,7 +156,7 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "接收",
         },
         {
           value: "09",
@@ -357,28 +357,28 @@ export default {
         return
       }
       if(this.queryParam.zt==='02'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           saveTzjhPgdXdBack(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '取消下达成功', type: 'success' })
+              this.$message({ message: '取消接收成功', type: 'success' })
               this.initList()
             }
           })
 
         })
       }else  {
-        this.$confirm('下达？', '提示', {
+        this.$confirm('接收？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           saveTzjhPgdXd(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '下达成功', type: 'success' })
+              this.$message({ message: '接收成功', type: 'success' })
               this.initList()
             }
           })
diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue
index 70b327f..8159b9d 100644
--- a/src/views/sjzx/bomwh.vue
+++ b/src/views/sjzx/bomwh.vue
@@ -1191,7 +1191,7 @@ export default {
       const formData = new FormData()
       // 你可以使用FormData.append来添加键/值对到表单里面；
       this.fileList.forEach((file) => {
-        if (!file.name.includes(".PDF")){
+        if (!file.name.includes(".PDF")&&!file.name.includes('.pdf')){
           formData.append('file', file.raw)
         }