xiaoning
/
gjerp_ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修正作业计划执行拖拽报工失败问题

Browse Source 
2.增加预配盘原则原则相关功能
3.抛丸派工增加材质列
master
董哲奇 5 months ago
parent 947db50f71
commit a18eebac1d
11 changed files with 95 additions and 43 deletions
Show Stats Download Patch File Download Diff File

62
src/views/jhzxgl/yppFK.vue
Unescape View File

@ -649,9 +649,55 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzDcCh',
title: '配盘船号',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzDcPl',
title: '配盘批量',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzDcFd',
title: '配盘分段',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzZl',
title: '配盘组立',
width: 100,formatter:this.zlFormat,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzTz',
title: '配盘特征',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzLx',
title: '配盘流向',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'yzXj',
title: '配盘下级',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
]
}
},
@ -666,7 +712,15 @@ export default {
},
methods: {
zlFormat({cellValue}){
if(cellValue==='D'){
return '中大组立'
}
if(cellValue==='X'){
return '小组立'
}
return cellValue
},
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.$refs.xDown4.hidePanel()

43
src/views/jhzxgl/yppyz.vue
Unescape View File

@ -11,7 +11,7 @@
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="queryParam.dcch"
v-model="queryParam.dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 140px;"
@ -50,22 +50,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<!-- <el-select v-model="inParam.zt" placeholder="状态" clearable >-->
<!-- <el-option-->
<!-- v-for="item in this.dictData.kwxxs"-->
<!-- :key="item.bm"-->
<!-- :label="item.bmsm"-->
<!-- :value="item.bm"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-input v-model="inParam.rqfw" placeholder="日期范围" clearable style="width: 200px" />-->
<!-- <el-button type="info" @click="plClick">批量</el-button>-->
</el-col>
<el-col :span="14"></el-col>
<el-col :span="10" >
<el-form-item style="float: right" >
<el-button
type="success"
@click="toolbarButtonClickEvent('save')"
@ -142,7 +129,7 @@ export default {
data() {
return {
queryParam: {
dcch:'',
dcCh:'',
},inParam:{
@ -170,7 +157,7 @@ export default {
{ type: 'seq', width: 40, title: '序号' },
{
field: 'dcCh',
title: '船号',editRender: { name: 'input' },
title: '船号',editRender: { name: '$select',options: [], },
width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
@ -198,7 +185,7 @@ export default {
},
{
field: 'zl',
title: '组立',editRender: { name: 'input' },
title: '组立',editRender: { name: '$select',options: [{label: '小组立',value:'X'},{label: '中大组立',value:'D'}], },
width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
@ -249,7 +236,7 @@ export default {
},
methods: {
cellClickEvent({row}) {
this.queryParam.dcch = row.cbbm
this.queryParam.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4() {
@ -274,6 +261,17 @@ export default {
this.dictData = res.data
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
const select=this.$refs.xGrid.getColumnByField('dcCh')
const chList=[]
console.log(this.projectData1)
res.data.cbbm.forEach(item=>{
const data={
label:item.cbbm,
value:item.cbbm
}
chList.push(data)
})
select.editRender.options=chList
// console.log(this.dictData)
// const xGrid = this.$refs.xGrid
//
@ -285,12 +283,11 @@ export default {
})
},
initList() {
yppyzcx(this.request).then((res) => {
yppyzcx(this.queryParam).then((res) => {
this.list = res.data
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
}
})
},
@ -331,10 +328,6 @@ export default {
} = this.$refs.xGrid.getRecordset()
switch (code) {
case 'insert':
if(this.request.dwbm==='' ||this.request.dwbm===null){
this.$message({ message: '请选择需求单位！', type: 'warning' })
return
}
this.$refs.xGrid.insertAt({
}, -1).then(({ row }) => {

3
src/views/zyjhzx/hxianfkui/comps/baifang.js
Unescape View File

@ -121,7 +121,8 @@ const baifang=function (option={}) {
zxZtName:'HXFK',
list:[{
id:zyjh.id,
hxfkry: worker.userCode
hxfkry: worker.userCode,
zt:zyjh.zt
}],
ycldwInfo:info
}).then(res=>{

1
src/views/zyjhzx/lliaopgong/comps/LliaoPgd.vue
Unescape View File

@ -68,6 +68,7 @@ export default {
const data = {
id: item.id,
llry: worker.userCode,//抛丸施工人员姓名
zt:item.zt
}
tmpArr.push(data)
}

3
src/views/zyjhzx/pwanfkui/comps/baifang.js
Unescape View File

@ -121,7 +121,8 @@ const baifang=function (option={}) {
zxZtName:'PWFK',
list:[{
id:zyjh.id,
pwfkry: worker.userCode
pwfkry: worker.userCode,
zt:zyjh.zt
}],
ycldwInfo:info
}).then(res=>{

4
src/views/zyjhzx/pwanpgong/comps/PwanPgd_tz.vue
Unescape View File

@ -65,7 +65,8 @@ export default {
}
const tmpArr=[{
id:item.id,
pwry:worker.userCode
pwry:worker.userCode,
zt:item.zt
}]
this.paigong0(tmpArr)
break
@ -134,6 +135,7 @@ export default {
const data={
id:item.id,
pwry:worker.userCode,//抛丸施工人员姓名
zt:item.zt
}
tmpArr.push(data)
}

13
src/views/zyjhzx/pwanpgong/comps/PwanSgd.vue
Unescape View File

@ -1,14 +1,15 @@
<template>
<div>
<div class="btn">
<button @click="reset">重置</button>
<button @click="btnClick">提交</button>
<VxeButton status="primary" content="重置" @click="reset" />
<VxeButton status="primary" content="提交" @click="btnClick" />
</div>
<VxeGrid ref="vxeGrid" v-bind="gridOptions" @checkbox-change="checkboxChange" />
</div>
</template>
<script>
import XEUtils from 'xe-utils'
import { EventBus } from '@/event-bus.js'
import paoWanPgdConfig from "@/views/zyjhzx/pwanpgong/comps/pgdTable";
import {getDw, pwpg} from "@/api/zyjh";
@ -125,7 +126,8 @@ export default {
const workBook = XLSX.utils.book_new();
const sheet = XLSX.utils.json_to_sheet(printData)
XLSX.utils.book_append_sheet(workBook, sheet, "sheetName");
XLSX.writeFile(workBook, '抛丸计划.xlsx')
const date=XEUtils.toDateString(new Date(),'yyyyMMdd')
XLSX.writeFile(workBook, `抛丸计划${date}.xlsx`)
}
},
checkboxChange({row}){
@ -150,10 +152,5 @@ export default {
<style scoped>
.btn{
text-align: right;
button{
width: 15%;
margin-right: 5px;
background-color: blue;
}
}
</style>

3
src/views/zyjhzx/pwanpgong/comps/pgdTable.js
Unescape View File

@ -91,8 +91,9 @@ export default function (_height=0) {
{field: 'pl', title: '批量', width: 50},
{field: 'fd', title: '分段',width: 50,visible:false},
{field: 'tlth', title: '套料图号',width: 120},
{field: 'wph', title: '材质', width: 60,},
{field: 'wpgg', title: '物品规格', width: 120,},
{field: 'wlh', title: '物料号', width: 130,},
{field: 'lph', title: '物料号', width: 130,},
{field: 'kw', title: '垮位',width: 130,formatter: kwFormat},
{field: 'zl', title: '组立', width: 70,formatter: zlFormat},
{field: 'nbsbm', title: '入库批号',minWidth: 100,},

2
src/views/zyjhzx/pwanpgong/index.vue
Unescape View File

@ -249,7 +249,7 @@ export default {
width:31.5%;
height: 93.5vh;
position: absolute;
top:20px;
top:10px;
right:10px;
border: none;
margin: 0;

3
src/views/zyjhzx/qgefkui/comps/baifang.js
Unescape View File

@ -121,7 +121,8 @@ const baifang=function (option={}) {
zt:'42',
list:[{
id:zyjh.id,
qgfkry: worker.userCode
qgfkry: worker.userCode,
zt:zyjh.zt
}],
ycldwInfo:info
}).then(res=>{

1
src/views/zyjhzx/sliao/index.vue
Unescape View File

@ -390,6 +390,7 @@ export default {
sljhrq:item.sljhrq,
qgjhrq:item.qgjhrq,
wlh:item.slwlh,
lph:item.sllph,
nbsbm:item.nbsbm,
bfr:that.getCurrentWorker()?.userCode,
type:'YCL'

Write Preview
Loading…
Cancel
Save