xiaoning 1 year ago
parent 0f77695eb4
commit af38e985bb

@ -25,8 +25,8 @@ import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'
import cal from './utils/calculation'
// import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
// VXETable.use(VXETablePluginExportXLSX)
import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
VXETable.use(VXETablePluginExportXLSX)
Vue.prototype.cal = cal
Vue.use(VXETable)
import print from './utils/print' //能不能单独引用

@ -45,20 +45,19 @@
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<div class="upload-demo">
<el-upload
action="#"
accept=".xls,.xlsx"
:multiple="false"
:file-list="fileList"
:http-request="actionUpload"
>
<el-button size="mini" type="primary">导入</el-button>
</el-upload>
</div>
<el-button type="primary" @click="toolbarButtonClickEvent('save')"
>保存</el-button
>
<el-upload
:action="uploadAction"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="fileList"
:on-success="handleAvatarSuccess"
:headers="heads"
>
<el-button type="success" @click="uploadExcel" > 导入 </el-button>
</el-upload>
<!-- <el-button type="primary" @click="toolbarButtonClickEvent('save')"-->
<!-- >保存</el-button-->
<!-- >-->
</el-col>
</el-row>
</el-form>
@ -99,6 +98,9 @@
<script>
import { getList, tj, save, upload } from "@/api/jhzx/dhqdWH";
import { getCzxx } from "@/api/jhzx/qfxq";
import {getToken} from "@/utils/auth";
import {endLoading, startLoading} from "@/utils";
import {Message} from "element-ui";
export default {
name: "dhqdWH",
data() {
@ -108,6 +110,9 @@ export default {
Zt: "0",
},
list: [],
isupload:'02',
heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmDhqdp/upload',
height: "500px",
tableColumn: [
{ type: "checkbox", width: "50", align: "center", fixed: "left" },
@ -521,16 +526,35 @@ export default {
});
},
// excel
actionUpload(file) {
const formData = new FormData();
formData.append("file", file.file);
upload(formData).then((res) => {
if (res.success) {
this.list = res.data;
this.checkedList = [];
this.$message.success("导入成功!");
}
});
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.initList();
} else {
Message({
message: res.message || 'Error',
type: 'error',
duration: 5 * 1000
})
}
},
uploadExcel() {
this.uploadData.isupload = this.isupload
},
//
selectAllEvent() {

@ -8,7 +8,7 @@
<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="month" style="width: 33%;" />
<span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px"></span>
<el-input v-model="queryParam.endTime" disabled></el-input>
<el-input v-model="queryParam.endTime" ></el-input>
<!-- <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="month" style="width: 33%" />-->
</el-form-item>
</el-col>
@ -48,45 +48,45 @@
:height="height"
:auto-resize="true"
:columns="tableColumn"
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
:row-style="rowClassName"
highlight-hover-row
show-overflow
>
</vxe-grid>
</div>
</el-tab-pane>
<el-tab-pane label="汇总" name="third">
<div class="mytable">
<vxe-grid
id="id2"
ref="xGrid2"
border
resizable
keep-source
show-footer
:align="'center'"
:height="height"
:auto-resize="true"
highlight-current-row
:data="list2"
:columns="tableColumn2"
:custom-config="{ storage: true }"
:footer-method="footerMethod"
highlight-hover-row
show-overflow
show-header-overflow
>
<template #numMx5="{ items, _columnIndex }">
<span style="color: red">{{ items[_columnIndex] }}</span>
</template>
</vxe-grid>
</div>
</el-tab-pane>
<!-- <el-tab-pane label="汇总" name="third">-->
<!-- <div class="mytable">-->
<!-- <vxe-grid-->
<!-- id="id2"-->
<!-- ref="xGrid2"-->
<!-- border-->
<!-- resizable-->
<!-- keep-source-->
<!-- show-footer-->
<!-- :align="'center'"-->
<!-- :height="height"-->
<!-- :auto-resize="true"-->
<!-- highlight-current-row-->
<!-- :data="list2"-->
<!-- :columns="tableColumn2"-->
<!-- :custom-config="{ storage: true }"-->
<!-- :footer-method="footerMethod"-->
<!-- highlight-hover-row-->
<!-- show-overflow-->
<!-- show-header-overflow-->
<!-- >-->
<!-- <template #numMx5="{ items, _columnIndex }">-->
<!-- <span style="color: red">{{ items[_columnIndex] }}</span>-->
<!-- </template>-->
<!-- </vxe-grid>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
</el-tabs>
</el-main>
</el-container>

@ -47,20 +47,21 @@
</div>
<el-row>
<el-col :span="24" style="text-align: right">
<div class="upload-demo">
<el-upload
action="#"
accept=".xls,.xlsx"
:multiple="false"
:file-list="fileList"
:http-request="actionUpload"
>
<el-button size="mini" type="primary">导入</el-button>
</el-upload>
</div>
<el-button type="primary" @click="toolbarButtonClickEvent('save')"
>保存</el-button
<!-- <div class="upload-demo">-->
<el-upload
:action="uploadAction"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="fileList"
:on-success="handleAvatarSuccess"
:headers="heads"
>
<el-button type="success" @click="uploadExcel" > 导入 </el-button>
</el-upload>
<!-- </div>-->
<!-- <el-button type="primary" @click="toolbarButtonClickEvent('save')"-->
<!-- >保存</el-button-->
<!-- >-->
</el-col>
</el-row>
</el-form>
@ -100,6 +101,9 @@
<script>
import { getList, save, tj, upload } from "@/api/jhzx/jtsyWH";
import {getToken} from "@/utils/auth";
import {endLoading, startLoading} from "@/utils";
import {Message} from "element-ui";
export default {
name: "jtsyWH",
data() {
@ -109,6 +113,9 @@ export default {
dateEnd: "",
Zt: "",
},
heads: { token: getToken() },
isupload:'02',
uploadAction: process.env.VUE_APP_BASE_API + '/dmJtsyjh/upload',
list: [],
height: "500px",
tableColumn: [
@ -342,16 +349,35 @@ export default {
}
},
// excel
actionUpload(file) {
const formData = new FormData();
formData.append("file", file.file);
upload(formData).then((res) => {
if (res.success) {
this.$message.success("上传成功!");
this.list = res.data;
this.checkedList = [];
}
});
uploadExcel() {
this.uploadData.isupload = this.isupload
},
beforeAvatarUpload(file) {
//
const isType = file.type === 'application/vnd.ms-excel'
const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
const fileType = isType || isTypeComputer
if (!fileType) {
this.$message.error('上传文件只能是xls/xlsx格式')
return
}
startLoading()
return fileType
},
handleAvatarSuccess(res, file) {
endLoading()
if (res.success) {
this.$message({ message: '导入成功', type: 'success' })
this.initList();
} else {
Message({
message: res.message || 'Error',
type: 'error',
duration: 5 * 1000
})
}
},
//
selectAllEvent() {

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "QfqrGL",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -5,14 +5,36 @@
<el-row>
<el-col :span="22">
<el-form-item label="船号:">
<el-select v-model="queryParam.dcCh" filterable placeholder="工程编号" @change="czbhChange" >
<el-option
v-for="item in dictData"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm">
</el-option>
</el-select>
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="queryParam.dcch"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="auto"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item>
<el-form-item label="批量:">
<el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
@ -83,6 +105,7 @@ import {null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
import {getCzplBase} from "@/api/sjzx/jcsj";
export default {
name:'QfxqSH',
data() {
@ -93,6 +116,16 @@ export default {
zt:'1'
},
list: [],
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
isupload:'02',
filedis:true,
uploadData:{
@ -173,6 +206,23 @@ export default {
this.initList()
},
methods: {
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
if (this.queryParam.dcch) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
czbhChange(){
if (this.queryParam.dcCh === '') {s
this.filedis=true
@ -184,6 +234,10 @@ export default {
getCzxx({}).then(res=>{
this.dictData = res.data
})
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
initList() {
// if (this.queryParam.dcCh === '') {

@ -4,6 +4,38 @@
<el-form :inline="true" label-width="65px" label-position="left">
<el-row>
<el-col :span="22">
<el-form-item label="船号:">
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="queryParam.dcch"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="auto"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item>
<el-form-item label="月份:">
<el-date-picker v-model="queryParam.db" value-format="yyyy/MM" type="month" style="width: 80%;" />
</el-form-item>
@ -28,7 +60,7 @@
:disabled="filedis"
:headers="heads"
>
<el-button type="success" @click="uploadExcel" > Excel导入 </el-button>
<el-button type="success" @click="uploadExcel" > 导入 </el-button>
</el-upload>
</div>
@ -83,6 +115,7 @@ import XEUtils from 'xe-utils'
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
import {getCzplBase} from "@/api/sjzx/jcsj";
export default {
name:'Qfxqwh',
data() {
@ -92,10 +125,21 @@ export default {
zt:'0'
},
list: [],
isupload:'02',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
filedis:false,
uploadData:{
},
isupload:'02',
heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmQfxq/upload',
dictData:[],
@ -171,6 +215,23 @@ export default {
this.initBase()
},
methods: {
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
if (this.queryParam.dcch) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
uploadExcel() {
this.uploadData.isupload = this.isupload
},
@ -205,6 +266,10 @@ export default {
getCzxx({}).then(res=>{
this.dictData = res.data
})
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
initList() {

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "QfzxGL",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -102,7 +102,6 @@ export default {
list: [],
filedis:false,
uploadData:{},
heads: { token: getToken() },
dictData:[],
height: '500px',
tableColumn:[

@ -83,7 +83,6 @@
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
>
<!-- show-header-overflow-->
</vxe-grid>
</div>
</el-main>
@ -340,19 +339,10 @@ export default {
{ 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,
{ field: 'id', title: '流水号(禁止修改)',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
@ -392,10 +382,10 @@ export default {
type: 'xlsx',// xlsx csv
data: this.data, //
//
// columnFilterMethod: function(column, $columnIndex) {
// return !(column.$columnIndex === 0 )
// // 0
// }
columnFilterMethod: function(column, $columnIndex) {
return !(column.$columnIndex === 0 )
// 0
}
})
},
uploadExcel() {
@ -460,7 +450,7 @@ export default {
return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
},
getHeight() {
this.height = window.innerHeight - 190
this.height = window.innerHeight - 150
},
//
selectAllEvent() {

File diff suppressed because it is too large Load Diff

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "Tzxq",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "Wzxq",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -6,28 +6,36 @@
<el-row>
<el-col :span="4">
<el-form-item label="船号:">
<el-select v-model="request.dcCh" placeholder="船号" clearable>
<el-option
v-for="item in ShipNoList"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="request.dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="300px"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item>
</el-col>
<el-col :span="4">
@ -51,7 +59,7 @@
</div>
</el-form-item>
</el-col>
<el-col :span="12" style="text-align: right">
<el-col :span="16" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
@ -107,6 +115,7 @@
import { getList, tj, save, upload } from "@/api/jhzx/xbjhWH";
import { getCzxx } from "@/api/jhzx/qfxq";
import XEUtils from "xe-utils";
import {getCzplBase} from "@/api/sjzx/jcsj";
export default {
name: "xbjhCX",
data() {
@ -116,6 +125,16 @@ export default {
Zt: "",
nf: "",
},
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
nrStart: "",
nrEnd: "",
height: "500px",
@ -150,6 +169,23 @@ export default {
this.getHeight();
},
methods: {
cellClickEvent({row}) {
this.request.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
if (this.request.dcCh) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
//
compare(property) {
return function (object1, object2) {
@ -294,6 +330,10 @@ export default {
this.ShipNoList = res.data;
}
});
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
//
initList() {

@ -6,28 +6,36 @@
<el-row>
<el-col :span="4">
<el-form-item label="船号:">
<el-select v-model="request.dcCh" placeholder="船号" clearable>
<el-option
v-for="item in ShipNoList"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="request.dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="300px"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item>
</el-col>
<el-col :span="4">
@ -51,16 +59,13 @@
</div>
</el-form-item>
</el-col>
<el-col :span="12" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('submit')"
>审核</el-button
>
<el-col :span="16" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<div class="upload-demo">
<el-upload
action="#"
accept=".xls,.xlsx"
@ -70,10 +75,8 @@
>
<el-button size="mini" type="primary">导入</el-button>
</el-upload>
</div>
<el-button type="primary" @click="toolbarButtonClickEvent('save')"
>保存</el-button
>
</el-col>
</el-row>
</el-form>
@ -95,7 +98,7 @@
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
>
<vxe-column type="checkbox" width="50"></vxe-column>
<!-- <vxe-column type="checkbox" width="50"></vxe-column>-->
<vxe-column type="seq" width="80" :resizable="false" show-overflow>
<template #header>
<div class="first-col">
@ -130,6 +133,7 @@
<script>
import { getList, tj, save, upload } from "@/api/jhzx/xbjhWH";
import { getCzxx } from "@/api/jhzx/qfxq";
import {getCzplBase} from "@/api/sjzx/jcsj";
export default {
name: "xbjhWH",
data() {
@ -139,6 +143,16 @@ export default {
Zt: "",
nf: "",
},
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
nrStart: "",
nrEnd: "",
height: "500px",
@ -171,8 +185,30 @@ export default {
this.initList(); //
this.getCzxx();
this.getHeight();
this.getNowTime();
},
methods: {
getNowTime(){
var now=new Date();
let year=now.getFullYear();
// this.nrStart=year
// this.nrEnd=year
},
cellClickEvent({row}) {
this.request.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
if (this.request.dcCh) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
//
compare(property) {
return function (object1, object2) {
@ -315,6 +351,10 @@ export default {
this.ShipNoList = res.data;
}
});
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
//
initList() {

@ -36,7 +36,6 @@
:height="height"
:auto-resize="true"
:columns="tableColumn"
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
:edit-config="{
@ -46,6 +45,7 @@
}"
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
highlight-current-row
highlight-hover-row
show-overflow
>
@ -64,16 +64,11 @@
:height="height"
:auto-resize="true"
:columns="tableColumn2"
highlight-current-row
:data="list2"
:custom-config="{ storage: true }"
:span-method="rowspanMethod"
:cell-style="cellStyle"
:scroll-y="{enabled: false}"
highlight-current-row
highlight-hover-row
show-overflow
show-header-overflow
@cell-click="cellClickEvent_xb"
>
</vxe-grid>
</div>
@ -94,9 +89,9 @@
:data="list3"
:custom-config="{ storage: true }"
:cell-style="cellStyle"
highlight-current-row
highlight-hover-row
show-overflow
show-header-overflow
@cell-click="cellClickEvent_xb"
>
</vxe-grid>
@ -127,7 +122,7 @@
</vxe-grid>
</div>
</el-tab-pane>
<el-tab-pane label="切割信息" name="fifth">
<el-tab-pane label="抛丸信息" name="fifth">
<div class="mytable">
<vxe-grid
id="id5"
@ -151,6 +146,30 @@
</vxe-grid>
</div>
</el-tab-pane>
<el-tab-pane label="切割信息" name="sixth">
<div class="mytable">
<vxe-grid
id="id6"
ref="xGrid6"
border
resizable
keep-source
:align="'center'"
:height="height"
:auto-resize="true"
:columns="tableColumn7"
highlight-current-row
:data="list6"
:custom-config="{ storage: true }"
:cell-style="cellStyle"
highlight-hover-row
show-overflow
show-header-overflow
@cell-click="cellClickEvent_xb"
>
</vxe-grid>
</div>
</el-tab-pane>
</el-tabs>
</el-main>
</el-container>
@ -224,6 +243,7 @@ export default {
list3: [],
list4: [],
list5: [],
list6: [],
checkedList: [],
heads: { token: getToken() },
dictData:[],
@ -366,88 +386,323 @@ export default {
],
tableColumn2: [
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: 'tzxqq', title: '图纸需求期',width: 180,
{ field: 'tzzt', title: '图纸状态', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcCh', title: '船号',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcPl', title: '批量',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcFd', title: '分段',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'xfqLqb', title: '领取表下发 ',width: 180,
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqbxfrq', title: '领取表下发日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'jsqLqb', title: '领取表接收',width: 180,
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqbjsrq', title: '领取表接收日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'xfqTlt', title: '套料图下发 ',width: 180,
filterRender: { name: 'FilterCombination', },
},
{ field: 'tltxfrq', title: '套料图下发日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'jsqTlt', title: '套料图接收',width: 180,
filterRender: { name: 'FilterCombination', },
},
{ field: 'tltjsrq', title: '套料图接收日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgxqrq', title: '切割需求日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
tableColumn3:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: 'dcCh', title: '船号',width: 100,
{ field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dcPl', title: '批量',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'dhqdh', title: '订货清单号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'dhqd', title: '订货清单号',width: 150,
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '物品材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'rkxh', title: '材质',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'hd', title: '厚度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'wphd', title: '厚度',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'kd', title: '宽度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'wpkd', title: '宽度',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'cd', title: '长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'wpcd', title: '长度',width: 100,
filterRender: { name: 'FilterCombination', },
},
{ field: 'xqsl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'hdsl', title: '到货数量',width: 120,
filterRender: { name: 'FilterCombination', },
},
{ field: 'slxqrq', title: '上料需求日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'gcxqq', title: '钢材需求期',width: 120,
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hth', title: '合同号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xhth', title: '小合同号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dhsl', title: '到货数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
tableColumn4:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: '', title: '钢料需求期',width: 200,
{ field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: '', title: '上料位置',width: 200,
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: '', title: '上料张数',width: 200,
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tlth', title: '套料图号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpgg', title: '规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpzl', title: '重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hth', title: '合同号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xhth', title: '小合同号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lph', title: '炉批号/物料号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kwh', title: '库存垛位', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'cs', title: '层数', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'jpbs', title: '校平标识', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'slfzry', title: '上料负责人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'slwz', title: '上料位置', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sljhrq', title: '上料计划期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
tableColumn5:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: '', title: '切割日期',width: 200,
{ field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: '', title: '跨位',width: 200,
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: '', title: '切割设备',width: 200,
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: '', title: '切割张数',width: 200,
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tlth', title: '套料图号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpgg', title: '规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpzl', title: '重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwwz', title: '抛丸位置', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwjhrq', title: '抛丸计划日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sljhwgrq', title: '上料计划完工期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwfzr', title: '抛丸负责人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'jpbs', title: '校平标识', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
tableColumn6:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
@ -586,6 +841,113 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
],
tableColumn7:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: 'czbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tlth', title: '套料图号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpgg', title: '规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpzl', title: '重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjhrq', title: '切割计划期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgfzry', title: '切割负责人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxsbbh', title: '划线设备编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxcd', title: '划线长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxkccd', title: '划线空程长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgsbbh', title: '切割设备编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgcd', title: '切割长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgkccd', title: '切割空程长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
}
},
computed: {

@ -49,20 +49,21 @@
</div>
<el-row>
<el-col :span="24" style="text-align: right">
<div class="upload-demo">
<el-upload
action="#"
accept=".xls,.xlsx"
:multiple="false"
:file-list="fileList"
:http-request="actionUpload"
>
<el-button size="mini" type="primary">导入</el-button>
</el-upload>
</div>
<el-button type="primary" @click="toolbarButtonClickEvent('save')"
>保存</el-button
<!-- <div >-->
<el-upload
:action="uploadAction"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="fileList"
:on-success="handleAvatarSuccess"
:headers="heads"
>
<el-button type="success" @click="uploadExcel" > 导入 </el-button>
</el-upload>
<!-- </div>-->
<!-- <el-button type="primary" @click="toolbarButtonClickEvent('save')"-->
<!-- >保存</el-button-->
<!-- >-->
</el-col>
</el-row>
</el-form>
@ -102,6 +103,9 @@
<script>
import { getList, tj, save, upload } from "@/api/jhzx/zrcWH";
import {getToken} from "@/utils/auth";
import {endLoading, startLoading} from "@/utils";
import {Message} from "element-ui";
export default {
name: "zrcWH",
data() {
@ -110,6 +114,9 @@ export default {
date: "",
Zt: "0",
},
isupload:'02',
heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmZrcjh/upload',
list: [],
height: "500px",
tableColumn: [
@ -841,16 +848,35 @@ export default {
});
},
// excel
actionUpload(file) {
const formData = new FormData();
formData.append("file", file.file);
upload(formData).then((res) => {
if (res.success) {
this.list = res.data;
this.checkedList = [];
this.$message.success("导入成功!");
}
});
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.initList();
} else {
Message({
message: res.message || 'Error',
type: 'error',
duration: 5 * 1000
})
}
},
uploadExcel() {
this.uploadData.isupload = this.isupload
},
//
selectAllEvent() {

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "DhqdFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "DmjhD",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "DmjhFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "PkjhD",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "PkjhFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "QgjhFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "QmjhFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "SljhFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "TzjhFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "YppCX",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "YppFK",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "YppGL",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "WzckGL",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "Wzkctj",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "WzrkGL",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "PssjFX",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "ScgdFX",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "SygdFX",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "YdjhzxFX",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>

@ -139,9 +139,10 @@ export default {
// ],
// filterRender: { name: "FilterCombination" },
// },
{
field: "kw",
title: "跨位",
field: "gx",
title: "工序",
align: "center",
minWidth: "70",
editRender: {
@ -166,8 +167,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "gx",
title: "工序",
field: "kw",
title: "跨位",
align: "center",
minWidth: "70",
editRender: {
@ -493,15 +494,7 @@ export default {
break;
case "delete":
if (this.checkedList.length > 0) {
this.$confirm("是否确认删除选中的数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$refs.tableRef.removeCheckboxRow();
})
.catch(() => {});
this.$refs.tableRef.removeCheckboxRow();
} else {
this.$message.warning("请选择数据!");
}
@ -515,25 +508,17 @@ export default {
} else {
//
if (insertRecords.length !== 0) {
this.$confirm("是否确认保存选中的数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
save(insertRecords).then((res) => {
if (res.success) {
this.list = this.list.concat(insertRecords);
const xTable = this.$refs.tableRef;
xTable.loadData(this.initList());
this.$message({
message: "保存成功!",
type: "success",
});
}
save(insertRecords).then((res) => {
if (res.success) {
this.list = this.list.concat(insertRecords);
const xTable = this.$refs.tableRef;
xTable.loadData(this.initList());
this.$message({
message: "保存成功!",
type: "success",
});
})
.catch(() => {});
}
});
}
//

@ -14,9 +14,9 @@
</el-form-item>
</el-col>
<el-col :span="20" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('insert')"
>添加</el-button
>
<!-- <el-button type="success" @click="toolbarButtonClickEvent('insert')"-->
<!-- >添加</el-button-->
<!-- >-->
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
@ -46,12 +46,12 @@
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right">
<el-button type="danger" @click="toolbarButtonClickEvent('delete')"
>删除</el-button
>
<el-button type="primary" @click="toolbarButtonClickEvent('save')"
>保存</el-button
>
<!-- <el-button type="danger" @click="toolbarButtonClickEvent('delete')"-->
<!-- >删除</el-button-->
<!-- >-->
<!-- <el-button type="primary" @click="toolbarButtonClickEvent('save')"-->
<!-- >保存</el-button-->
<!-- >-->
</el-col>
</el-row>
</el-form>

@ -2,28 +2,58 @@
<!-- 图纸查询 样式-->
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="45px">
<el-row>
<el-col :span="6">
<el-form ref="requestForm" :model="request" :inline="true" label-width="65px" label-position="left">
<el-row >
<el-col :span="22" >
<el-form-item label="船号:">
<el-select v-model="request.dcCh" placeholder="船号" clearable>
<el-option
v-for="item in ShipNoList"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm"
>
</el-option>
</el-select>
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="request.dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="auto"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</el-form-item>
<el-form-item >
<el-checkbox v-model="request.flag" >不显示完工船只</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="2" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="批量:">
<el-input v-model="request.dcPl" placeholder="批量" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态:">
<el-select v-model="request.zt" placeholder="状态" clearable>
<el-option
@ -36,9 +66,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
</el-form>
</el-header>
@ -59,9 +86,6 @@
:custom-config="{ storage: true }"
:scroll-y="{ enabled: true }"
highlight-hover-row
:checkbox-config="{ checkMethod: CheckboxkMethod }"
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
>
<template #Zt_default="{ row }">
<div v-for="(item, index) in statusOptions" :key="index">
@ -78,7 +102,7 @@
<script>
import { getList, sh } from "@/api/jhzx/tzCX";
import { getCzxx } from "@/api/jhzx/qfxq";
import {getCzplBase} from "@/api/sjzx/jcsj";
export default {
name: "TzjhGL",
data() {
@ -87,7 +111,18 @@ export default {
dcCh: "",
dcPl: "",
Zt: "",
flag:true
},
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
list: [],
height: "500px",
tableColumn: [
@ -331,13 +366,26 @@ export default {
this.initList();
},
methods: {
cellClickEvent({row}) {
this.request.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
if (this.request.dcCh) {
this.projectData = this.projectData1.filter(row => row.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
//
getCzxx() {
getCzxx().then((res) => {
if (res.success) {
this.ShipNoList = res.data;
}
});
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
//
initList() {
@ -356,54 +404,70 @@ export default {
},
};
</script>
<style lang="scss" scoped>
.el-header {
margin: 0;
padding: 5px 0;
height: auto;
}
.el-container {
padding: 0;
margin: 0;
}
.el-main {
padding: 0;
}
.el-col {
padding: 0;
}
.el-aside {
background: #fff;
padding: 0;
}
.el-container {
padding: 0;
}
.el-row {
margin-bottom: 5px;
}
.el-row:last-child {
margin-bottom: 0;
<style lang="scss" scoped >
.el-header{margin:0;padding: 5px;height:auto;
.el-input{
width: 140px;
}
.el-select{
width: 140px;
}
}
.tableStyles {
.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: 450px;
height: 250px;
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;
}
::v-deep .mytable .vxe-input {
display: flex !important;
.el-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
::v-deep .el-form-item {
margin-bottom: 0px !important;
.keyword-lighten {
color: #000;
background-color: #FFFF00;
}
::v-deep .el-input {
width: auto !important;
.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>

@ -0,0 +1,22 @@
<template>
<el-container>
<span style="margin-top: 20px;margin-left: 20px">待开发...</span>
</el-container>
</template>
<script>
export default {
name: "Cgjhdh",
data() {
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped >
</style>
Loading…
Cancel
Save