diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
index 57a7581..316957d 100644
--- a/src/api/jhzx/sygd.js
+++ b/src/api/jhzx/sygd.js
@@ -1,5 +1,8 @@
import request from '@/utils/request'
export function getList(data) {return request({url: '/dmSygdMx/getList', method: 'post', data})}
+export function getSygdList(data) {return request({url: '/dmSygd/getList', method: 'post', data})}
export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})}
export function saveByDcch(data) {return request({url: '/dmSygdMx/saveByDcch', method: 'post', data})}
+export function getKwList(data) {return request({url: '/dmSygdMx/getKwList', method: 'post', data})}
+export function tqSygd() {return request({url: '/dmSygdMx/tqSygd', method: 'post'})}
diff --git a/src/views/jhzx/qfxqCX.vue b/src/views/jhzx/qfxqCX.vue
index c55b3c5..1d9f003 100644
--- a/src/views/jhzx/qfxqCX.vue
+++ b/src/views/jhzx/qfxqCX.vue
@@ -167,6 +167,7 @@ export default {
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()
+ this.initList()
},
methods: {
@@ -178,10 +179,10 @@ export default {
this.zt=JSON.parse(dict)
},
initList() {
- if (this.queryParam.dcCh === '') {
- this.$message.warning('选择船只编号')
- return
- }
+ // if (this.queryParam.dcCh === '') {
+ // this.$message.warning('选择船只编号')
+ // return
+ // }
getList(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
diff --git a/src/views/jhzx/sydgWH.vue b/src/views/jhzx/sydgWH.vue
index f74a367..1a3eae7 100644
--- a/src/views/jhzx/sydgWH.vue
+++ b/src/views/jhzx/sydgWH.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :span="22">
<el-form-item label="船号:">
- <el-select v-model="queryParam.dcCh1" filterable placeholder="工程编号" >
+ <el-select v-model="queryParam.dcCh" filterable placeholder="工程编号" >
<el-option
v-for="item in dictData"
:key="item.cbbm"
@@ -27,7 +27,7 @@
<el-row>
<el-col :span="10" :offset="14">
<el-form-item style="float: right" >
- <el-button type="success" @click="sygdPC()" >预排产</el-button>
+ <el-button type="success" @click="sygdPC()" >导出excel</el-button>
<div style="float: right;margin-left: 5px" >
<el-upload
:action="uploadAction"
@@ -63,8 +63,8 @@
:data="list"
:custom-config="{ storage: true }"
highlight-hover-row
- highlight-current-row
show-overflow
+ show-header-overflow
@cell-click="cellClickEvent"
>
<!-- show-header-overflow-->
@@ -78,7 +78,7 @@
<script>
import { getCzxx} from '@/api/jhzx/qfxq'
-import { getList} from '@/api/jhzx/sygd'
+import {getSygdList} from '@/api/jhzx/sygd'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
@@ -90,7 +90,7 @@ export default {
data() {
return {
queryParam: {
- dcCh1:'',
+ dcCh:'',
dcPl:''
},
list: [],
@@ -103,81 +103,228 @@ export default {
height: '500px',
tableColumn:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
- { field: 'dcCh', title: '船号',width: 100},
- { field: 'dcPl', title: '批量号',width: 70},
- { field: 'dcFd', title: '分段号',width: 100},
- { field: 'gjjsDz', title: '钢加大组结束',width: 100},
- { field: 'gjjsXz', title: '钢加小组结束',width: 100},
- { field: 'jsqTlt', title: '套料图接收',width: 80},
- { field: 'jsqLqb', title: '板材领取表接收',width: 100},
- { field: 'dhqd', title: '订货清单号',width: 100},
- { field: 'gdZt', title: '状态',width: 70,formatter: ['dictFormat','SYZT']},
- { field: 'orderBs', title: '订货板数',width: 80},
- { field: 'arrivalB', title: '到货板数',width: 80},
- { field: 'tltSl', title: '套料图板数',width: 100},
- { field: 'slSl', title: '上料张数',width: 80},
- { field: 'slSj', title: '上料时间',width: 100},
- { field: 'pwSl', title: '抛丸数量',width: 100},
- { field: 'pwSj', title: '抛丸时间',width: 100},
- { field: 'xcpwSl', title: '型材抛丸',width: 100},
- { field: 'xcpwSj', title: '型材抛丸时间',width: 100},
- { field: 'n1ad', title: '1跨平直大板（大组）',width: 100},
- { field: 'n1adSj', title: '加工时间',width: 100},
- { field: 'n1ax', title: '1跨平直大板（小组）',width: 100},
- { field: 'n1axSj', title: '加工时间',width: 100},
- { field: 'n1ld', title: '1跨进线板（大组）',width: 100},
- { field: 'n1ldSj', title: '加工时间',width: 100},
- { field: 'n2bd', title: '2跨超长超宽板（大组）',width: 100},
- { field: 'n2bdSj', title: '加工时间',width: 100},
- { field: 'n2bx', title: '2跨超长超宽板（小组）',width: 100},
- { field: 'n2bxSj', title: '加工时间',width: 100},
- { field: 'n2cx', title: '2跨超长超宽曲板（小组）',width: 100},
- { field: 'n2cxSj', title: '加工时间',width: 100},
- { field: 'n2cd', title: '2跨超长超宽曲板（大组）',width: 100},
- { field: 'n2cdSj', title: '加工时间',width: 100},
- { field: 'n2tx', title: '2跨T型材腹板（小组）',width: 100},
- { field: 'n2txSj', title: '加工时间',width: 100},
- { field: 'n2td', title: '2跨T型材腹板（大组）',width: 100},
- { field: 'n2tdSj', title: '加工时间',width: 100},
- { field: 'n2jx', title: '2跨激光切割板（小组）',width: 100},
- { field: 'n2jxSj', title: '加工时间',width: 100},
- { field: 'n2jd', title: '2跨激光切割板（大组）',width: 100},
- { field: 'n2jdSj', title: '加工时间',width: 100},
- { field: 'n3cx', title: '3跨曲板（小组）',width: 100},
- { field: 'n3cxSj', title: '加工时间',width: 100},
- { field: 'n3cd', title: '3跨曲板（大组）',width: 100},
- { field: 'n3cdSj', title: '加工时间',width: 100},
- { field: 'n3hx', title: '3跨厚板（小组）',width: 100},
- { field: 'n3hxSj', title: '加工时间',width: 100},
- { field: 'n3hd', title: '3跨厚板（大组）',width: 100},
- { field: 'n3hdSj', title: '加工时间',width: 100},
- { field: 'n4px', title: '4跨普通板（小组）',width: 100},
- { field: 'n4pxSj', title: '加工时间',width: 100},
- { field: 'n4pd', title: '4跨普通板（大组）',width: 100},
- { field: 'n4pdSj', title: '加工时间',width: 100},
- { field: 'n4xx', title: '4跨普通板（机器人）',width: 100},
- { field: 'n4xxSj', title: '加工时间',width: 100},
- { field: 'n8gx', title: '光电',width: 100},
- { field: 'n8gxSj', title: '加工时间',width: 100},
- { field: 'x7xx', title: '7跨型板（小组）',width: 100},
- { field: 'x7xxSj', title: '加工时间',width: 100},
- { field: 'x7xd', title: '7跨型板（大组）',width: 100},
- { field: 'x7xdSj', title: '加工时间',width: 100},
- { field: 's2tx', title: '2跨T型材面板（小组）',width: 100},
- { field: 's2txSj', title: '加工时间',width: 100},
- { field: 's2td', title: '2跨T型材面板（大组）',width: 100},
- { field: 's2tdSj', title: '加工时间',width: 100},
- { field: 's3px', title: '3跨平铁（小组）',width: 100},
- { field: 's3pxSj', title: '加工时间',width: 100},
- { field: 's3pd', title: '3跨平铁（大组）',width: 100},
- { field: 's3pdSj', title: '加工时间',width: 100},
- { field: 's3xx', title: '3跨平铁（机器人）',width: 100},
- { field: 's3xxSj', title: '加工时间',width: 100},
- { field: 'gjks', title: '钢加开始',width: 100},
- { field: 'jhwgDz', title: '计划大组完成时间',width: 100},
- { field: 'jhwgXz', title: '计划小组完成时间',width: 100},
- { field: 'sjlyCh', title: '数据来源船',width: 100},
- { field: 'gxsj', title: '数据更新时间',width: 100},]
+ { 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: '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,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n3hdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4px', title: '4跨普通板（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4pxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4pd', title: '4跨普通板（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4pdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4xx', title: '4跨普通板（机器人）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4xxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n8gx', title: '光电',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n8gxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xx', title: '7跨型板（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xd', title: '7跨型板（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2tx', title: '2跨T型材面板（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2txSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2td', title: '2跨T型材面板（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2tdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3px', title: '3跨平铁（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3pxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3pd', title: '3跨平铁（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3pdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3xx', title: '3跨平铁（机器人）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3xxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'gjks', title: '钢加开始',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'jhwgDz', title: '计划大组完成时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'jhwgXz', title: '计划小组完成时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'sjlyCh', title: '数据来源船',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'gxsj', title: '数据更新时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+ ]
}
},
@@ -189,17 +336,28 @@ export default {
this.getHeight()
this.initBase()
},
+ watch: {
+ '$route'(){
+ this.getParams();
+ }
+ },
methods: {
+ 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)
+ }
+ },
uploadExcel() {
this.uploadData.isupload = this.isupload
},
cellClickEvent ( column ) {
- this.$router.push({
- name: 'SymxCX',
- params: {
- list: column.row.mxList
- }
- })
+
// console.log(column.row.mxList)
},
beforeAvatarUpload(file) {
@@ -242,7 +400,7 @@ export default {
this.$message.warning('选择船只编号')
return
}
- getList(this.queryParam).then((res) => {
+ getSygdList(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
diff --git a/src/views/jhzx/sygdCX.vue b/src/views/jhzx/sygdCX.vue
new file mode 100644
index 0000000..21fe659
--- /dev/null
+++ b/src/views/jhzx/sygdCX.vue
@@ -0,0 +1,471 @@
+<template>
+ <el-container>
+ <el-header style="width: 100%; height: 80px;font-size: 12px">
+ <el-form :inline="true" label-width="65px" label-position="left">
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="船号:">
+ <el-select v-model="queryParam.dcCh" filterable placeholder="工程编号" >
+ <el-option
+ v-for="item in dictData"
+ :key="item.cbbm"
+ :label="item.cbbm"
+ :value="item.cbbm">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="批量:">
+ <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="2">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="initList">查询</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="14">
+ </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
+ :align="'center'"
+ :height="height"
+ :auto-resize="true"
+ :columns="tableColumn"
+ :data="list"
+ :custom-config="{ storage: true }"
+ highlight-hover-row
+ show-overflow
+ show-header-overflow
+ @cell-click="cellClickEvent"
+ >
+ <!-- show-header-overflow-->
+ </vxe-grid>
+ </div>
+ </el-main>
+ </el-container>
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+import { getCzxx} from '@/api/jhzx/qfxq'
+import {getSygdList} 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'
+export default {
+ name:'SygdCX',
+ data() {
+ return {
+ queryParam: {
+ dcCh:'',
+ dcPl:''
+ },
+ list: [],
+ isupload:'02',
+ filedis:false,
+ uploadData:{},
+ heads: { token: getToken() },
+ uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
+ dictData:[],
+ height: '500px',
+ 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: '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,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n3hdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4px', title: '4跨普通板（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4pxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4pd', title: '4跨普通板（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4pdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4xx', title: '4跨普通板（机器人）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n4xxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n8gx', title: '光电',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'n8gxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xx', title: '7跨型板（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xd', title: '7跨型板（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'x7xdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2tx', title: '2跨T型材面板（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2txSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2td', title: '2跨T型材面板（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's2tdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3px', title: '3跨平铁（小组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3pxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3pd', title: '3跨平铁（大组）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3pdSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3xx', title: '3跨平铁（机器人）',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 's3xxSj', title: '加工时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'gjks', title: '钢加开始',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'jhwgDz', title: '计划大组完成时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'jhwgXz', title: '计划小组完成时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'sjlyCh', title: '数据来源船',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'gxsj', title: '数据更新时间',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+
+ ]
+
+ }
+ },
+ computed: {
+ ...mapGetters(['name', 'bmbm'])
+ },
+ created() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ this.initBase()
+ },
+ watch: {
+ '$route'(){
+ this.getParams();
+ }
+ },
+ methods: {
+ 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)
+ }
+ },
+ uploadExcel() {
+ this.uploadData.isupload = this.isupload
+ },
+ cellClickEvent ( column ) {
+
+ // console.log(column.row.mxList)
+ },
+ 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
+ })
+ }
+ },
+ initBase(){
+ getCzxx({}).then(res=>{
+ this.dictData = res.data
+ })
+ },
+ initList() {
+ if (this.queryParam.dcCh1 === '') {
+ this.$message.warning('选择船只编号')
+ return
+ }
+ getSygdList(this.queryParam).then((res) => {
+ this.list = res.data
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.list)
+ }
+
+ })
+ },
+ formatDate ({ cellValue }) {
+ return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+ },
+ getHeight() {
+ this.height = window.innerHeight - 190
+ },
+
+ }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+ .el-input{
+ width: 140px;
+ }
+ .el-select{
+ width: 140px;
+ }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+ background: #0a76a4;
+}
+
+.my-dropdown {
+ width: 400px;
+ height: 400px;
+ background-color: #fff;
+ border: 1px solid #dcdfe6;
+ box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+ font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.el-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.keyword-lighten {
+ color: #000;
+ background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+ line-height: inherit;
+}
+.el-form-item__label-wrap {
+ margin-left: 0px !important;
+ float: left;
+}
+.fontClass{
+ font-size: 12px;
+ font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index d35b442..f7a23b3 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -3,9 +3,9 @@
<el-header style="width: 100%; height: 70px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left">
<el-row >
- <el-col :span="19">
+ <el-col :span="4" >
<el-form-item label="船号:">
- <el-select v-model="queryParam.dcCh1" filterable placeholder="工程编号" >
+ <el-select v-model="queryParam.dcCh" filterable placeholder="工程编号" >
<el-option
v-for="item in dictData"
:key="item.cbbm"
@@ -14,42 +14,45 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="批量:">
- <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
+ </el-col>
+ <el-col :span="15">
+ <el-form-item >
+ <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-col>
<el-col :span="5" >
<el-form-item style="float: right" >
<el-button type="success" @click="initList">查询</el-button>
- <el-button type="success" @click="initList">保存</el-button>
+<!-- <el-button type="success" @click="initList">保存</el-button>-->
<el-button type="success" @click="sygdPC()" > 三月明细预排产 </el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="4" >
- <el-form-item label="跨位:">
- <el-select v-model="queryParam.dcCh1" filterable placeholder="工程编号" >
- <el-option
- v-for="item in dictData"
- :key="item.cbbm"
- :label="item.cbbm"
- :value="item.cbbm">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="10" >
- <el-form-item label="时间:">
- <el-date-picker v-model="queryParam.startTime" 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-col :span="4" >-->
+<!-- <el-form-item label="跨位:">-->
+<!-- <el-select v-model="queryParam.dcCh1" filterable placeholder="工程编号" >-->
+<!-- <el-option-->
+<!-- v-for="item in dictData"-->
+<!-- :key="item.cbbm"-->
+<!-- :label="item.cbbm"-->
+<!-- :value="item.cbbm">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+ <el-col :span="14" >
+ <el-form-item label="批量:">
+ <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
</el-form-item>
</el-col>
<el-col :span="10" >
<el-form-item style="float: right" >
- <el-button type="success" @click="initList">提取跨位信息</el-button>
- <el-button type="success" @click="initList">生成三月滚动</el-button>
+ <el-button type="success" @click="getKwList">提取跨位信息</el-button>
+ <el-button type="success" @click="tqSygd">生成三月滚动</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -73,6 +76,8 @@
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
+ @checkbox-all="selectAllEvent"
+ @checkbox-change="selectChangeEvent"
highlight-hover-row
show-overflow
show-header-overflow
@@ -83,6 +88,7 @@
</vxe-grid>
</div>
</el-tab-pane>
+
<el-tab-pane label="跨位生产信息" name="second">
<div class="mytable">
<vxe-grid
@@ -126,7 +132,6 @@
height="300"
:row-config="{isHover: true}"
:column-config="{resizable: true}"
- @checkbox-change="checkboxChangeEvent"
:data="selectMbch.no_tlt_ch">
<vxe-column type="seq" width="50" ></vxe-column>
<vxe-column field="dcCh" title="船号" width="150"></vxe-column>
@@ -151,14 +156,10 @@
<script>
import { getCzxx} from '@/api/jhzx/qfxq'
-import { getList,sygdPC,saveByDcch} from '@/api/jhzx/sygd'
-
-
+import { getList,sygdPC,saveByDcch,getKwList,tqSygd} 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'
export default {
name:'SymxCX',
data() {
@@ -169,15 +170,19 @@ export default {
haveTltBoms:[],
activeName: 'first',
queryParam: {
- dcCh1:'',
- dcPl:''
+ dcCh:'',
+ dcPl:'',
+ beginTime:'',
+ endTime:''
},
list: [],
list1: [],
+ checkedList: [],
heads: { token: getToken() },
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: '' } }],
@@ -258,6 +263,15 @@ export default {
{ field: 'slrq', title: '上料日期',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
+ { field: 'pwrq', title: '抛丸日期',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'hxrq', title: '划线日期',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
+ { field: 'qgrq', title: '切割日期',width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', }},
{ field: 'slry', title: '上料人员',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
@@ -283,11 +297,9 @@ export default {
{ field: 'pwry', title: '抛丸人员',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'pwrq', title: '抛丸日期',width: 100,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', }},
- { field: 'hxcdCk', title: '划线空程长度(米)',width: 100,
+
+ { field: 'hxcdKc', title: '划线空程长度(米)',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'hxsb', title: '划线设备',width: 100,
@@ -296,11 +308,9 @@ export default {
{ field: 'hxry', title: '划线人员',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'hxrq', title: '划线日期',width: 100,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', }},
- { field: 'qgcdCk', title: '切割空程长度（米)',width: 100,
+
+ { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'qgsb', title: '切割设备',width: 100,
@@ -309,9 +319,7 @@ export default {
{ field: 'qgry', title: '切割人员',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: 'qgrq', title: '切割日期',width: 100,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', }},
+
{ field: 'pklx', title: '坡口类型',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
@@ -364,37 +372,43 @@ export default {
],
tableColumn1:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
- { field: '', title: '日期',width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', }},
- { field: '', title: '区域',width: 100,
+ { field: 'rq', title: '日期',width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: '', title: '跨位',width: 100,
+ // { field: '', title: '区域',width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
+ { field: 'kw', title: '跨位',width: 150,formatter: ['dictFormat','QGKW'],
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: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
- { field: '', title: '加工数量',width: 100,
+ { field: 'tlt_sl', title: '套料图数量/板数',width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: '', title: '产能',width: 100,
+ { field: 'hx_cd', title: '划线长度',width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- { field: '', title: '产能单位',width: 100,
+ { field: 'qg_cd', title: '切割长度',width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
+ // { field: '', title: '产能',width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
+ // { field: '', title: '产能单位',width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', }},
]
}
@@ -407,12 +421,50 @@ export default {
this.getHeight()
this.initBase()
},
- watch: {
- '$route'(){
- this.getParams();
- }
- },
+
methods: {
+ tqSygd(){
+ // if (!this.checkedList){
+ // this.$message.warning('请选择生成内容！');
+ // return
+ // }
+ tqSygd().then((res) => {
+ if (res.data) {
+ this.$router.push({
+ name: 'SygdCX',
+ params: {
+ list: res.data
+ }
+ })
+ }else {
+ this.$message.warning('请先将三月明细预排产！');
+ }
+ })
+ },
+ // 全选
+ selectAllEvent() {
+ const records = this.$refs.xGrid.getCheckboxRecords();
+ this.checkedList = records;
+ },
+ // 单选
+ selectChangeEvent() {
+ const records = this.$refs.xGrid.getCheckboxRecords();
+ this.checkedList = records;
+ },
+ getKwList(){
+ if (!this.checkedList){
+ this.$message.warning('请选择提取内容！');
+ return
+ }
+ getKwList(this.checkedList).then((res) => {
+ this.list1 = res.data
+ if (this.$refs.xGrid1) {
+ this.$refs.xGrid1.loadData(this.list1)
+ this.activeName='second'
+ }
+
+ })
+ },
saveByDcch(){
// for (var a of this.selectMbch.no_tlt_ch){
@@ -432,26 +484,18 @@ export default {
})
this.dialogVisible=false;
},
- checkboxChangeEvent(){
- const $table = tableRef.value
- if ($table) {
- selectRecords.value = $table.getCheckboxRecords()
- }
- },
+ // checkboxChangeEvent(){
+ // const $table = tableRef.value
+ // if ($table) {
+ // selectRecords.value = $table.getCheckboxRecords()
+ // }
+ // },
handleClick(tab, event) {
- console.log(tab, event)
- },
- 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)
- }
+ // console.log(tab)
+ // console.log(event)
+ console.log(this.activeName)
},
+
formatterLx({cellValue}){
if(cellValue==='B'){
return '板材'
@@ -467,17 +511,17 @@ export default {
})
},
initList() {
- // if (this.queryParam.dcCh1 === '') {
- // this.$message.warning('选择船只编号')
- // return
- // }
- // getList(this.queryParam).then((res) => {
- // this.list = res.data
- // if (this.$refs.xGrid) {
- // this.$refs.xGrid.loadData(this.list)
- // }
- //
- // })
+ if (this.queryParam.dcCh1 === '') {
+ this.$message.warning('选择船只编号')
+ return
+ }
+ getList(this.queryParam).then((res) => {
+ this.list = res.data
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.list)
+ }
+
+ })
},
formatDate ({ cellValue }) {
return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
new file mode 100644
index 0000000..b94f380
--- /dev/null
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -0,0 +1,396 @@
+<template>
+<!-- 月度计划管理 -->
+ <el-container>
+ <el-header style="width: 100%; height: 80px;font-size: 12px">
+ <el-form :inline="true" label-width="65px" label-position="left">
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="船号:">
+ <el-select v-model="queryParam.dcCh" filterable placeholder="工程编号" >
+ <el-option
+ v-for="item in dictData"
+ :key="item.cbbm"
+ :label="item.cbbm"
+ :value="item.cbbm">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="批量:">
+ <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="2">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="initList">查询</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="14">
+ <el-form-item style="float: right" >
+ <el-button type="success" @click="sygdPC()" >导出excel</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" >Excel导入</el-button>
+ </el-upload>
+ </div>
+ </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
+ :align="'center'"
+ :height="height"
+ :auto-resize="true"
+ :columns="tableColumn"
+ :data="list"
+ :custom-config="{ storage: true }"
+ highlight-hover-row
+ show-overflow
+ show-header-overflow
+ @cell-click="cellClickEvent"
+ >
+ <!-- show-header-overflow-->
+ </vxe-grid>
+ </div>
+ </el-main>
+ </el-container>
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+import { getCzxx} from '@/api/jhzx/qfxq'
+import {getSygdList} 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'
+export default {
+ name:'YdjhzxGL',
+ data() {
+ return {
+ queryParam: {
+ dcCh:'',
+ dcPl:''
+ },
+ list: [],
+ isupload:'02',
+ filedis:false,
+ uploadData:{},
+ heads: { token: getToken() },
+ uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
+ dictData:[],
+ height: '500px',
+ tableColumn:[
+ { type: 'seq', width: 60, title: '序号',fixed: "left"},
+ { field: '', title: '产品', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '批量', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '分段', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '上料', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '型材抛丸', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '抛丸', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '一垮龙门板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '一垮数控板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '二垮数控板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '三垮数控板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '三垮平铁板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '平铁切割开始', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '平铁切割结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '曲平铁转结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '曲平铁结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '曲外板结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '组立', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '数控 板数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '面板挤边', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '七垮型 材米数', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '型材 面板', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '小组配送结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '光电 结束', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+ { field: '', title: '备注', width: 120, editRender: { name: 'input' },
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+ ]
+
+ }
+ },
+ computed: {
+ ...mapGetters(['name', 'bmbm'])
+ },
+ created() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ this.initBase()
+ },
+ watch: {
+ '$route'(){
+ this.getParams();
+ }
+ },
+ methods: {
+ 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)
+ }
+ },
+ uploadExcel() {
+ this.uploadData.isupload = this.isupload
+ },
+ cellClickEvent ( column ) {
+
+ // console.log(column.row.mxList)
+ },
+ 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
+ })
+ }
+ },
+ initBase(){
+ getCzxx({}).then(res=>{
+ this.dictData = res.data
+ })
+ },
+ initList() {
+ if (this.queryParam.dcCh1 === '') {
+ this.$message.warning('选择船只编号')
+ return
+ }
+ getSygdList(this.queryParam).then((res) => {
+ this.list = res.data
+ if (this.$refs.xGrid) {
+ this.$refs.xGrid.loadData(this.list)
+ }
+
+ })
+ },
+ formatDate ({ cellValue }) {
+ return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+ },
+ getHeight() {
+ this.height = window.innerHeight - 190
+ },
+
+ }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+ .el-input{
+ width: 140px;
+ }
+ .el-select{
+ width: 140px;
+ }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+ background: #0a76a4;
+}
+
+.my-dropdown {
+ width: 400px;
+ height: 400px;
+ background-color: #fff;
+ border: 1px solid #dcdfe6;
+ box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+ font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.el-input {
+ display: inline-block !important;
+ position: relative !important;
+ width: auto;
+}
+.keyword-lighten {
+ color: #000;
+ background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+ line-height: inherit;
+}
+.el-form-item__label-wrap {
+ margin-left: 0px !important;
+ float: left;
+}
+.fontClass{
+ font-size: 12px;
+ font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 415805f..5783988 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -8,7 +8,7 @@
<div class="title-container">
- <h1 class="title">{{ loginForm.zxtmc }}计划排产</h1>
+ <h1 class="title">{{ loginForm.zxtmc }}钢加生产计划排产</h1>
<h3 class="title">{{ loginForm.zxtmc }}登录</h3>
</div>
diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue
index 2cb8d76..7f02ba4 100644
--- a/src/views/sjzx/sbxxWH.vue
+++ b/src/views/sjzx/sbxxWH.vue
@@ -171,6 +171,7 @@ export default {
{
field: "szcs",
title: "所属部门",
+ formatter: ['dictFormat','BMBM'],
editRender: { name: "input" },
minWidth: "90",
},