master
xhj 8 months ago
parent 48ed3b7d14
commit 4d320617aa

@ -32,6 +32,7 @@ export function getKcAndSljh1(data) {return request({url: '/pgdSljh/getKcAndSljh
export function kcAdnSlBd(data) {return request({url: '/pgdSljh/kcAdnSlBd', method: 'post', data})} export function kcAdnSlBd(data) {return request({url: '/pgdSljh/kcAdnSlBd', method: 'post', data})}
export function kcAdnSlBd1(data) {return request({url: '/pgdSljh/kcAdnSlBd1', method: 'post', data})} export function kcAdnSlBd1(data) {return request({url: '/pgdSljh/kcAdnSlBd1', method: 'post', data})}
export function kcAdnSlBd2(data) {return request({url: '/pgdSljh/kcAdnSlBd2', method: 'post', data})} export function kcAdnSlBd2(data) {return request({url: '/pgdSljh/kcAdnSlBd2', method: 'post', data})}
export function kcAdnSlBdQX(data) {return request({url: '/pgdSljh/kcAdnSlBdQX', method: 'post', data})}
export function kcAdnSlZx(data) {return request({url: '/pgdSljh/kcAdnSlZx', method: 'post', data})} export function kcAdnSlZx(data) {return request({url: '/pgdSljh/kcAdnSlZx', method: 'post', data})}
export function saveSljhPgdXd(data) {return request({url: '/pgdSljh/saveSljhPgdXd', method: 'post', data})} 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 saveSljhPgdXdBack(data) {return request({url: '/pgdSljh/saveSljhPgdXdBack', method: 'post', data})}

@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="14"> <el-col :span="16">
<el-form :inline="true" label-width="50px" label-position="left"> <el-form :inline="true" label-width="50px" label-position="left">
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="queryParam.rqopt" placeholder="状态" clearable @change="ztChange" style="width: 80px"> <el-select v-model="queryParam.rqopt" placeholder="状态" clearable @change="ztChange" style="width: 80px">
@ -55,36 +55,43 @@
</el-form-item> </el-form-item>
<el-form-item label="期量:" label-width="40"> <!-- <el-form-item label="期量:" label-width="40">-->
<!-- <el-select v-model="inParam.ql" placeholder="期量" clearable >-->
<!-- <el-option-->
<!-- v-for="item in this.dictData.dhql"-->
<!-- :key="item.bm"-->
<!-- :label="item.bmsm"-->
<!-- :value="item.bm"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="库位:" >
<el-input v-model="queryParam.kwh" type="search" placeholder="库位号" style="width: 80px" ></el-input>
</el-form-item>
<el-form-item label="规格:">
<el-input v-model="queryParam.wpgg" type="search" placeholder="规格" ></el-input>
</el-form-item>
<el-select v-model="inParam.ql" placeholder="期量" clearable > <el-form-item label="炉批:">
<el-option <el-input v-model="queryParam.lph" type="search" placeholder="炉批号" style="width: 100px" ></el-input>
v-for="item in this.dictData.dhql"
:key="item.bm"
:label="item.bmsm"
:value="item.bm"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="跨位:">-->
<!-- <el-input v-model="queryParam.kw" type="search" placeholder="跨位" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item > <!-- <el-form-item>-->
<el-checkbox v-model="queryParam.flag" >启用跨位</el-checkbox> <!-- <el-checkbox v-model="queryParam.flag" >启用跨位</el-checkbox>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="10" style="text-align: right"> <el-col :span="8" style="text-align: right">
<el-button type="success" @click="initList"></el-button> <el-button type="success" @click="initList"></el-button>
<el-button type="success" @click="hdClick()"></el-button> <el-button type="success" @click="hdClick()"></el-button>
<!-- <el-button type="danger" @click="delOne('insert')"></el-button>--> <!-- <el-button type="danger" @click="delOne('insert')"></el-button>-->
<el-button type="success" @click="saveOne()"></el-button> <el-button type="success" @click="saveOne()"></el-button>
<el-button type="success" @click="print()"></el-button> <el-button type="success" @click="print()"></el-button>
<!-- <el-button type="success" @click="printPd()"></el-button>--> <el-button type="success" @click="exportExcel()"></el-button>
</el-col> </el-col>
<!-- <el-col :span="10">--> <!-- <el-col :span="10">-->
@ -201,16 +208,16 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model="inParam.pwwz" placeholder="抛丸位置" clearable style="width: 15%"> <!-- <el-select v-model="inParam.pwwz" placeholder="抛丸位置" clearable style="width: 15%">-->
<el-option <!-- <el-option-->
v-for="item in this.dictData.pwwz" <!-- v-for="item in this.dictData.pwwz"-->
:key="item.bm" <!-- :key="item.bm"-->
:label="item.bmsm" <!-- :label="item.bmsm"-->
:value="item.bm" <!-- :value="item.bm"-->
> <!-- >-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
<el-input v-model="inParam.pwwz" placeholder="抛丸位置" ></el-input>
<el-select v-model="inParam.qgkw" placeholder="切割跨位" clearable style="width: 15%"> <el-select v-model="inParam.qgkw" placeholder="切割跨位" clearable style="width: 15%">
<el-option <el-option
v-for="item in this.dictData.qgkw" v-for="item in this.dictData.qgkw"
@ -354,12 +361,12 @@ import {
getKcAndSljh1, getKcAndSljh1,
slPrint, slPrint,
kcAdnSlBd1, kcAdnSlBd1,
kcAdnSlBd2, slPrintqx kcAdnSlBd2, slPrintqx, kcAdnSlBdQX
} from '@/api/jhzxgl/pgd' } from '@/api/jhzxgl/pgd'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils' import XEUtils from 'xe-utils'
import SljhPrint from "@/views/jhzxgl/components/SljhPrint"; import SljhPrint from "@/views/jhzxgl/components/SljhPrint";
import {null2str} from "@/utils/rpkj"; import {exportByExcel, null2str} from "@/utils/rpkj";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils' import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -376,7 +383,10 @@ export default {
kw:'', kw:'',
sljhrq:'', sljhrq:'',
rqopt:'01', rqopt:'01',
flag:false flag:false,
wpgg:'',
lph:'',
kwh:''
}, },
defaultHeight: { height: '' }, defaultHeight: { height: '' },
wgzyprintFlag:false, wgzyprintFlag:false,
@ -814,6 +824,9 @@ export default {
this.inParam.dw=0 this.inParam.dw=0
}, },
methods: { methods: {
exportExcel(){
exportByExcel(this.tableColumn1,this.$refs.xGrid.getTableData().visibleData,1,'上料派工单.xlsx')
},
cellClickEvent({row}) { cellClickEvent({row}) {
this.queryParam.xqdcch = row.cbbm this.queryParam.xqdcch = row.cbbm
this.$refs.xDown4.hidePanel() this.$refs.xDown4.hidePanel()
@ -881,37 +894,41 @@ export default {
updates2(){ updates2(){
let selectRecords = this.$refs.xGrid.getCheckboxRecords() let selectRecords = this.$refs.xGrid.getCheckboxRecords()
if(this.queryParam.rqopt!=='01'){
return
}
if(selectRecords.length>0){ if(selectRecords.length>0){
for(let i = 0; i < selectRecords.length; i++) { for(let i = 0; i < selectRecords.length; i++) {
console.log(selectRecords[i].ydid) console.log(selectRecords[i].ydid)
if(this.inParam.dcch !==''){ if(this.inParam.dcch !==''){
if(selectRecords[i].ydid!==null){ // if(selectRecords[i].ydid!==null || selectRecords[i].ydid!==''){
this.$message({ message: '改数据已经匹配生产计划', type: 'warning' }) // this.$message({ message: '', type: 'warning' })
return // return
} // }
selectRecords[i].zych = this.inParam.dcch selectRecords[i].zych = this.inParam.dcch
} }
if(this.inParam.dcpl !==''){ if(this.inParam.dcpl !==''){
if(selectRecords[i].ydid!==null){ // if(selectRecords[i].ydid!==null){
this.$message({ message: '改数据已经匹配生产计划', type: 'warning' }) // this.$message({ message: '', type: 'warning' })
return // return
} // }
selectRecords[i].zypl = this.inParam.dcpl selectRecords[i].zypl = this.inParam.dcpl
} }
if(this.inParam.lx !==''){ if(this.inParam.lx !==''){
if(selectRecords[i].ydid!==null){ // if(selectRecords[i].ydid!==null){
this.$message({ message: '改数据已经匹配生产计划', type: 'warning' }) // this.$message({ message: '', type: 'warning' })
return // return
} // }
selectRecords[i].zylx = this.inParam.lx selectRecords[i].zylx = this.inParam.lx
} }
if(this.inParam.qgkw !==''){ if(this.inParam.qgkw !==''){
if(selectRecords[i].ydid!==null){ // if(selectRecords[i].ydid!==null){
this.$message({ message: '改数据已经匹配生产计划', type: 'warning' }) // this.$message({ message: '', type: 'warning' })
return // return
} // }
selectRecords[i].sldw = this.inParam.qgkw selectRecords[i].sldw = this.inParam.qgkw
} }
if(this.inParam.pwwz!==''){ if(this.inParam.pwwz!==''){
@ -1130,6 +1147,15 @@ export default {
}, },
hdClick(){ hdClick(){
if(this.queryParam.rqopt=='02'){
kcAdnSlBdQX({ "data1":this.$refs.xGrid.getCheckboxRecords(),}).then(res=>{
if(res.success){
this.initList()
}
})
}
if(this.queryParam.rqopt!=='01'){ if(this.queryParam.rqopt!=='01'){
return return
} }
@ -1139,10 +1165,10 @@ export default {
return return
} }
// if(this.inParam.dcpl ===''){ if(this.inParam.dcpl ===''){
// this.$message({ message: '', type: 'warning' }) this.$message({ message: '请输入需求批量', type: 'warning' })
// return return
// } }
let obj =this.$refs.xGrid.getTableData().visibleData; let obj =this.$refs.xGrid.getTableData().visibleData;
if(obj.length<=0){ if(obj.length<=0){
this.$message({ message: '页面无数据', type: 'warning' }) this.$message({ message: '页面无数据', type: 'warning' })

Loading…
Cancel
Save