root/xiMenZi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

操作屏增加需求

Browse Source
This commit is contained in:
caill
2025-01-13 09:54:04 +08:00
parent 8506ec5a04
commit 4ad6da1879
5 changed files with 490 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
lms/nladmin-ui/src/views/wms/produceScreen/index.vue
View File

@@ -11,16 +11,17 @@
<p class="point_value">{{ e.device_code }}</p>
<div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">呼叫空框</div>
<div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">完成入库</div>
<div v-if="e.type === '0'" class="button" @click="showPop('PALLET', e)">当前托盘</div>
<div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
</div>
</div>
<div v-show="type === 'IN'" class="pop-wraper pop-wraper-2" :class="{'popshow': show, 'pophide': !show}">
<div class="pop-grid">
<el-row type="flex" justify="space-between">
<el-col :span="13">
<div class="zd-row pop-grid">
<div class="pop-grid_l">
<div class="pop-grid_t">
<el-table
:data="popList"
style="width: 100%; padding-right: 10px"
height="100%"
@current-change="handleCurrentChange"
>
<el-table-column
@@ -48,11 +49,11 @@
label="优先级"
/>
</el-table>
</el-col>
<el-col :span="11">
</div>
<div class="pop-grid_t">
<el-table
:data="popSecList"
style="width: 100%"
height="100%"
>
<el-table-column
prop="order_code"
@@ -79,8 +80,12 @@
label="优先级"
/>
</el-table>
</el-col>
</el-row>
</div>
</div>
<div class="pop-grid_r">
<img v-if="imgSrc !== ''" :src="imgSrc" alt="">
<!-- <img class="img_pallet" src="../../../assets/images/screen_bg.jpg" alt=""> -->
</div>
</div>
<el-row type="flex" justify="space-around">
<el-col :span="4">
@@ -93,11 +98,11 @@
</div>
<div v-show="type === 'CONTAINER'" class="pop-wraper pop-wraper-1" :class="{'popshow': show, 'pophide': !show}">
<div class="pop-h1">{{ popData.title }}</div>
<div class="pop-grid">
<div class="filter-items">
<el-row class="filter-wraper" type="flex" justify="space-between">
<el-col :span="5" class="p-label">托盘类型</el-col>
<el-col :span="18" class="select-wraper">
<el-select v-model="value" placeholder="请选择">
<el-select v-model="value" :popper-append-to-body="false" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
@@ -141,7 +146,7 @@
<div class="pop-grid pop-grid_1">
<el-table
:data="popList"
style="width: 100%"
height="100%"
>
<el-table-column
label="订单号"
@@ -200,34 +205,83 @@
</el-row>
</div>
<div v-show="type === 'BACK'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
<div class="pop-grid">
<el-table
:data="popList"
style="width: 100%"
>
<el-table-column
prop="order_code"
label="订单号"
/>
<el-table-column
label="数量"
<div class="zd-row pop-grid">
<div class="pop-grid_r">
<img v-if="imgSrc !== ''" :src="imgSrc" alt="">
</div>
<div class="pop-grid_l">
<el-table
:data="popList"
height="100%"
>
<template slot-scope="scope">
<input v-model="scope.row.material_qty" type="number" class="set-input">
</template>
</el-table-column>
</el-table>
<el-table-column
prop="order_code"
label="订单号"
/>
<el-table-column
prop="material_code"
label="零件号"
/>
<el-table-column
label="数量"
>
<template slot-scope="scope">
<input v-model="scope.row.material_qty" type="number" class="set-input">
</template>
</el-table-column>
</el-table>
</div>
</div>
<el-row type="flex" justify="space-around">
<el-col :span="4">
<button class="login_button login_button_dis" @click="show = false">取消</button>
</el-col>
<el-col :span="4">
<button class="login_button" :disabled="disabled" @click="toSure">确定</button>
<button class="login_button" @click="toSure">确定</button>
</el-col>
</el-row>
</div>
<div v-show="type === 'PALLET'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
<div class="zd-row pop-grid">
<div class="pop-grid_l">
<img v-if="imgSrc !== ''" :src="imgSrc" alt="">
</div>
<div class="pop-grid_r">
<el-table
:data="popList"
height="100%"
@current-change="handleCurrentChange1"
>
<el-table-column
prop="vehicle_path"
label="图纸查看"
/>
</el-table>
</div>
</div>
<el-row type="flex" justify="space-around">
<el-col :span="4">
<button class="login_button login_button_dis" @click="show = false">取消</button>
</el-col>
<el-col :span="4">
<button class="login_button" @click="toSure">确定</button>
</el-col>
</el-row>
</div>
<div v-show="show" class="modal" />
<div v-show="alertShow" class="pop-wraper pop-wraper-1" :class="{'popshow': alertShow, 'pophide': !alertShow}" style="z-index: 22;">
<div class="pop-h1">提示</div>
<div class="filter-items"><p class="p-text">是否确认回库？</p></div>
<el-row type="flex" justify="space-around">
<el-col :span="6">
<button class="login_button login_button_dis" @click="alertShow = false">取消</button>
</el-col>
<el-col :span="6">
<button class="login_button" @click="toSure1">确定</button>
</el-col>
</el-row>
</div>
<div v-show="alertShow" class="modal" style="z-index: 21;" />
</div>
</template>
@@ -250,7 +304,9 @@ export default {
value2: '',
options2: [],
vcode: '',
disabled: false
disabled: false,
imgSrc: '',
alertShow: false
}
},
computed: {
@@ -274,6 +330,7 @@ export default {
})
},
showPop(type, e) {
this.imgSrc = ''
this.popData = {}
this.popList = []
this.popSecList = []
@@ -315,16 +372,25 @@ export default {
const arr = []
arr.push(this.popData.device_code)
crudProduceScreen.fabOrders({ deviceCodes: arr }).then(res => {
this.popList = [...res]
this.imgSrc = res.path
this.popList = [...res.material]
this.popList.map(el => {
this.$set(el, 'material_qty', 0)
})
this.show = true
})
} else if (type === 'PALLET') {
crudProduceScreen.getPointVehicle({ device_code: this.popData.device_code }).then(res => {
crudProduceScreen.fabMaterial({ vehicle_code: res }).then(res => {
this.popList = [...res]
})
})
this.show = true
}
},
handleCurrentChange(val) {
this.currentRow = val
this.imgSrc = val.vehicle_path
crudProduceScreen.fabMaterial({ vehicle_code: this.currentRow.vehicle_code }).then(res => {
this.popSecList = [...res]
})
@@ -378,19 +444,27 @@ export default {
this.disabled = false
})
} else if (this.type === 'BACK') {
crudProduceScreen.sendVehicle({ mater: this.popList, device_code: this.popData.device_code }).then(res => {
this.$message(res.msg)
}).catch(() => {
this.disabled = false
})
this.disabled = false
this.alertShow = true
return
}
this.show = false
},
toSure1() {
this.alertShow = false
this.show = false
crudProduceScreen.sendVehicle({ mater: this.popList, device_code: this.popData.device_code }).then(res => {
this.$message(res.msg)
}).catch(() => {})
},
addRow(index, rows) {
rows.splice(index, 0, { order_code: '', material_qty: '', material_code: '' })
},
delRow(index, rows) {
rows.splice(index, 1)
},
handleCurrentChange1(val) {
this.imgSrc = val.vehicle_path
}
}
}
@@ -398,4 +472,11 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped>
@import './style.scss';
>>>.el-message-box {
background: rgba(45,88,184,0.1);
border: 1px solid #4980BD;
}
.custom-message-box {
background-color: #f56c6c;
}
</style>

919
lms/nladmin-ui/src/views/wms/produceScreen/index_back.vue
View File

File diff suppressed because it is too large Load Diff

19
lms/nladmin-ui/src/views/wms/produceScreen/mork.js
View File

@@ -30,7 +30,7 @@ export function deviceInLogin() {
// 4.根据工序查询订单
export function regionOrder(code) {
const res = {
content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11', vehicle_path: 'http://127.0.0.1:5500/src/assets/images/screen_bg.jpg.preview' }, { order_code: '1', vehicle_path: 'http://127.0.0.1:5500/src/assets/images/screen_bg.jpg.preview' }, { order_code: '2' }, { order_code: '3' }, { order_code: '4' }, { order_code: '5' }, { order_code: '6' }, { order_code: '7' }, { order_code: '8' }, { order_code: '9' }]
}
return new Promise((resolve, reject) => {
resolve(res)
@@ -39,11 +39,9 @@ export function regionOrder(code) {
// 5.查询载具物料信息
export function fabMaterial() {
const res = {
content: [
{ order_code: '111-02', material_qty: '' }
]
}
const res = [
{ order_code: '111-02', material_qty: '', vehicle_path: 'http://127.0.0.1:5500/src/assets/images/screen_bg.jpg.preview' }
]
return new Promise((resolve, reject) => {
resolve(res)
})
@@ -69,9 +67,12 @@ export function callEmp(data) {
// 8.查询订单号
export function fabOrders() {
const res = [
{ order_code: '111-02' }
]
const res = {
path: '',
material: [
{ order_code: '111-02', material_code: 'dljflfj' }
]
}
return new Promise((resolve, reject) => {
resolve(res)
})

2
lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
View File

@@ -20,7 +20,7 @@
<el-row class="filter-wraper" type="flex" justify="space-between">
<el-col :span="5" class="p-label">设备</el-col>
<el-col :span="18" class="select-wraper">
<el-select v-model="value" placeholder="请选择">
<el-select v-model="value" :popper-append-to-body="false" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.device_code"

63
lms/nladmin-ui/src/views/wms/produceScreen/style.scss
View File

@@ -1,3 +1,7 @@
.zd-row {
display: flex;
justify-content: space-between;
}
.container {
display: flex;
flex-direction: column;
@@ -103,10 +107,22 @@
line-height: 40px;
height: 40px;
}
.el-select-dropdown__item {
font-size: 18px;
line-height: 40px;
height: 40px;
::v-deep {
.el-select-dropdown {
position: absolute !important;
background-color: rgba(7,31,62,0.95);
border: 1px solid #4980BD;
}
.el-select-dropdown__item {
font-size: 18px;
line-height: 40px;
height: 40px;
color: #fff;
}
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
color: #3CC1FF;
background-color: rgba(7,31,62,0.95) !important;
}
}
>>>.el-checkbox__inner {
width: 40px;
@@ -165,6 +181,9 @@
>>>.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
background-color: rgba(122,159,224,0.5)
}
>>>.el-table__empty-block {
background-color: #071F3E;
}
.login_button {
width: 100%;
font-size: 22px;
@@ -273,7 +292,7 @@
.pop-wraper-2 {
left: 3%;
width: 94%;
padding: 2% 1.5% 3% 1.5%;
padding: 2% 2% 3% 2%;
}
.popshow {
transform: translateY(-50%);
@@ -302,16 +321,40 @@
-webkit-text-fill-color: transparent;
}
.pop-grid {
height: calc(100% - 112px);
margin-bottom: 60px;
overflow: auto;
height: calc(100% - 82px);
margin-bottom: 30px;
}
.pop-grid_1 {
height: calc(100% - 172px);
height: calc(100% - 142px);
}
.pop-grid_l {
width: 60%;
height: 100%;
}
.pop-grid_r {
width: 39%;
height: 100%;
overflow-y: auto;
}
.pop-grid_t {
height: 50%;
}
.img_pallet {
width: 100%;
height: auto;
}
.filter-items {
height: calc(100% - 112px);
margin-bottom: 60px;
}
.filter-wraper {
margin-bottom: 20px;
}
.p-text {
font-size: 24px;
line-height: 40px;
color: #fff;
}
.p-label {
font-size: 18px;
line-height: 40px;
@@ -332,4 +375,4 @@
padding: 0 30px 0 15px;
background: rgba(45,88,184,0.25);
border: 1px solid #21D0F2;
}
}