1.新导入月度计划

src/api/jhzx/sygd.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+
+export function getFilenameNew() {return request({url: '/ydjhImportNew/getFileNameList', method: 'get',})}
+export function listByFileNameNew(data) {return request({url: '/ydjhImportNew/listByFileName', method: 'get', params:data})}
+export function tjNew(data) {return request({url: '/ydjhImportNew/tj', method: 'get', params:data})}
+export function shNew(data) {return request({url: '/ydjhImportNew/sh', method: 'get', params:data})}
+
+
 export function list(data) {return request({url: '/dmSygdMx/list', method: 'get', params:data})}
 export function getList(data) {return request({url: '/dmSygdMx/getList', method: 'post', data})}
 export function getSygdList(data) {return request({url: '/dmSygd/getList', method: 'post', data})}
@@ -29,3 +36,4 @@ export function saveData(data={}) {return request({url: '/dmYdjh/save', method:
 export function getFilename() {return request({url: '/dmSygdMx/getFileNameList', method: 'get',})}
 
 export function listByFileName(data) {return request({url: '/dmSygdMx/listByFileName', method: 'get', params:data})}
+

src/permission.js

@@ -8,8 +8,8 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-// const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk','/ljian','/baogong'] // no redirect whitelist
+const whiteList = ['/menu','/login', '/auth-redirect','/kban','/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk','/ljian','/baogong'] // no redirect whitelist
-const whiteList = ['/menu','/login', '/auth-redirect','/kban','/ljian','/baogong']
+// const whiteList = ['/menu','/login', '/auth-redirect','/kban','/ljian','/baogong']
 const checkBmList=['/sliao','/pwpg','/pwfk','/llpg','/llfk','/hxpg','/hxfk','/qgpg','/qgfk']
 
 export function flatRoutes(routes) {

src/views/jhzx/js/ydjhNewTable.js

@@ -0,0 +1,131 @@
+
+const ydjhNewTable=()=>{
+
+  const tableColumn=[
+    {type: 'seq', width: 60, title: '序号', fixed: "left"},
+    { field: 'dcCh', title: '船号',width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', }},
+    { field: 'dcPl', title: '批量',width: 70,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', }},
+    { field: 'dcFd', title: '分段号',width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', }},
+    { field: '板数', title: '板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '上料完成', title: '上料完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '型材抛丸', title: '型材抛丸', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '抛丸完成', title: '抛丸完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '一垮龙门板数', title: '一垮龙门板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '一垮数控板数', title: '一垮数控板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成1', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '二跨面板板数', title: '二跨面板板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成2', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '二跨数控板数', title: '二垮数控板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成3', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '三跨平铁板数', title: '三跨平铁板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成4', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '曲平铁曲完成', title: '曲平铁曲完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '三跨数控板数', title: '三跨数控板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成5', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '曲外板曲完成', title: '曲外板曲完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '四区腹板板数', title: '四区腹板板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成6', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '四区数控板数', title: '四区数控板数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '切割完成7', title: '切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '面板挤边完成', title: '面板挤边完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '面板切割完成', title: '面板切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '七跨型材米数', title: '七跨型材米数', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '型材切割完成', title: '型材切割完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '光电完成', title: '光电完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '小组配送完成', title: '小组配送完成', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: '备注', title: '备注', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+  ]
+  return {tableColumn}
+}
+
+export default ydjhNewTable

src/views/jhzx/sygdSH.vue

@@ -4,12 +4,14 @@
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
           <el-col :span="15" >
-            <el-form-item  style="margin-left: 4px;">
+            <el-select v-model="queryParam.fileName" filterable  placeholder="计划名称" @change="fileNameChange" >
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
+              <el-option
-              <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date"  style="width: 33%;" />
+                v-for="(item,index) in fileNameList"
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
+                :key="index"
-              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%" />
+                :label="item"
-            </el-form-item>
+                :value="item">
+              </el-option>
+            </el-select>
             <el-form-item label="状态:" >
               <el-select
                 v-model="queryParam.gdZt"
@@ -96,7 +98,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, getSygdList, list, sh, tj} from '@/api/jhzx/sygd'
+import {getFilenameNew, getList, getSygdList, list, listByFileNameNew, sh, shNew, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -107,9 +109,9 @@ export default {
   name:'SygdWH',
   data() {
     return {
+      fileNameList:[],
       queryParam: {
-        beginTime:'',
+        fileName:'',
-        endTime:'',
         gdZt:'1'
       },
       gdZtOptions:[
@@ -135,163 +137,7 @@ export default {
       uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
       dictData:[],
       height: '500px',
-      tableColumn:[
+      tableColumn:[],
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcPl', title: '批量',width: 70,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcFd', title: '分段号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'bs1', title: '板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'sl', title: '上料', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xcpw', title: '型材抛丸', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pw', title: '抛丸', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'yklm', title: '一垮龙门板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'yksk', title: '一垮数控板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: '', title: '大板切割开始', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'ykpkjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: 'eksk2', title: '二垮龙门板数', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '龙门切割开始', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '龙门切割结束', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'eksk', title: '二垮数控板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ekskks', title: '数控切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ekpkjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'sksk', title: '三垮数控板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skskqgks', title: '数控切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skpkjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skpt', title: '三垮平铁板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ptks', title: '平铁切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ptjs', title: '平铁切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qpt_zjs', title: '曲平铁转结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qptjs', title: '曲平铁结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qwbjs', title: '曲外板结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'zl', title: '组立', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: '', title: '腹板板数', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '腹板切割开始', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '腹板切割结束', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'skbs', title: '数控   板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skqgks', title: '数控切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pkqgjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'mbjb', title: '面板挤边', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qkxcms', title: '七垮型  材米数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xcmb', title: '型材  面板', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'fdxq', title: '分段需求', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'gdjs', title: '光电  结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'bz', title: '备注', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        }
-
-      ],
       checkedList: [],
     }
   },
@@ -429,45 +275,31 @@ export default {
         })
       }
     },
-    cellStyle2({row}) {
-      if (this.gcrl.includes(row.gjjsXz)) {
-        return {
-          color: 'red',
-          cursor: 'pointer'
-        }
-      }
-    },
     initBase(){
+      getFilenameNew().then(res=>{
+        this.fileNameList=res.data
+      })
       getCzxx({}).then(res=>{
         this.dictData = res.data
       })
     },
     initList() {
-      if (this.queryParam.beginTime === ''||
+      const fileName=this.queryParam.fileName
-        this.queryParam.beginTime === null||
+      if (!fileName){
-        this.queryParam.beginTime === ''||
+        this.$message.warning('请先选择文件名')
-        this.queryParam.endTime === null) {
-        this.$message.warning('选择时间范围')
         return
       }
-      const data={
+      listByFileNameNew({fileName,zt:this.queryParam.gdZt}).then((res) => {
-        begin:this.queryParam.beginTime,
-        end:this.queryParam.endTime
-      }
-      list(data).then((res) => {
         this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-        }
-
       })
     },
     tj(){
-      const data={
+      const fileName=this.queryParam.fileName
-        from:this.queryParam.beginTime,
+      if (!fileName){
-        to:this.queryParam.endTime,
+        this.$message.warning('请先选择文件名')
+        return
       }
-      sh(data).then((res)=>{
+      shNew({fileName}).then((res)=>{
         if (res){
           this.$message({ message: '提交成功', type: 'success' })
           this.initList()

src/views/jhzx/sygdWH.vue

@@ -4,12 +4,14 @@
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
           <el-col :span="15" >
-            <el-form-item  style="margin-left: 4px;">
+            <el-select v-model="queryParam.fileName" filterable  placeholder="计划名称" @change="fileNameChange" >
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
+              <el-option
-              <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date"  style="width: 33%;" />
+                v-for="(item,index) in fileNameList"
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
+                :key="index"
-              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%" />
+                :label="item"
-            </el-form-item>
+                :value="item">
+              </el-option>
+            </el-select>
             <el-form-item label="状态:" >
               <el-select
                 v-model="queryParam.gdZt"
@@ -96,20 +98,21 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, getSygdList, list, tj} from '@/api/jhzx/sygd'
+import {getFilenameNew, getList, getSygdList, list, listByFileNameNew, tj, tjNew} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
+import ydjhNewTable from "@/views/jhzx/js/ydjhNewTable";
 export default {
   name:'SygdWH',
   data() {
     return {
+      fileNameList:[],
       queryParam: {
-        beginTime:'',
+        fileName:'',
-        endTime:'',
         gdZt:'0'
       },
       gdZtOptions:[
@@ -135,163 +138,7 @@ export default {
       uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
       dictData:[],
       height: '500px',
-      tableColumn:[
+      tableColumn:[],
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcPl', title: '批量',width: 70,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcFd', title: '分段号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'bs1', title: '板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'sl', title: '上料', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xcpw', title: '型材抛丸', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pw', title: '抛丸', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'yklm', title: '一垮龙门板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'yksk', title: '一垮数控板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: '', title: '大板切割开始', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'ykpkjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: 'eksk2', title: '二垮龙门板数', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '龙门切割开始', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '龙门切割结束', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'eksk', title: '二垮数控板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ekskks', title: '数控切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ekpkjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'sksk', title: '三垮数控板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skskqgks', title: '数控切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skpkjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skpt', title: '三垮平铁板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ptks', title: '平铁切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ptjs', title: '平铁切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qpt_zjs', title: '曲平铁转结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qptjs', title: '曲平铁结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qwbjs', title: '曲外板结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'zl', title: '组立', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: '', title: '腹板板数', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '腹板切割开始', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: '', title: '腹板切割结束', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'skbs', title: '数控   板数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'skqgks', title: '数控切割开始', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pkqgjs', title: '坡口切割结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'mbjb', title: '面板挤边', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qkxcms', title: '七垮型  材米数', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xcmb', title: '型材  面板', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'fdxq', title: '分段需求', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'gdjs', title: '光电  结束', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'bz', title: '备注', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        }
-
-      ],
       checkedList: [],
     }
   },
@@ -299,6 +146,9 @@ export default {
     ...mapGetters(['name', 'bmbm'])
   },
   created() {
+    const {tableColumn}=ydjhNewTable()
+    this.tableColumn = tableColumn
+
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
@@ -437,37 +287,31 @@ export default {
       }
     },
     initBase(){
+      getFilenameNew().then(res=>{
+        this.fileNameList=res.data
+      })
       getCzxx({}).then(res=>{
         this.dictData = res.data
       })
       this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 0, 'first'),'yyyy/MM/dd')
     },
     initList() {
-      if (this.queryParam.beginTime === ''||
+      const fileName=this.queryParam.fileName
-        this.queryParam.beginTime === null||
+      if (!fileName){
-        this.queryParam.beginTime === ''||
+        this.$message.warning('请先选择文件名')
-        this.queryParam.endTime === null) {
-        this.$message.warning('选择时间范围')
         return
       }
-      const data={
+      listByFileNameNew({fileName,zt:this.queryParam.gdZt}).then((res) => {
-        begin:this.queryParam.beginTime,
-        end:this.queryParam.endTime
-      }
-      list(data).then((res) => {
         this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-        }
-
       })
     },
     tj(){
-      const data={
+      const fileName=this.queryParam.fileName
-        from:this.queryParam.beginTime,
+      if (!fileName){
-        to:this.queryParam.endTime,
+        this.$message.warning('请先选择文件名')
+        return
       }
-      tj(data).then((res)=>{
+      tjNew({fileName}).then((res)=>{
         if (res){
           this.$message({ message: '提交成功', type: 'success' })
           this.initList()

src/views/jhzx/ydjhzxCX.vue

@@ -750,6 +750,11 @@ export default {
       }
       for (const item of data) {
         item.zyq=this.plParam.zyq||item.zyq
+        for (const item of this.zyqList) {
+          if(item.value===this.plParam.zyq){
+            item.zyq1=item.label
+          }
+        }
       }
     },
     zyqChange({row}){

src/views/jhzx/ydjhzxGL.vue

@@ -790,6 +790,11 @@ export default {
         item.hxjhrq=this.plParam.hxjhrq||item.hxjhrq
         item.qgjhrq=this.plParam.qgjhrq||item.qgjhrq
         item.zyq=this.plParam.zyq||item.zyq
+        for (const item of this.zyqList) {
+          if(item.value===this.plParam.zyq){
+            item.zyq1=item.label
+          }
+        }
       }
     },
     formatterZt({cellValue}){

src/views/zyjhzx/sliao/index.vue

@@ -174,12 +174,18 @@ export default {
     },
     search(queryParam){
       queryParam.dcch=queryParam.dcCh
+      this.selectedJh=[]
       getSljhPgd(queryParam).then(res=>{
         this.sljhItemList=res.data
         this.drawSljhItem(this.sljhItemList.r('0:200'))
       })
     },
     initDwInfo(index,dw){
+      console.log(this.selectedJh)
+      if(!this.getCurrentWorker()){
+        this.$message.warning('请选择报工人员')
+        return
+      }
       if (this.slGroup){
         this.slGroup.destroyChildren()
       }
@@ -189,7 +195,10 @@ export default {
       if (this.selectedJh.length>0){
         this.plslflag=true
         const jh=[]
-        this.selectedJh.forEach(item=>{
+        this.selectedJh.forEach((item,index)=>{
+          item.slycldw=dw.id
+          item.slyclcs=dw.list.length+index+1
+          item.slfkry=this.getCurrentWorker()?.userCode
           const data={
             ydjh:item,
             ydid:item.id,
@@ -209,7 +218,8 @@ export default {
             lph:item.sllph,
             nbsbm:item.nbsbm,
             bfr:this.getCurrentWorker()?.userCode,
-            type:'YCL'
+            type:'YCL',
+
           }
           jh.push(data)
         })