xhj 1 year ago
parent 36608310aa
commit 91184501d5

@ -20,6 +20,7 @@ export function getSljhPgd(data) {return request({url: '/pgdSljh/getSljhPgd', me
export function saveSljhPgdXd(data) {return request({url: '/pgdSljh/saveSljhPgdXd', method: 'post', data})}
export function saveSljhPgdXdBack(data) {return request({url: '/pgdSljh/saveSljhPgdXdBack', method: 'post', data})}
export function saveSljhPgdFk(data) {return request({url: '/pgdSljh/saveSljhPgdFk', method: 'post', data})}
export function saveSljhFk(data) {return request({url: '/pgdSljh/saveSljhFk', method: 'post', data})}
@ -27,12 +28,14 @@ export function getPwPgd(data) {return request({url: '/pgdPwjh/getPwPgd', method
export function savePwPgdXd(data) {return request({url: '/pgdPwjh/savePwPgdXd', method: 'post', data})}
export function savePwPgdXdBack(data) {return request({url: '/pgdPwjh/savePwPgdXdBack', method: 'post', data})}
export function savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})}
export function savePwFk(data) {return request({url: '/pgdPwjh/savePwFk', method: 'post', data})}
export function getQgPgd(data) {return request({url: '/pgdQgjh/getQgPgd', method: 'post', data})}
export function saveQgPgdXd(data) {return request({url: '/pgdQgjh/saveQgPgdXd', method: 'post', data})}
export function saveQgPgdXdBack(data) {return request({url: '/pgdQgjh/saveQgPgdXdBack', method: 'post', data})}
export function saveQgPgdFk(data) {return request({url: '/pgdQgjh/saveQgPgdFk', method: 'post', data})}
export function saveQgdFk(data) {return request({url: '/pgdQgjh/saveQgdFk', method: 'post', data})}
@ -41,6 +44,10 @@ export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method
export function saveQmPgdXd(data) {return request({url: '/pgdQmjh/saveQmPgdXd', method: 'post', data})}
export function saveQmPgdXdBack(data) {return request({url: '/pgdQmjh/saveQmPgdXdBack', method: 'post', data})}
export function saveQmPgdFk(data) {return request({url: '/pgdQmjh/saveQmPgdFk', method: 'post', data})}
export function saveQmFk(data) {return request({url: '/pgdQmjh/saveQmFk', method: 'post', data})}
export function selectQmByQgAndJh(data) {return request({url: '/pgdQmjh/selectQmByQgAndJh', method: 'post', data})}
export function insertQmList(data) {return request({url: '/pgdQmjh/insertQmList', method: 'post', data})}
export function removeQmList(data) {return request({url: '/pgdQmjh/removeQmList', method: 'post', data})}
@ -48,12 +55,14 @@ export function getPkPgd(data) {return request({url: '/pgdPkjh/getPkPgd', method
export function savePkPgdXd(data) {return request({url: '/pgdPkjh/savePkPgdXd', method: 'post', data})}
export function savePkPgdXdBack(data) {return request({url: '/pgdPkjh/savePkPgdXdBack', method: 'post', data})}
export function savePkPgdFk(data) {return request({url: '/pgdPkjh/savePkPgdFk', method: 'post', data})}
export function savePkFk(data) {return request({url: '/pgdPkjh/savePkFk', method: 'post', data})}
export function getDmPgd(data) {return request({url: '/pgdDmjh/getDmPgd', method: 'post', data})}
export function saveDmPgdXd(data) {return request({url: '/pgdDmjh/saveDmPgdXd', method: 'post', data})}
export function saveDmPgdXdBack(data) {return request({url: '/pgdDmjh/saveDmPgdXdBack', method: 'post', data})}
export function saveDmPgdFk(data) {return request({url: '/pgdDmjh/saveDmPgdFk', method: 'post', data})}
export function saveDmFk(data) {return request({url: '/pgdDmjh/saveDmFk', method: 'post', data})}

@ -52,6 +52,10 @@
<el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
</el-form-item>
<el-form-item label="">
<el-checkbox v-model="queryParam.qbs" >曲标识</el-checkbox>
</el-form-item>
@ -114,7 +118,7 @@
import {getZHBM, getBMBM} from "@/utils/rpkj";
import {mapGetters} from 'vuex'
import {getPgdBase, getQgPgd} from "@/api/jhzxgl/pgd";
import {getPgdBase, getQgPgd, insertQmList, selectQmByQgAndJh} from "@/api/jhzxgl/pgd";
export default {
name: 'GxsqAdd',
@ -129,27 +133,67 @@
{ type: 'seq', width: 40, title: '序号' },
{ field: 'czbh', title: '船号', width: 100,
{ field: 'lczbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 100,
{ field: 'lpl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 100,
{ field: 'lfd', 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'],
{ field: 'lzl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ltlth', title: '套料图号', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lptblx', title: '配套表类型', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljbh', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lljgg', title: '零件规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lljcz', title: '零件材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lwpfl', title: '物品分类', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljldw', title: '计量单位', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lsl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
{ field: 'lqfxqrqdz', title: '前方需求大组期', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gylx', title: '工艺类型', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -314,8 +358,10 @@
dcch:'',
pl:'',
fd:'',
fkyy:'',
zt:'01'
qbs:true,
pkbs:false,
dmbs:false,
lx:'q',
},
projectData:[],
projectData1:[],
@ -371,14 +417,16 @@
show() {
this.dialogVisible = true
this.baseSeacrh()
// this.baseSeacrh()
},
qdClick(){
let obj = this.$refs.xGrid.getCheckboxRecords()
if (obj.length === 0) {
return
}
insertQmList({'list':obj,'lx':'q'}).then(res=>{
this.initList()
})
},
plChange() {
@ -386,103 +434,6 @@
if (obj.length === 0) {
return
}
if (this.inputListAdd.bydd === '') {
this.$message({message: '报验地点不能为空', type: 'error'})
return
}
if(this.queryParamAdd.project.indexOf('MSD')!==-1){
}else{
if (this.inputListAdd.inspContent === '') {
this.$message({message: '检验内容不能为空', type: 'error'})
return
}
}
// if(this.inputListAdd.wpsCode===''){
// this.$message({ message: '', type: 'error' })
// return
// }
// if(this.inputListAdd.Sqrq===''){
// this.$message({ message: '', type: 'error' })
// return
// }
for (let i = 0; i < obj.length; i++) {
let rows = this.$refs.xGrid.getRowSeq(obj[i])
// if(obj[i].sc==null||obj[i].hdsl===''){
// this.$message({ message: ''+rows+'', type: 'error' })
// return
// }
// if(obj[i].hgbh==null||obj[i].hgbh===''){
// this.$message({ message: ''+rows+'', type: 'error' })
// return
// }
// if(obj[i].hgmc==null||obj[i].hgmc===''){
// this.$message({ message: ''+rows+'', type: 'error' })
// return
// }
}
let qcObjc = [];
for (let i = 0; i < obj.length; i++) {
console.log(obj[i])
//
let dept = '';
if(this.queryParamAdd.project.indexOf('MSD')!==-1){
if(obj[i].blockNo===''||obj[i].blockNo===undefined || obj[i].blockNo===null){
this.inputListAdd.inspContent=obj[i].stName
}else{
this.inputListAdd.inspContent=obj[i].blockNo+'段'+obj[i].stName
}
}
let a =
{
'sqrq': this.inputListAdd.Sqrq,
'grdType':obj[i].grdType,
'grdLevel':obj[i].grdLevel,
'inspContent': this.inputListAdd.inspContent,
'inspCode': this.queryParamAdd.byxm,
'bydd': this.inputListAdd.bydd,
'status': '01',
'qtyUnit': "根",
'departCode': "02",
'bzry': this.name,
'bzrq': XEUtils.toDateString(new Date(), 'yyyy/MM/dd'),
'project': obj[i].project,
'ph': obj[i].ph,
'kh': obj[i].kh,
'dwgNo': obj[i].dwgNo,
'itemNo': obj[i].itemNo,
'itemName': '管子',
'itemSpec': obj[i].itemSpec,
'itemGrd': obj[i].itemGrd,
'itemXh': obj[i].itemXh,
'zzcd': obj[i].itemZzcd,
'itemQty': obj[i].itemQty,
'bympa': obj[i].bympa,
'stCode': obj[i].stCode,
'stName': obj[i].stName,
'treatment': obj[i].treatment,
'paintCode': obj[i].paintCode,
'gczjh': obj[i].gczsh,
'mpid': obj[i].id,
'sxbh': obj[i].sxbh,
'stbh': obj[i].stbh,
// 'scDept':this.queryParamAdd.byxm=="0202"?this.inputListAdd.scDept:obj[i].scDept,
'scDept': this.queryParamAdd.byxm == "0202"?(obj[i].byDept===undefined||obj[i].byDept===''||obj[i].byDept===null?obj[i].scDept:obj[i].byDept):obj[i].scDept,
'cjbs': this.queryParamAdd.byxm == "0202" ? obj[i].bybsCode : obj[i].jybsCode,
'ipspSpec': 'P',
}
qcObjc.push(a);
}
console.log(qcObjc)
if (qcObjc.length != 0) {
insertqcInspection(qcObjc).then(res => {
@ -517,7 +468,7 @@
this.$message.warning('选择船只编号')
return
}
getQgPgd(this.queryParam).then((res) => {
selectQmByQgAndJh(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)

@ -0,0 +1,552 @@
<template>
<el-container>
<vxe-modal v-model="dialogVisible" width="1200" title="增加">
<template #default>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-form :inline="true" label-width="60px" 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: 140px;"
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.pl" type="search" placeholder="批量" ></el-input>
</el-form-item>
<el-form-item label="分段:">
<el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
</el-form-item>
<el-form-item label="">
<el-checkbox v-model="queryParam.dmbs" >打磨标识</el-checkbox>
</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="22">
</el-col>
<el-col :span="2">
<el-form-item style="float: right" >
<el-button type="success" @click="qdClick"></el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-header>
<div class="mytable">
<vxe-grid
id="id"
ref="xGrid"
border
resizable
height="500px"
keep-source
:auto-resize="true"
:columns="tableColumn"
:data="tableData"
highlight-hover-row
highlight-current-row
show-overflow
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}"
>
</vxe-grid>
</div>
</template>
</vxe-modal>
</el-container>
</template>
<script>
import XEUtils from 'xe-utils'
import {getZHBM, getBMBM} from "@/utils/rpkj";
import {mapGetters} from 'vuex'
import {getPgdBase, getQgPgd, insertQmList, selectQmByQgAndJh} from "@/api/jhzxgl/pgd";
export default {
name: 'GxsqAdddm',
//props: ['flag'],
data() {
return {
dialogVisible: false,
tableData: [],
tableColumn: [
{ type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' },
{ field: 'lczbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lpl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lfd', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lzl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ltlth', title: '套料图号', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lptblx', title: '配套表类型', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljbh', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lljgg', title: '零件规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lljcz', title: '零件材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lwpfl', title: '物品分类', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljldw', title: '计量单位', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lsl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqfxqrqdz', title: '前方需求大组期', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gylx', 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', },
},
{ field: 'hxry', title: '划线人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxksrq', title: '划线开始时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxjsrq', title: '划线结束时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgry', title: '切割人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgksrq', title: '切割开始时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjsrq', title: '切割结束时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
queryParam: {
dcch:'',
pl:'',
fd:'',
qbs:false,
pkbs:false,
dmbs:true,
lx:'d',
},
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
dictData: [],
}
},
computed: {
...mapGetters([
'name',
'bmbm'
])
},
created() {
console.log(111)
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.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
selectChange(row) {
this.$refs.xGrid.clearActived()//
this.$refs.xGrid.setActiveCell(row.row, row.column.property)//
},
show() {
this.dialogVisible = true
// this.baseSeacrh()
},
qdClick(){
let obj = this.$refs.xGrid.getCheckboxRecords()
if (obj.length === 0) {
return
}
insertQmList({'list':obj,'lx':'d'}).then(res=>{
this.initList()
})
},
plChange() {
let obj = this.$refs.xGrid.getCheckboxRecords()
if (obj.length === 0) {
return
}
console.log(qcObjc)
if (qcObjc.length != 0) {
insertqcInspection(qcObjc).then(res => {
if (res.success) {
for (let i = 0; i < this.tableData.length; i++) {
if (obj.indexOf(this.tableData[i]) !== -1) {
this.tableData.splice(i, 1)
i--
}
}
// this.tableData= this.tableData.filter((x) => !removeRecords.some((item) => x.id === item.id));
const xTable = this.$refs.xGrid
console.log(this.tableData)
xTable.loadData(this.tableData)
this.$emit('callback', obj, this.inputListAdd)
}
})
}
},
initBase(){
getPgdBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
initList() {
if (this.queryParam.dcch === '') {
this.$message.warning('选择船只编号')
return
}
selectQmByQgAndJh(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
console.log(this.list)
}
})
},
}
}
</script>
<style lang="scss" scoped >
.el-header{margin:0;padding: 5px;height:auto;
.el-input{
width: 140px;
}
.el-select{
width: 140px;
}
}
.el-container{padding: 0;margin:0;}
.el-main{padding: 0;}
.el-col{padding: 0;height: 32px;}
.el-aside{background: #fff;padding: 0}
.el-container{padding: 0}
.el-row {}
.el-row:last-child {margin-bottom: 0; }
.tableStyles{
background: #0a76a4;
}
.my-dropdown {
width: 400px;
height: 400px;
background-color: #fff;
border: 1px solid #dcdfe6;
box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
font-size: 12px;
}
.mytable1{
}
.borderClass{
}
.vxe-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
.el-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
.keyword-lighten {
color: #000;
background-color: #FFFF00;
}
.vxe-textarea--inner {
line-height: inherit;
}
.el-form-item__label-wrap {
margin-left: 0px !important;
float: left;
}
.fontClass{
font-size: 12px;
font-weight: bold;
}
</style>

@ -0,0 +1,552 @@
<template>
<el-container>
<vxe-modal v-model="dialogVisible" width="1200" title="增加">
<template #default>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-form :inline="true" label-width="60px" 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: 140px;"
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.pl" type="search" placeholder="批量" ></el-input>
</el-form-item>
<el-form-item label="分段:">
<el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
</el-form-item>
<el-form-item label="">
<el-checkbox v-model="queryParam.pkbs" >坡口标识</el-checkbox>
</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="22">
</el-col>
<el-col :span="2">
<el-form-item style="float: right" >
<el-button type="success" @click="qdClick"></el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-header>
<div class="mytable">
<vxe-grid
id="id"
ref="xGrid"
border
resizable
height="500px"
keep-source
:auto-resize="true"
:columns="tableColumn"
:data="tableData"
highlight-hover-row
highlight-current-row
show-overflow
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}"
>
</vxe-grid>
</div>
</template>
</vxe-modal>
</el-container>
</template>
<script>
import XEUtils from 'xe-utils'
import {getZHBM, getBMBM} from "@/utils/rpkj";
import {mapGetters} from 'vuex'
import {getPgdBase, getQgPgd, insertQmList, selectQmByQgAndJh} from "@/api/jhzxgl/pgd";
export default {
name: 'GxsqAdd',
//props: ['flag'],
data() {
return {
dialogVisible: false,
tableData: [],
tableColumn: [
{ type: 'checkbox', width: 40 },
{ type: 'seq', width: 40, title: '序号' },
{ field: 'lczbh', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lpl', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lfd', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lzl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ltlth', title: '套料图号', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lptblx', title: '配套表类型', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljbh', title: '零件编号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lljgg', title: '零件规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lljcz', title: '零件材质', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lwpfl', title: '物品分类', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'ljldw', title: '计量单位', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lsl', title: '数量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqfxqrqxz', title: '前方需求小组期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqfxqrqdz', title: '前方需求大组期', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'gylx', 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', },
},
{ field: 'hxry', title: '划线人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxksrq', title: '划线开始时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxjsrq', title: '划线结束时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgry', title: '切割人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgksrq', title: '切割开始时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjsrq', title: '切割结束时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
],
queryParam: {
dcch:'',
pl:'',
fd:'',
qbs:false,
pkbs:true,
dmbs:false,
lx:'p',
},
projectData:[],
projectData1:[],
projectColumns: [
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
dictData: [],
}
},
computed: {
...mapGetters([
'name',
'bmbm'
])
},
created() {
console.log(111)
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.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
selectChange(row) {
this.$refs.xGrid.clearActived()//
this.$refs.xGrid.setActiveCell(row.row, row.column.property)//
},
show() {
this.dialogVisible = true
// this.baseSeacrh()
},
qdClick(){
let obj = this.$refs.xGrid.getCheckboxRecords()
if (obj.length === 0) {
return
}
insertQmList({'list':obj,'lx':'p'}).then(res=>{
this.initList()
})
},
plChange() {
let obj = this.$refs.xGrid.getCheckboxRecords()
if (obj.length === 0) {
return
}
console.log(qcObjc)
if (qcObjc.length != 0) {
insertqcInspection(qcObjc).then(res => {
if (res.success) {
for (let i = 0; i < this.tableData.length; i++) {
if (obj.indexOf(this.tableData[i]) !== -1) {
this.tableData.splice(i, 1)
i--
}
}
// this.tableData= this.tableData.filter((x) => !removeRecords.some((item) => x.id === item.id));
const xTable = this.$refs.xGrid
console.log(this.tableData)
xTable.loadData(this.tableData)
this.$emit('callback', obj, this.inputListAdd)
}
})
}
},
initBase(){
getPgdBase({}).then(res=>{
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
initList() {
if (this.queryParam.dcch === '') {
this.$message.warning('选择船只编号')
return
}
selectQmByQgAndJh(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
console.log(this.list)
}
})
},
}
}
</script>
<style lang="scss" scoped >
.el-header{margin:0;padding: 5px;height:auto;
.el-input{
width: 140px;
}
.el-select{
width: 140px;
}
}
.el-container{padding: 0;margin:0;}
.el-main{padding: 0;}
.el-col{padding: 0;height: 32px;}
.el-aside{background: #fff;padding: 0}
.el-container{padding: 0}
.el-row {}
.el-row:last-child {margin-bottom: 0; }
.tableStyles{
background: #0a76a4;
}
.my-dropdown {
width: 400px;
height: 400px;
background-color: #fff;
border: 1px solid #dcdfe6;
box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
font-size: 12px;
}
.mytable1{
}
.borderClass{
}
.vxe-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
.el-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
.keyword-lighten {
color: #000;
background-color: #FFFF00;
}
.vxe-textarea--inner {
line-height: inherit;
}
.el-form-item__label-wrap {
margin-left: 0px !important;
float: left;
}
.fontClass{
font-size: 12px;
font-weight: bold;
}
</style>

@ -73,18 +73,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
</el-form-item>
</el-col>
<!-- <el-col :span="6" style="text-align: right;">-->
<!-- <el-form-item >-->
<!-- <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />-->
<!-- <el-button type="info" @click="plClick"></el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4" >-->
<!-- <el-form-item style="float: right" >-->
<!-- <el-button type="success" @click="saveclick"></el-button>-->
<!-- <el-button type="success" @click="xdClick"></el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
</el-header>

@ -127,10 +127,10 @@
<script>
import {
getQgPgd,
saveQgPgdFk,
saveQgPgdXd,
saveQgPgdXdBack,
getDmPgd,
saveDmPgdFk,
saveDmPgdXd,
saveDmPgdXdBack,
getPgdBase
} from '@/api/jhzxgl/pgd'
@ -308,46 +308,45 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 120,
{ field: 'dmZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 120,
{ field: 'dmBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 120,
{ field: 'dmBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 120,
{ field: 'dmXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 120,
{ field: 'dmXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 120,
{ field: 'dmFkry', title: '反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 120,
{ field: 'dmFkrq', title: '反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 120,
{ field: 'dmFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
}
@ -427,7 +426,7 @@ export default {
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveQgPgdFk(obj).then(res=>{
saveDmPgdFk(obj).then(res=>{
if(res.success){
this.initList()
}
@ -444,7 +443,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXdBack(obj).then(res=>{
saveDmPgdXdBack(obj).then(res=>{
if(res.success){
this.$message({ message: '取消下达成功', type: 'success' })
this.initList()
@ -458,7 +457,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXd(obj).then(res=>{
saveDmPgdXd(obj).then(res=>{
if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList()
@ -475,7 +474,7 @@ export default {
this.$message.warning('选择船只编号')
return
}
getQgPgd(this.queryParam).then((res) => {
getDmPgd(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)

@ -1,7 +1,7 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-header style="width: 100%; height: 100px;font-size: 12px">
<el-form :inline="true" label-width="60px" label-position="left">
<el-row>
@ -60,7 +60,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14" >
<el-col :span="20" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
@ -73,18 +73,27 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
<el-button type="success" @click="Choice"></el-button>
<el-button type="success" @click="saveclick"></el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<span style="width:6%" >打磨人员:</span>
<el-input v-model="inParam.dmry" placeholder="打磨人" clearable style="width:10%" />
<span style="width:6%" >打磨开始:</span>
<el-date-picker v-model="inParam.dmks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨开始"/>
<el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>
<span style="width:6%" >打磨结束:</span>
<el-date-picker v-model="inParam.dmjs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨结束"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col>
</el-row>
</el-form>
@ -127,12 +136,12 @@
<script>
import {
getQgPgd,
saveQgPgdFk,
saveQgPgdXd,
saveQgPgdXdBack,
getDmPgd,
saveDmPgdFk,
saveDmPgdXd,
saveDmPgdXdBack,
getPgdBase
getPgdBase, saveDmFk
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
@ -167,6 +176,11 @@ export default {
label: "反馈",
},
],
inParam:{
dmry:'',
dmks:'',
dmjs:''
},
list: [],
flag:false,
heads: { token: getToken() },
@ -308,45 +322,45 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 120,
{ field: 'dmZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 120,
{ field: 'dmBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 120,
{ field: 'dmBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 120,
{ field: 'dmXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 120,
{ field: 'dmXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 120,
{ field: 'dmFkry', title: '反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 120,
{ field: 'dmFkrq', title: '反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 120,
{ field: 'dmFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
}
@ -411,11 +425,18 @@ export default {
this.projectData1=res.data.cbbm
})
},
plClick(){
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
if(type==='1'){
selectRecords[i].dmry = this.inParam.dmry
selectRecords[i].dmksrq = this.inParam.dmks
}else if (type==='2'){
selectRecords[i].dmjsrq = this.inParam.dmjs
}
}
this.$refs.xGrid.updateData(this.list)
}
@ -423,59 +444,19 @@ export default {
},
saveclick(){
let obj=this.$refs.xGrid.getUpdateRecords()
if(obj.length===0){
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveQgPgdFk(obj).then(res=>{
saveDmFk(obj).then(res=>{
if(res.success){
this.initList()
}
})
},
xdClick(){
let obj=this.$refs.xGrid.getCheckboxRecords()
if(obj.length===0){
return
}
if(this.queryParam.zt==='02'){
this.$confirm('取消下达?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXdBack(obj).then(res=>{
if(res.success){
this.$message({ message: '取消下达成功', type: 'success' })
this.initList()
}
})
})
}else {
this.$confirm('下达?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXd(obj).then(res=>{
if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList()
}
})
})
}
},
initList() {
if (this.queryParam.dcch === '') {
this.$message.warning('选择船只编号')
return
}
getQgPgd(this.queryParam).then((res) => {
getDmPgd(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)

@ -121,29 +121,29 @@
</el-main>
</el-container>
</el-container>
<GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
<GxsqAddpk ref="gxsqAdd" @callback="callback" :flag="flag"/>
</el-container>
</template>
<script>
import {
getQgPgd,
saveQgPgdFk,
saveQgPgdXd,
saveQgPgdXdBack,
getPkPgd,
savePkPgdXd,
savePkPgdFk,
savePkPgdXdBack,
getPgdBase
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
import GxsqAddpk from '@/views/jhzxgl/components/GxsqAddpk'
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:'QmjhD',
components: {GxsqAdd},
name:'PkjhD',
components: {GxsqAddpk},
data() {
return {
queryParam: {
@ -258,7 +258,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkjhrq', title: '坡口计划日期', width: 120,
{ field: 'dmjhrq', title: '打磨计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -277,6 +277,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkjhrq', title: '坡口计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkfzry', title: '坡口负责人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -313,42 +317,42 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 120,
{ field: 'pkZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 120,
{ field: 'pkBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 120,
{ field: 'pkBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 120,
{ field: 'pkXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 120,
{ field: 'pkXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 120,
{ field: 'pkFkry', title: '反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 120,
{ field: 'pkFkrq', title: '反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 120,
{ field: 'pkFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -358,6 +362,12 @@ export default {
]
}
},
@ -420,7 +430,7 @@ export default {
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
selectRecords[i].pkFkyy = this.queryParam.fkyy
}
this.$refs.xGrid.updateData(this.list)
}
@ -432,7 +442,7 @@ export default {
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveQgPgdFk(obj).then(res=>{
savePkPgdFk(obj).then(res=>{
if(res.success){
this.initList()
}
@ -449,7 +459,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXdBack(obj).then(res=>{
savePkPgdXdBack(obj).then(res=>{
if(res.success){
this.$message({ message: '取消下达成功', type: 'success' })
this.initList()
@ -463,7 +473,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXd(obj).then(res=>{
savePkPgdXd(obj).then(res=>{
if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList()
@ -480,7 +490,7 @@ export default {
this.$message.warning('选择船只编号')
return
}
getQgPgd(this.queryParam).then((res) => {
getPkPgd(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)

@ -1,7 +1,7 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-header style="width: 100%; height: 100px;font-size: 12px">
<el-form :inline="true" label-width="60px" label-position="left">
<el-row>
@ -60,7 +60,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14" >
<el-col :span="20" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
@ -73,18 +73,34 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<!-- <el-col :span="6" style="text-align: right;">-->
<!-- <el-form-item >-->
<!-- <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />-->
<!-- <el-button type="info" @click="plClick"></el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
<el-button type="success" @click="Choice"></el-button>
<el-button type="success" @click="saveclick"></el-button>
<!-- <el-button type="success" @click="xdClick"></el-button>-->
<!-- <el-button type="success" @click="Choice"></el-button>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<span style="width:6%" >坡口人员:</span>
<el-input v-model="inParam.pkry" placeholder="坡口人" clearable style="width:10%" />
<span style="width:6%" >坡口开始:</span>
<el-date-picker v-model="inParam.pkks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="坡口开始"/>
<el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>
<span style="width:6%" >坡口结束:</span>
<el-date-picker v-model="inParam.pkjs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="坡口结束"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col>
</el-row>
</el-form>
@ -127,11 +143,11 @@
<script>
import {
getQgPgd,
saveQgPgdFk,
saveQgPgdXd,
saveQgPgdXdBack,
getPkPgd,
savePkPgdFk,
savePkPgdXd,
savePkPgdXdBack,
savePkFk,
getPgdBase
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
@ -142,7 +158,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
name:'QmjhD',
name:'PkjhFk',
components: {GxsqAdd},
data() {
return {
@ -153,6 +169,11 @@ export default {
fkyy:'',
zt:'01'
},
inParam:{
pkry:'',
pkjs:'',
pkks:'',
},
statusOptions: [
{
value: "01",
@ -258,7 +279,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkjhrq', title: '坡口计划日期', width: 120,
{ field: 'dmjhrq', title: '打磨计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -277,6 +298,10 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkjhrq', title: '坡口计划日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pkfzry', title: '坡口负责人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -313,42 +338,42 @@ export default {
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 120,
{ field: 'pkZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 120,
{ field: 'pkBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 120,
{ field: 'pkBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 120,
{ field: 'pkXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 120,
{ field: 'pkXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 120,
{ field: 'pkFkry', title: '反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 120,
{ field: 'pkFkrq', title: '反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 120,
{ field: 'pkFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -416,11 +441,18 @@ export default {
this.projectData1=res.data.cbbm
})
},
plClick(){
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
if(type==='1'){
selectRecords[i].pkry = this.inParam.pkry
selectRecords[i].pkksrq = this.inParam.pkks
}else if (type==='2'){
selectRecords[i].pkjsrq = this.inParam.pkjs
}
}
this.$refs.xGrid.updateData(this.list)
}
@ -432,7 +464,7 @@ export default {
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveQgPgdFk(obj).then(res=>{
savePkFk(obj).then(res=>{
if(res.success){
this.initList()
}
@ -449,7 +481,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXdBack(obj).then(res=>{
savePkPgdXdBack(obj).then(res=>{
if(res.success){
this.$message({ message: '取消下达成功', type: 'success' })
this.initList()
@ -463,7 +495,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() =>{
saveQgPgdXd(obj).then(res=>{
savePkPgdXd(obj).then(res=>{
if(res.success){
this.$message({ message: '下达成功', type: 'success' })
this.initList()
@ -480,7 +512,7 @@ export default {
this.$message.warning('选择船只编号')
return
}
getQgPgd(this.queryParam).then((res) => {
getPkPgd(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)

@ -1,7 +1,7 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-header style="width: 100%; height: 100px;font-size: 12px">
<el-form :inline="true" label-width="60px" label-position="left">
<el-row>
@ -60,7 +60,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14" >
<el-col :span="20" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
@ -73,17 +73,27 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
<el-button type="success" @click="saveclick"></el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<span style="width:6%" >抛丸人员:</span>
<el-input v-model="inParam.pwry" placeholder="接收人" clearable style="width:10%" />
<span style="width:6%" >抛丸开始:</span>
<el-date-picker v-model="inParam.pwks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="抛丸开始"/>
<el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>
<span style="width:6%" >抛丸结束:</span>
<el-date-picker v-model="inParam.pwjs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="抛丸结束"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col>
</el-row>
</el-form>
@ -125,12 +135,12 @@
<script>
import {
getPwPgd,
getPwPgd,
savePwPgdFk,
savePwPgdXd,
savePwPgdXdBack,
getPgdBase
getPgdBase, savePwFk
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
@ -163,6 +173,11 @@ export default {
label: "反馈",
},
],
inParam:{
pwry:'',
pwks:'',
pwjs:'',
},
list: [],
heads: { token: getToken() },
uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
@ -376,11 +391,18 @@ export default {
this.projectData1=res.data.cbbm
})
},
plClick(){
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
if(type==='1'){
selectRecords[i].pwjgry = this.inParam.pwry
selectRecords[i].pwksrq = this.inParam.pwks
}else if (type==='2'){
selectRecords[i].pwjsrq = this.inParam.pwjs
}
}
this.$refs.xGrid.updateData(this.list)
}
@ -392,7 +414,7 @@ export default {
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
savePwPgdFk(obj).then(res=>{
savePwFk(obj).then(res=>{
if(res.success){
this.initList()
}

@ -1,7 +1,7 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-header style="width: 100%; height: 100px;font-size: 12px">
<el-form :inline="true" label-width="60px" label-position="left">
<el-row>
@ -60,7 +60,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14" >
<el-col :span="20" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
@ -73,19 +73,37 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
<el-button type="success" @click="saveclick"></el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<span style="width:6%" >切割人员:</span>
<el-input v-model="inParam.qgry" placeholder="接收人" clearable style="width:10%" />
<span style="width:6%" >切割开始:</span>
<el-date-picker v-model="inParam.qgks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="上料开始"/>
<el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>
<span style="width:6%" >切割结束:</span>
<el-date-picker v-model="inParam.qgjs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="上料结束"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
<!-- <span style="width:6%" >划线人员:</span>-->
<!-- <el-input v-model="inParam.qgry" placeholder="接收人" clearable style="width:10%" />-->
<!-- <span style="width:6%" >划线开始:</span>-->
<!-- <el-date-picker v-model="inParam.qgks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="上料开始"/>-->
<!-- <el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>-->
<!-- <span style="width:6%" >切割结束:</span>-->
<!-- <el-date-picker v-model="inParam.qgjs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="上料结束"/>-->
<!-- <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>-->
</el-col>
</el-row>
</el-form>
</el-header>
<el-container style="padding-top: 0px">
@ -125,12 +143,12 @@
<script>
import {
getQgPgd,
getQgPgd,
saveQgPgdFk,
saveQgPgdXd,
saveQgPgdXdBack,
getPgdBase
getPgdBase, saveQgdFk
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
@ -147,7 +165,12 @@ export default {
pl:'',
fd:'',
fkyy:'',
zt:'01'
zt:'02'
},
inParam:{
qgry:'',
qgks:'',
qgjs:''
},
statusOptions: [
{
@ -412,11 +435,18 @@ export default {
this.projectData1=res.data.cbbm
})
},
plClick(){
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
if(type==='1'){
selectRecords[i].qgry = this.inParam.qgry
selectRecords[i].qgksrq = this.inParam.qgks
}else if (type==='2'){
selectRecords[i].qgjsrq = this.inParam.qgjs
}
}
this.$refs.xGrid.updateData(this.list)
}
@ -424,11 +454,7 @@ export default {
},
saveclick(){
let obj=this.$refs.xGrid.getUpdateRecords()
if(obj.length===0){
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveQgPgdFk(obj).then(res=>{
saveQgdFk(obj).then(res=>{
if(res.success){
this.initList()
}

@ -62,7 +62,7 @@
<el-row>
<el-col :span="14" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-select v-model="queryParam.zt" placeholder="状态" >
<el-option
v-for="item in statusOptions"
:key="item.value"
@ -188,176 +188,155 @@ export default {
{ type: 'seq', width: 40, title: '序号' },
{ field: 'czbh', title: '船号', width: 100,
{ field: 'czbh', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pl', title: '批量', width: 100,
{ field: 'pl', title: '批量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fd', title: '分段', width: 100,
{ field: 'fd', title: '分段', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
{ field: 'kw', title: '跨位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
{ field: 'zl', title: '组立', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
{ field: 'tlth', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tlth', title: '套料图号', width: 100,
{ field: 'ptblx', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpgg', title: '规格', width: 100,
{ field: 'ljbh', title: '零件编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '材质', width: 100,
{ field: 'ljmc', title: '零件名称', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpzl', title: '重量', width: 100,
{ field: 'ljgg', title: '零件规格', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjhrq', title: '切割计划期', width: 100,
{ field: 'ljcz', title: '零件材质', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
{ field: 'wpfl', title: '物品分类', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
{ field: 'jldw', title: '计量单位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100,
{ field: 'sl', title: '数量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgfzry', title: '切割负责人', width: 100,
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxsbbh', title: '划线设备编号', width: 100,
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxcd', title: '划线长度', width: 100,
{ field: 'gylx', title: '工艺路线', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxkccd', title: '划线空程长度', width: 100,
{ field: 'qjgjhrq', title: '曲加工计划期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgsbbh', title: '切割设备编号', width: 100,
{ field: 'qjgfzry', title: '曲加工负责人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgcd', title: '切割长度', width: 100,
{ field: 'qsbbh', title: '曲设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgkccd', title: '切割空程长度', width: 100,
{ field: 'qjgry', title: '曲加工人员', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxry', title: '划线人员', width: 100,
{ field: 'qjgksrq', title: '曲加工开始日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxksrq', title: '划线开始时间', width: 100,
{ field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxjsrq', title: '划线结束时间', width: 100,
{ field: 'qjgZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgry', title: '切割人员', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgksrq', title: '切割开始时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjsrq', title: '切割结束时间', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 100,
{ field: 'qjgBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 100,
{ field: 'qjgBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
{ field: 'qjgXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 100,
{ field: 'qjgXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 100,
{ field: 'qjgFkry', title: '反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 100,
{ field: 'qjgFkrq', title: '反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 100,
{ field: 'qjgFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -411,7 +390,7 @@ export default {
activeRowMethod({ row, rowIndex }){
if(row.zt==="01"){
if(row.qjgZt==="01"){
return true
}else{
return false
@ -429,7 +408,7 @@ export default {
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
selectRecords[i].qjgFkyy = this.queryParam.fkyy
}
this.$refs.xGrid.updateData(this.list)
}

@ -1,7 +1,7 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-header style="width: 100%; height: 100px;font-size: 12px">
<el-form :inline="true" label-width="60px" label-position="left">
<el-row>
@ -73,20 +73,27 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
<el-button type="success" @click="Choice"></el-button>
<el-button type="success" @click="saveclick"></el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<span style="width:6%" >曲面人员:</span>
<el-input v-model="inParam.qmry" placeholder="曲面人" clearable style="width:10%" />
<span style="width:6%" >曲面开始:</span>
<el-date-picker v-model="inParam.qmks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="曲面开始"/>
<el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>
<span style="width:6%" >曲面结束:</span>
<el-date-picker v-model="inParam.qmjs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="曲面结束"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-row>
</el-form>
</el-header>
<el-container style="padding-top: 0px">
@ -127,12 +134,12 @@
<script>
import {
getQmPgd,
getQmPgd,
saveQmPgdFk,
saveQmPgdXd,
saveQmPgdXdBack,
getPgdBase
getPgdBase, saveQmFk
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
@ -151,7 +158,12 @@ export default {
pl:'',
fd:'',
fkyy:'',
zt:'01'
zt:'02'
},
inParam:{
qmry:'',
qmks:'',
qmjs:''
},
statusOptions: [
{
@ -188,176 +200,155 @@ export default {
{ type: 'seq', width: 40, title: '序号' },
{ 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,
{ field: 'czbh', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
{ field: 'pl', title: '批量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
{ field: 'fd', title: '分段', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
{ field: 'kw', title: '跨位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'tlth', title: '套料图号', width: 100,
{ field: 'zl', title: '组立', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpgg', title: '规格', width: 100,
{ field: 'tlth', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpcz', title: '材质', width: 100,
{ field: 'ptblx', title: '套料图号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'wpzl', title: '重量', width: 100,
{ field: 'ljbh', title: '零件编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjhrq', title: '切割计划期', width: 100,
{ field: 'ljmc', title: '零件名称', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
{ field: 'ljgg', title: '零件规格', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
{ field: 'ljcz', title: '零件材质', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100,
{ field: 'wpfl', title: '物品分类', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgfzry', title: '切割负责人', width: 100,
{ field: 'jldw', title: '计量单位', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxsbbh', title: '划线设备编号', width: 100,
{ field: 'sl', title: '数量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxcd', title: '划线长度', width: 100,
{ field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxkccd', title: '划线空程长度', width: 100,
{ field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgsbbh', title: '切割设备编号', width: 100,
{ field: 'gylx', title: '工艺路线', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgcd', title: '切割长度', width: 100,
{ field: 'qjgjhrq', title: '曲加工计划期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgkccd', title: '切割空程长度', width: 100,
{ field: 'qjgfzry', title: '曲加工负责人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxry', title: '划线人员', width: 100,
{ field: 'qsbbh', title: '曲设备编号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxksrq', title: '划线开始时间', width: 100,
{ field: 'qjgry', title: '曲加工人员', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'hxjsrq', title: '划线结束时间', width: 100,
{ field: 'qjgksrq', title: '曲加工开始日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgry', title: '切割人员', width: 100,
{ field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgksrq', title: '切割开始时间', width: 100,
{ field: 'qjgZt', title: '状态', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'qgjsrq', title: '切割结束时间', width: 100,
{ field: 'qjgBzry', title: '编制人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'zt', title: '状态', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkry', title: '反馈人', width: 100,
{ field: 'qjgBzrq', title: '编制日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkrq', title: '反馈日期', width: 100,
{ field: 'qjgXfry', title: '下发人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
{ field: 'qjgXfrq', title: '下发日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzry', title: '编制人', width: 100,
{ field: 'qjgFkry', title: '反馈人', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'bzrq', title: '编制日期', width: 100,
{ field: 'qjgFkrq', title: '反馈日期', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfry', title: '下发人', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
{ field: 'xfrq', title: '下发日期', width: 100,
{ field: 'qjgFkyy', title: '反馈原因', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@ -366,7 +357,6 @@ export default {
]
}
},
@ -425,11 +415,18 @@ export default {
this.projectData1=res.data.cbbm
})
},
plClick(){
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
if(type==='1'){
selectRecords[i].qjgry = this.inParam.qmry
selectRecords[i].qjgksrq = this.inParam.qmks
}else if (type==='2'){
selectRecords[i].qjgjsrq = this.inParam.qmjs
}
}
this.$refs.xGrid.updateData(this.list)
}
@ -441,7 +438,7 @@ export default {
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveQmPgdFk(obj).then(res=>{
saveQmFk(obj).then(res=>{
if(res.success){
this.initList()
}

@ -1,7 +1,7 @@
<template>
<!-- <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
<el-container>
<el-header style="width: 100%; height: 80px;font-size: 12px">
<el-header style="width: 100%; height: 100px;font-size: 12px">
<el-form :inline="true" label-width="60px" label-position="left">
<el-row>
@ -60,7 +60,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14" >
<el-col :span="22" >
<el-form-item label="状态:">
<el-select v-model="queryParam.zt" placeholder="状态" clearable>
<el-option
@ -73,19 +73,26 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-col :span="2">
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
<el-button type="success" @click="saveclick"></el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<span style="width:6%" >上料人员:</span>
<el-input v-model="inParam.slry" placeholder="接收人" clearable style="width:10%" />
<span style="width:6%" >上料开始:</span>
<el-date-picker v-model="inParam.slks" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="上料开始"/>
<el-button type="info" @click="updates('1')" style="width: 5%">批量</el-button>
<span style="width:6%" >上料结束:</span>
<el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="上料结束"/>
<el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
</el-col>
</el-row>
</el-form>
</el-header>
<el-container style="padding-top: 0px">
@ -125,12 +132,12 @@
<script>
import {
getSljhPgd,
getSljhPgd,
saveSljhPgdFk,
saveSljhPgdXd,
saveSljhPgdXdBack,
getPgdBase
getPgdBase, saveSljhFk
} from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
@ -147,7 +154,12 @@ export default {
pl:'',
fd:'',
fkyy:'',
zt:'01'
zt:'02'
},
inParam:{
slry:'',
slks:'',
sljs:''
},
statusOptions: [
{
@ -394,11 +406,18 @@ export default {
this.projectData1=res.data.cbbm
})
},
plClick(){
updates(type){
let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) {
selectRecords[i].fkyy = this.queryParam.fkyy
if(type==='1'){
selectRecords[i].slry = this.inParam.slry
selectRecords[i].slksrq = this.inParam.slks
}else if (type==='2'){
selectRecords[i].sjjsrq = this.inParam.sljs
}
}
this.$refs.xGrid.updateData(this.list)
}
@ -406,11 +425,7 @@ export default {
},
saveclick(){
let obj=this.$refs.xGrid.getUpdateRecords()
if(obj.length===0){
this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
return
}
saveSljhPgdFk(obj).then(res=>{
saveSljhFk(obj).then(res=>{
if(res.success){
this.initList()
}

@ -73,18 +73,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right;">
<el-form-item >
<el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
<el-button type="info" @click="plClick"></el-button>
</el-form-item>
</el-col>
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="saveclick"></el-button>
<el-button type="success" @click="xdClick"></el-button>
</el-form-item>
</el-col>
<!-- <el-col :span="6" style="text-align: right;">-->
<!-- <el-form-item >-->
<!-- <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />-->
<!-- <el-button type="info" @click="plClick"></el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4" >-->
<!-- <el-form-item style="float: right" >-->
<!-- <el-button type="success" @click="saveclick"></el-button>-->
<!-- <el-button type="success" @click="xdClick"></el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
</el-header>

Loading…
Cancel
Save