基础数据

master
xhj 2 years ago
parent 0ecc9f2f28
commit b1772301cc

@ -7,6 +7,7 @@ export function add(data) {return request({url: '/dmCbxxp/add', method: 'post',
export function getCzplBase(data) {return request({url: '/dmCzplpNew/getCzplBase', method: 'post', data})}
export function czPlDel(data) {return request({url: '/dmCzplpNew/czPlDel', method: 'post', data})}
export function wgetCzplBase(data) {return request({url: '/dmCzplpNew/getCzplBase', method: 'post', data})}
export function czPlupdate(data) {return request({url: '/dmCzplpNew/czPlupdate', method: 'post', data})}
export function getCzplList(data) {return request({url: '/dmCzplpNew/getCzplList', method: 'post', data})}

@ -11,10 +11,8 @@ import XEUtils from 'xe-utils'
* flag: 是否触发更新
*/
VXETable.formats.add('dictFormat',({cellValue, column},dictCode,startWith, flag = false) => {
console.log(1)
const dict=window.localStorage.getItem(dictCode);
if(dictCode='CLlQ'){
console.log(dict)
}
if (!dict){

@ -9,14 +9,48 @@
<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.cbbm"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm">
</el-option>
</el-select>
<!-- <el-select v-model="queryParam.dcch" filterable placeholder="工程编号" @change="czbhChange" clearable >-->
<!-- <el-option-->
<!-- v-for="item in dictData.cbbm"-->
<!-- :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>
@ -140,6 +174,16 @@ export default {
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn: [
{ type: 'seq', width: 60, title: '序号' },
@ -148,10 +192,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xh', title: '序号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcChZ', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -180,7 +221,10 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'xh', 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', },
@ -294,7 +338,23 @@ export default {
},
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() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号!')
@ -307,13 +367,7 @@ export default {
this.uploadData.isupload = this.isupload
},
czbhChange(){
if (this.queryParam.cbbm === '') {
this.filedis=true
}else{
this.filedis=false
}
},
beforeAvatarUpload(file) {
//
@ -362,6 +416,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')

@ -0,0 +1,856 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<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="工程编号" @change="czbhChange" clearable >-->
<!-- <el-option-->
<!-- v-for="item in dictData.cbbm"-->
<!-- :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>
</el-form-item>
<el-form-item label="分段:">
<el-input v-model="queryParam.dcfd" 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="toolbarButtonClickEvent('save')"-->
<!-- >保存</el-button>-->
<!-- <div style="float: right;margin-left: 5px" >-->
<!-- <el-upload-->
<!-- :action="uploadAction"-->
<!-- :show-file-list="false"-->
<!-- :before-upload="beforeAvatarUpload"-->
<!-- :data="uploadData"-->
<!-- :on-success="handleAvatarSuccess"-->
<!-- :disabled="filedis"-->
<!-- :headers="heads"-->
<!-- >-->
<!-- <el-button type="success" @click="uploadExcel" > 批量表导入 </el-button>-->
<!-- </el-upload>-->
<!-- </div>-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="danger"&ndash;&gt;-->
<!--&lt;!&ndash; @click="toolbarButtonClickEvent('delete')"&ndash;&gt;-->
<!--&lt;!&ndash; >删除&ndash;&gt;-->
<!--&lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- </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
:expand-config="{accordion: true, lazy: true, loadMethod: loadContentMethod}"
:align="'center'"
:height="height"
:columns="tableColumn"
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
highlight-hover-row
show-overflow
show-header-overflow
>
<template #expand="{ row }">
<div class="expand-wrapper">
<vxe-grid
id="id1"
ref="xGrid1"
border
resizable
:expand-config="{accordion: true, lazy: true, loadMethod: loadContentMethod1}"
:align="'center'"
:height="500"
:columns="tableColumn1"
highlight-current-row
:data="list1"
highlight-hover-row
show-overflow
show-header-overflow
>
<template #expand1="{ row }">
<div class="expand-wrapper">
<vxe-grid
id="id1"
ref="xGrid2"
border
resizable
:align="'center'"
:height="600"
:columns="tableColumn2"
highlight-current-row
:data="list2"
highlight-hover-row
show-overflow
show-header-overflow
></vxe-grid>
</div>
</template>
</vxe-grid>
</div>
</template>
</vxe-grid>
</div>
</el-main>
</el-container>
</el-container>
</el-container>
</template>
<script>
import {
getCzplBase,
wgetCzplBase,
czPlupdate,
getBcLQlList, getBcTJlList, getTLTList,
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
name:'BclqCX',
data() {
return {
queryParam: {
dcch:'',
dcpl:'',
delx:'B',
dcfd:''
},
list: [],
list1: [],
list2: [],
isupload:'02',
filedis:true,
uploadData:{
},
heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn2: [
{ type: 'seq', width: 60, title: '序号' },
// { field: 'dcChZ', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'dcPlZ', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylZD1z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpggZ', title: '规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpxhZ', title: '材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxcdZ', title: '划线长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylzd4Z', title: '切割长度', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tzbhZ', title: '图纸编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wph', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljslZ', title: '零件数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xgr', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xgrq', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
tableColumn1: [
{ type: 'seq', width: 60, title: '序号' },
{ type: 'expand', width: 60, slots: {
content: 'expand1',
}},
// { field: 'lqbh', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'xh', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'dcCh', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
// { field: 'dcPl', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcZl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zzcj', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sfyl', title: '余料', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tzbh', 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: 'sl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpxh', title: '材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylbh', title: '余料编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylgg', title: '余料规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
tableColumn: [
{ type: 'seq', width: 60, title: '序号' },
{ type: 'expand', width: 60, slots: {
content: 'expand',
} ,fixed: 'left'},
{ field: 'dcChZ', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcPlZ', title: '批量', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcFdZ', title: '分段', width: 100, editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zzcjZ', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'],
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: 'wpxh', title: '材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'sl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqzl', title: '领取重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'shzl', title: '实耗重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylzl', title: '余料重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qpyld', title: '前批余料代', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljzl', title: '零件重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dztlzl', title: '单张套料重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tlshbl', title: '套料实耗比例', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qpyldZ', title: '前批余料代总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'ljzlZ', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'ybzsZ', title: '用板总数', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqzlZ', title: '领取重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'shzlZ', title: '实耗重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylzlZ', title: '余料重量总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'bz', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'derqZ', title: '导入日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zdrZ', title: '修改人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zdrqZ', 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()
},
methods: {
loadContentMethod1({ row }){
return new Promise(resolve => {
this.list2=[];
getTLTList({
'dcpl':row.dcPl,
'dcch':row.dcCh,
'wpgg':row.wpgg,
'wpxh':row.wpxx,
'HXFL':'B',
'tzbh':row.tzbh,
}).then((res) => {
this.list2 = res.data
console.log(this.list2)
// if (this.$refs.xGrid1) {
// this.$refs.xGrid1.loadData(this.list1)
// console.log(this.list1)
// }
resolve()
})
})
},
loadContentMethod ({ row }) {
return new Promise(resolve => {
this.list1=[];
getBcTJlList({
'dcpl':row.dcPlZ,
'dcch':row.dcChZ,
'wpgg':row.wpgg,
'wpxh':row.wpxx,
}).then((res) => {
this.list1 = res.data
console.log(this.list1)
// if (this.$refs.xGrid1) {
// this.$refs.xGrid1.loadData(this.list1)
// console.log(this.list1)
// }
resolve()
})
})
},
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() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号!')
return false;
} else {
}
// this.uploadData.czbh = this.queryParam.czbh
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) {
// if(res.data.zt==='01'){
// this.$confirm(',?', '', {
// confirmButtonText: '',
// cancelButtonText: '',
// distinguishCancelAndClose: true,
// type: 'warning'
// }).then(type => {
// upload({ file: file.raw, czbh: this.queryParam.czbh, isupload: '02' }).then(res => {
// if (res.success) {
// this.$message({ message: '', type: 'success' })
// this.loadData()
// }
// })
// })
// }else{
// this.$message({ message: '', type: 'success' })
// this.loadData()
// }
this.$message({ message: '导入成功', type: 'success' })
this.initList();
} else {
Message({
message: res.message || 'Error',
type: 'error',
duration: 5 * 1000
})
}
},
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')
// dwbm.editRender.options = res.data.xqdws
})
},
initList() {
if (this.queryParam.dcch === '') {
this.$message.warning('选择船只编号')
return
}
getBcLQlList(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
console.log(this.list)
}
})
},
formatDate ({ cellValue }) {
return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
},
checkBoxClick(row,column){
// console.log(row)
this.$refs.xGrid.setActiveCell(row,column)
},
mergeRowMethod ({ row, $rowIndex, column, data }) {
const fields = [ 'dcChZ',
'dcPlZ',
'dcFdZ',
'lqzlZ',
'dcZlZ',
'lqlbZ',
'zzcjZ',
'ybzsZ',
'shzlZ',
'ylzlZ'
]
console.log("111");
let tempcol=column.property
let cellValue = row[tempcol]
if (cellValue && fields.includes(column.property)) {
let prevRow = data[$rowIndex - 1]
let nextRow = data[$rowIndex + 1]
if (prevRow && prevRow[tempcol] === cellValue) {
return {rowspan: 0, colspan: 0}
} else {
let countRowspan = 1
while (nextRow && nextRow[tempcol] === cellValue) {
nextRow = data[++countRowspan + $rowIndex]
}
if (countRowspan > 1) {
return {rowspan: countRowspan, colspan: 1}
}
}
}
},
selectChange(row) {
// this.$refs.xGrid.clearActived() //
this.$refs.xGrid.clearEdit() //
// this.$refs.xGrid.setEditCell(row.row, row.column.property) //
null2str(row.row)
},
getHeight() {
this.height = window.innerHeight - 190
},
toolbarButtonClickEvent(code) {
const {
insertRecords,
removeRecords,
updateRecords
} = this.$refs.xGrid.getRecordset()
switch (code) {
case 'insert':
this.$refs.xGrid.insertAt({
}, -1).then(({ row }) => {
this.$refs.xGrid.setActiveRow(row)
})
break
case 'delete':
this.$confirm('删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then((type) => {
this.$refs.xGrid.removeCheckboxRow()
})
break
case 'save':
if (removeRecords.length !== 0) {
del(removeRecords).then((response) => {
if (response.success) {
for (let i = 0; i < this.list.length; i++) {
if (removeRecords.indexOf(this.list[i]) !== -1) {
this.list.splice(i, 1)
i--
}
}
this.$message({ message: '保存成功!', type: 'success' })
const xTable = this.$refs.xGrid
xTable.loadData(this.initList())
}
})
}
if (updateRecords.length !== 0) {
czPlupdate(updateRecords).then((response) => {
if (response.success) {
const xTable = this.$refs.xGrid
xTable.loadData(this.initList())
this.$message({message: '保存成功!', type: 'success'})
}
})
}
if (insertRecords.length !== 0) {
add(insertRecords).then((response) => {
if (response.success) {
this.list = this.list.concat(insertRecords)
const xTable = this.$refs.xGrid
xTable.loadData(this.initList())
this.$message({ message: '保存成功!', type: 'success' })
}
})
}
this.$message(
`新增 ${insertRecords.length} 条,删除 ${removeRecords.length} 条,更新 ${updateRecords.length}`
)
break
}
}
}
}
</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;
}
.expand-wrapper{
padding: 20px;
}
</style>

@ -9,14 +9,38 @@
<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.cbbm"
: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>
@ -135,7 +159,16 @@ export default {
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn: [
{ type: 'seq', width: 60, title: '序号' },
@ -153,7 +186,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
{ field: 'ylZD1z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -181,7 +214,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wph', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljslZ', title: '零件数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -209,8 +245,24 @@ export default {
},
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() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号!')
@ -278,6 +330,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')

@ -9,14 +9,48 @@
<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.cbbm"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm">
</el-option>
</el-select>
<!-- <el-select v-model="queryParam.dcch" filterable placeholder="工程编号" @change="czbhChange" clearable >-->
<!-- <el-option-->
<!-- v-for="item in dictData.cbbm"-->
<!-- :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>
@ -125,7 +159,7 @@ export default {
queryParam: {
dcch:'',
dcpl:'',
delx:'B',
hxfl:'B',
tzbh:''
},
@ -139,7 +173,16 @@ export default {
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn: [
{ type: 'seq', width: 60, title: '序号' },
@ -156,7 +199,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcPl', title: '批量', width: 100,editRender: { name: 'input' },
{ field: 'dcPl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -225,8 +268,24 @@ export default {
},
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() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号!')
@ -294,6 +353,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')

@ -311,24 +311,13 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fds', title: '分段和', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 120,
{ field: 'fds', title: '分段', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xqdd', title: '需求地点', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pw', title: '抛丸', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 120,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -340,6 +329,10 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'sbbh', title: '设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -370,7 +363,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'bc', title: '长', width: 120,
{ field: 'bc', title: '长', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -397,22 +390,55 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bclqzl', title: '板材领取重量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pklx', title: '坡口类型', width: 120,
{ field: 'bcshzl', title: '板材实耗重量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bcylzl', title: '板材余料重量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bcljtlzl', title: '板材零件套料重量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bcqpyld', title: '前批余料代', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ylbhgg', title: '余料信息', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xqdd', title: '需求地点', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pw', title: '抛丸', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qbs', title: '曲标识', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pklx', title: '坡口类型', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkbs', title: '坡口标识', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkcd', title: '坡口长度', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -432,7 +458,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljbh', title: '零件编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -458,92 +487,92 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'blgs', title: '备料', width: 120,
{ field: 'blgs', title: '备料定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwgs', title: '抛丸', width: 120,
{ field: 'pwgs', title: '抛丸定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'llgs', title: '理料', width: 120,
{ field: 'llgs', title: '理料定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxgs', title: '划线', width: 120,
{ field: 'hxgs', title: '划线定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qggs', title: '切割', width: 120,
{ field: 'qggs', title: '切割定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkgs', title: '坡口', width: 120,
{ field: 'pkgs', title: '坡口定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgs', title: '曲', width: 120,
{ field: 'qgs', title: '曲定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dmgs', title: '打磨', width: 120,
{ field: 'dmgs', title: '打磨定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zpgs', title: '装配', width: 120,
{ field: 'zpgs', title: '装配定额工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkblgs', title: '反馈备料', width: 120,
{ field: 'fkblgs', title: '备料实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkpwgs', title: '抛丸', width: 120,
{ field: 'fkpwgs', title: '抛丸实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkllgs', title: '理料', width: 120,
{ field: 'fkllgs', title: '理料实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkhxgs', title: '划线', width: 120,
{ field: 'fkhxgs', title: '划线实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkqggs', title: '切割', width: 120,
{ field: 'fkqggs', title: '切割实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkpkgs', title: '坡口', width: 120,
{ field: 'fkpkgs', title: '坡口实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkqgs', title: '曲', width: 120,
{ field: 'fkqgs', title: '曲实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkdmgs', title: '打磨', width: 120,
{ field: 'fkdmgs', title: '打磨实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkzpgs', title: '装配', width: 120,
{ field: 'fkzpgs', title: '装配实动工时', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},

@ -1077,7 +1077,7 @@ export default {
if(this.xctjList.length==0){
return this.$message.warning('缺少型材统计数据')
}
return;
// FormData:
const formData = new FormData()
// 使FormData.append/

@ -9,14 +9,48 @@
<el-col :span="22">
<el-form-item label="船号:">
<el-select v-model="queryParam.cbbm" filterable placeholder="工程编号" @change="czbhChange" >
<el-option
v-for="item in dictData.cbbm"
:key="item.cbbm"
:label="item.cbbm"
:value="item.cbbm">
</el-option>
</el-select>
<!-- <el-select v-model="queryParam.dcch" filterable placeholder="工程编号" @change="czbhChange" clearable >-->
<!-- <el-option-->
<!-- v-for="item in dictData.cbbm"-->
<!-- :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>
@ -47,7 +81,6 @@
:before-upload="beforeAvatarUpload"
:data="uploadData"
:on-success="handleAvatarSuccess"
:disabled="filedis"
:headers="heads"
>
<el-button type="success" @click="uploadExcel" > 批量表导入 </el-button>
@ -57,11 +90,11 @@
<!-- <el-button-->
<!-- type="danger"-->
<!-- @click="toolbarButtonClickEvent('delete')"-->
<!-- >删除-->
<!-- </el-button>-->
<el-button
type="danger"
@click="toolbarButtonClickEvent('delete')"
>删除
</el-button>
</el-form-item>
</el-col>
</el-row>
@ -104,10 +137,10 @@
<script>
import {
getCzplBase ,
getCzplBase,
wgetCzplBase,
czPlupdate,
getCzplList,
getCzplList, czPlDel,
} from '@/api/sjzx/jcsj'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
@ -120,7 +153,7 @@ export default {
data() {
return {
queryParam: {
cbbm:'',
dcch:'',
dcpl:'',
},
@ -134,9 +167,19 @@ export default {
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn: [
{ type: 'checkbox', width: 50 ,
},
{ type: 'seq', width: 60, title: '序号' },
{ field: 'dcCh', title: '船号', width: 100,
@ -399,26 +442,41 @@ export default {
},
methods: {
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
this.$refs.xDown4.showPanel()
},
keyupEvent4() {
uploadExcel() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号!')
return false;
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() {
// if (this.queryParam.cbbm === '') {
// this.$message.error('')
// return false;
// } else {
//
// }
// this.uploadData.czbh = this.queryParam.czbh
this.uploadData.isupload = this.isupload
},
czbhChange(){
if (this.queryParam.cbbm === '') {
this.filedis=true
}else{
this.filedis=false
}
// if (this.queryParam.cbbm === '') {
// this.filedis=true
// }else{
// this.filedis=false
// }
},
beforeAvatarUpload(file) {
@ -465,9 +523,13 @@ export default {
})
}
},
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')
@ -476,10 +538,10 @@ export default {
})
},
initList() {
if (this.queryParam.cbbm === '') {
this.$message.warning('选择船只编号')
return
}
// if (this.queryParam.cbbm === '') {
// this.$message.warning('')
// return
// }
getCzplList(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
@ -535,7 +597,7 @@ export default {
if (removeRecords.length !== 0) {
del(removeRecords).then((response) => {
czPlDel(removeRecords).then((response) => {
if (response.success) {
for (let i = 0; i < this.list.length; i++) {
if (removeRecords.indexOf(this.list[i]) !== -1) {
@ -572,6 +634,7 @@ export default {
}
})
}
this.$message(
`新增 ${insertRecords.length} 条,删除 ${removeRecords.length} 条,更新 ${updateRecords.length}`
)

@ -76,15 +76,14 @@
ref="xGrid"
border
resizable
keep-source
:align="'center'"
:height="height"
:auto-resize="true"
:columns="tableColumn"
highlight-current-row
:data="list"
:custom-config="{ storage: true }"
:span-method="mergeRowMethod"
highlight-hover-row
show-overflow
show-header-overflow
@ -144,10 +143,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xh', title: '序号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcChZ', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -156,14 +152,17 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
{ field: 'dcFdZ', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'dcFdZ', title: '分段', width: 100,
{ field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qpyldZ', title: '前批余料代总', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -192,6 +191,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xh', title: '序号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpmc', title: '物品名称', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -213,6 +216,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
// { field: 'sysl', title: '', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', },
// },
{ field: 'lqzl', title: '领取重量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@ -271,7 +278,40 @@ export default {
},
methods: {
mergeRowMethod ({ row, $rowIndex, column, data }) {
const fields = [ 'dcChZ',
'dcPlZ',
'dcFdZ',
'lqzlZ',
'dcZlZ',
'lqlbZ',
'zzcjZ',
'qpyldZ',
'ybzsZ',
'shzlZ',
'ylzlZ'
]
console.log("111");
let tempcol=column.property
let cellValue = row[tempcol]
if (cellValue && fields.includes(column.property)) {
let prevRow = data[$rowIndex - 1]
let nextRow = data[$rowIndex + 1]
if (prevRow && prevRow[tempcol] === cellValue) {
return {rowspan: 0, colspan: 0}
} else {
let countRowspan = 1
while (nextRow && nextRow[tempcol] === cellValue) {
nextRow = data[++countRowspan + $rowIndex]
}
if (countRowspan > 1) {
return {rowspan: countRowspan, colspan: 1}
}
}
}
},
uploadExcel() {
if (this.queryParam.cbbm === '') {

@ -9,14 +9,38 @@
<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.cbbm"
: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>
@ -135,7 +159,16 @@ export default {
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn: [
{ type: 'seq', width: 60, title: '序号' },
@ -209,8 +242,24 @@ export default {
},
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() {
if (this.queryParam.cbbm === '') {
this.$message.error('请选择船号!')
@ -278,6 +327,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')

@ -3,25 +3,51 @@
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-form :inline="true" label-width="65px" label-position="left">
<el-form :inline="true" label-width="75px" label-position="left">
<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.cbbm"
: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>
</el-form-item>
<el-form-item label="套料图号:">
<el-input v-model="queryParam.tzbh" type="search" placeholder="套料图号" ></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
@ -122,7 +148,8 @@ export default {
queryParam: {
dcch:'',
dcpl:'',
hxfl:'X'
hxfl:'X',
tzbh:''
},
list: [],
@ -135,7 +162,16 @@ export default {
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
dictData:{},
height: '500px',
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
tableColumn: [
{ type: 'seq', width: 60, title: '序号' },
@ -221,6 +257,23 @@ export default {
},
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() {
@ -290,6 +343,8 @@ export default {
initBase(){
getCzplBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
// const xGrid = this.$refs.xGrid
//
// const dwbm = xGrid.getColumnByField('dwbm')

Loading…
Cancel
Save