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

1.预配盘摆放相关功能

Browse Source
master
董哲奇 8 months ago
parent 7d82d23b61
commit 16bd95c8fc
10 changed files with 171 additions and 98 deletions
Show Stats Download Patch File Download Diff File

1
src/api/jhzxgl/ypp.js
Unescape View File

@ -15,6 +15,7 @@ export function getBfwz(data={}) {return request({url: '/dwxx/list', method: 'po
*/
export function saveBfwz(data={}) {return request({url: '/dwxx/addOrEdit', method: 'post', data})}
export function getYppyzList(data={}) {return request({url: '/yppyz/list', method: 'post', data})}
export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})}
export function getDmppxxbListAndYz(data={}) {return request({url: '/dmPpxxb/getDmppxxbListAndYz', method: 'post', data})}

8
src/api/sjzx/bzzGL.js
Unescape View File

@ -68,7 +68,13 @@ export function getryBase(data) {
});
}
export function bgList(data) {
return request({
url: "/yppyz/bgList",
method: "post",
data,
});
}
export function yppyzcx(data) {
return request({

8
src/api/zyjh.js
Unescape View File

@ -1,5 +1,13 @@
import request from '@/utils/request'
export function ppBGong(data) {
return request({
url: "/zyjh/ppBGong",
method: "post",
data
});
}
export function getBzryByBz(params) {
return request({
url: "/zyjh/getBzryByBz",

66
src/views/jhzx/ydjhzxCX.vue
Unescape View File

@ -153,63 +153,58 @@ export default {
sbxx:{},
height: '500px',
tableColumn1:[
{ type: 'seq', width: 60, title: '序号'},
{ field: 'dcCh', title: '船号',width: 100,
{ type: 'seq', width: 25, title: '序号'},
{ field: 'dcCh', title: '船号\n',width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
// { field: 'dcCh1', title: '目标船号',width: 90,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
{ field: 'dcPl', title: '批量',width: 80,
{ field: 'dcPl', title: '批量\n',width: 60,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'jssj', title: '分段钢料需求',width: 110,
{ field: 'jssj', title: '分段\n钢料需求',width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'sljhrq', title: '上料计划日期',width: 100,
{ field: 'sljhrq', title: '上料\n计划日期',width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
},
{ field: 'pwjhrq', title: '抛丸计划日期',width: 100,
{ field: 'pwjhrq', title: '抛丸\n计划日期',width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
},
{ field: 'hxjhrq', title: '划线计划日期',width: 100,
{ field: 'hxjhrq', title: '划线\n计划日期',width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
},
{ field: 'qgjhrq', title: '切割计划日期',width: 100,
{ field: 'qgjhrq', title: '切割\n计划日期',width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
},
{ field: 'bs', title: '套料图数',width: 80,
{ field: 'bs', title: '套料图\n',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'ylbs', title: '余料板数',width: 80,
{ field: 'ylbs', title: '余料\n板数',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'slxhthCount', title: '上料匹配板数',width: 80,
{ field: 'slxhthCount', title: '上料匹配\n板数',width: 80,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'slCount', title: '上料板数',width: 80,
{ field: 'slCount', title: '上料\n板数',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'pwCount', title: '抛丸板数',width: 80,
{ field: 'pwCount', title: '抛丸\n板数',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
// { field: 'llCount', title: '理料板数',width: 80,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }},
{ field: 'hxCount', title: '划线板数',width: 80,
{ field: 'hxCount', title: '划线\n板数',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'qgCount', title: '切割板数',width: 80,
{ field: 'qgCount', title: '切割\n板数',width: 70,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ title: '1跨',
@ -254,7 +249,6 @@ export default {
},
],
tableColumn:[
{ type: 'checkbox', width: 50 ,},
{ type: 'seq', width: 60, title: '序号'},
// { field: 'jhlx', title: '计划类型',width: 70,formatter:this.formatterZt,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -274,7 +268,7 @@ export default {
{ field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
{ field: 'kw', title: '跨位',width: 120,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{ field: 'tzbh', title: '套料图号',width: 90,
@ -288,20 +282,20 @@ export default {
{ field: 'ylbs', title: '余料',width: 90,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
{
field: 'slkcdw',
title: '上料库存垛位',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
{
field: 'slcs',
title: '上料层数',
width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination' }
},
// {
// field: 'slkcdw',
// title: '上料库存垛位',
// width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination' }
// },
// {
// field: 'slcs',
// title: '上料层数',
// width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination' }
// },
// {
// field: 'slxhth',
// title: '上料小合同号',

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

@ -149,9 +149,8 @@
<!-- </el-col>-->
<el-col :span="4" >
<el-form-item style="float: right" >
<el-button type="success" @click="wzxjc">完整性检查</el-button>
<el-button type="success" @click="slpgclick">报工</el-button>
</el-form-item>
</el-col>
</el-row>
@ -722,10 +721,16 @@ export default {
window.addEventListener('resize', this.getHeight)
this.getHeight()
this.initBase()
},
methods: {
//完整性检查
wzxjc(){
if (!this.queryParam.dcch){
this.$message.warning('请选择船号')
return;
}
},
zlFormat({cellValue}){
if(cellValue==='D'){
return '中大组立'

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

@ -26,16 +26,9 @@
<el-col :span="14"></el-col>
<el-col :span="10" >
<el-form-item style="float: right" >
<el-button
type="success"
@click="toolbarButtonClickEvent('save')"
>保存</el-button>
<el-button type="success" @click="toolbarButtonClickEvent('save')">保存</el-button>
<el-button type="success" @click="toolbarButtonClickEvent('insert')">添加</el-button>
<el-button
type="danger"
@click="toolbarButtonClickEvent('delete')"
>删除
</el-button>
<el-button type="danger" @click="toolbarButtonClickEvent('delete')">删除</el-button>
</el-form-item>
</el-col>
</el-row>
@ -111,6 +104,7 @@ export default {
queryParam: {
dcCh:'',
dcPl:'',
status:'全部',
},
inParam:{
rqfw:'',
@ -359,7 +353,7 @@ export default {
dwList.forEach(dwxx=>{
if (dwxx.qy===item.qy&&dwxx.dwh===item.dwh){
item.dwxxId=dwxx.id
item.status=1
item.status='设置垛位'
}
})
})
@ -378,7 +372,7 @@ export default {
dwList.forEach(dwxx=>{
if (dwxx.qy===item.qy&&dwxx.dwh===item.dwh){
item.dwxxId=dwxx.id
item.status=1
item.status='设置垛位'
}
})
})

10
src/views/zyjhzx/bfang/comps/BFangSearch.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<div id="bFangSearch" ref="bFangSearchRef">
<ProjectSelect ref="projectSelectRef" clearable :_style="{width:'115px'}"/>
<VxeInput v-model="queryParam.pl" clearable style="width: 110px" placeholder="请输入批量"/>
<VxeInput v-model="queryParam.dcPl" clearable style="width: 110px" placeholder="请输入批量"/>
<VxeButton status="primary" content="查询" @click="search" />
<VxeSelect v-model="plParam.qy" ref="qyRef" clearable :options="qyList" @change="qyChange" style="margin-left: 10px;width: 125px" placeholder="选择区域"/>
<VxeSelect v-model="plParam.dw" ref="dwRef" clearable :options="dwList" style="width: 115px" placeholder="选择垛位"/>
@ -28,7 +28,7 @@ export default {
dw:''
},
queryParam:{
pl:'',
dcPl:'',
}
}
},
@ -37,14 +37,14 @@ export default {
},
methods:{
search(){
this.queryParam.dcch=this.$refs.projectSelectRef.getDcch()
this.queryParam.dcCh=this.$refs.projectSelectRef.getDcch()
EventBus.$emit('bfSearch', this.queryParam)
},
tj(){
EventBus.$emit('bfSave', {})
},
pl(){
this.$message.error('暂不支持自行调整摆放位置')
},
qyChange({value}){
this.dwList=[]

142
src/views/zyjhzx/bfang/comps/BFangShow.vue
Unescape View File

@ -1,55 +1,112 @@
<template>
<div class="viewpdf-box">
<div class="border-out">
<div class="border-inner">
<el-row :gutter="20">
<el-col :span="6" v-for="(item, index) in data" :key="index">
<dv-border-box-12>
<div class="viewpdf-flex" @click="ljShow(item.list)">
<img src="@/assets/KHCFDC_PDF.png" alt="" />
<div class="pdf-title">{{ item.tzbh }}</div>
</div>
</dv-border-box-12>
</el-col>
</el-row>
</div>
</div>
<el-row :gutter="20" style="width: 100%">
<el-col :span="6" v-for="(item, index) in data" :key="index">
<div class="viewpdf-flex">
<div class="click_container" @click="detailShow(item.list)">
<img src="@/assets/KHCFDC_PDF.png" alt="" />
<div class="pdf-title">{{ item.dcCh }}</div>
<div class="pdf-title">{{ item.dcPl }}</div>
<div class="pdf-title">{{ item.qy }}</div>
<div class="pdf-title">{{ item.dwh }}</div>
</div>
<VxeCheckbox class="pdf-check" v-model="item.selected" @change="(checked)=>{checkboxChange(checked,item)}" />
</div>
</el-col>
</el-row>
</div>
</template>
<script>
import {getDmppxxbList} from "@/api/jhzxgl/ypp";
import {getBfwz, getYppyzList} from "@/api/jhzxgl/ypp";
import {EventBus} from "@/event-bus";
import {groupBy} from "@/utils";
import Container from "@/views/zyjhzx/components/Container.vue";
import {ppBGong} from "@/api/zyjh";
import {bgList} from "@/api/sjzx/bzzGL";
export default {
name: "BFangShow",
components: {Container},
data(){
return {
data:[]
zyq:'',
data:[],
dwxx:[],
dataInitParam:{}
}
},
created(list){
EventBus.$emit('bfSearch', list)
created(){
this.zyq=this.$route.query.zyq;
EventBus.$on('bfSave', params => {
this.save()
})
this.ljShow()
},
methods:{
save(){
const saveList=[]
this.data.forEach(item=>{
if(item.selected){
const data={
id:item.id,
dcCh:item.dcCh,
dcPl:item.dcPl,
ljList:[]
}
item.ljList.forEach(lj=>{
const _lj={
id:lj.id,
qq:item.qy,
dw:item.dwh,
ppzt:'02'
}
data.ljList.push(_lj)
})
saveList.push(data)
}
})
ppBGong(saveList).then((res)=>{
this.$message.success('成功')
this.initData()
})
},
detailShow(data){
console.log(data)
},
checkboxChange(checked,item){
console.log(checked,item)
return checked;
},
ljShow(){
this.initDw()
EventBus.$on('bfSearch', params => {
this.initData(params)
this.dataInitParam=params;
this.initData()
})
},
initData(params={dcch:'',pl:''}){
console.log(111)
if(!params.dcch){
initData(){
const params=this.dataInitParam;
if(!params.dcCh){
this.$message.warning('请选择船号')
return;
}
getDmppxxbList(params).then((res) => {
const data=groupBy(res.data,(item)=>{
return item.tlth
params.zyq=this.zyq
bgList(params).then((res) => {
res.data.forEach(item => {
item.selected=false
for (const dw of this.dwxx) {
if (item.dwxxId===dw.id){
item.qy=dw.qy
item.dwh=dw.dwh
}
}
})
console.log(data)
this.data=data
this.data=res.data.filter(item=>item.ljList.length>0)
})
},
initDw(){
getBfwz().then((res)=>{
this.dwxx=res.data
})
}
}
@ -58,28 +115,35 @@ export default {
<style scoped>
.viewpdf-box {
width:81.6%;
width:81%;
position: absolute;
top:78px;
left:344px;
left:18%;
border: none;
margin: 0;
display: flex;
align-items: stretch;
height: calc(100vh - 105px);
.viewpdf-flex {
width: 100%;
border: #00cdff 1px solid;
display: flex;
align-items: center;
font-size: 20px;
color: #fff;
margin-top: 4%;
padding: 20px;
cursor: pointer;
img {
width: 50px;
}
.pdf-title {
margin-left: 10px;
padding: 10px;
.click_container{
width: 85%;
display: flex;
align-items: center;
font-size: 18px;
color: #fff;
cursor: pointer;
img {
width: 50px;
}
.pdf-title {
margin-left: 5px;
}
}
}
}

4
src/views/zyjhzx/bfang/index.vue
Unescape View File

@ -25,8 +25,10 @@ export default {
components: {BFangShow, ZyjhSelectComp, BFangTable, SliaoSearch, BFangSearch},
data(){
return{
width:0,
height:0,
workers:[],
title:'预 配 盘 报 工',
title:' 配 盘 报 工',
zyq:'',
stage:null,
layer:null,

1
src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
Unescape View File

@ -168,7 +168,6 @@ export default {
}
},
baogong(tmpArr,data){
console.log(312)
let ycldwInfo=null
for (const dw of this.dw) {
for (const info of dw.list) {

Write Preview
Loading…
Cancel
Save