From 828641ce9d4178bbff9030ad19ce93d0267f185c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 17 九月 2025 08:36:42 +0800
Subject: [PATCH] no message
---
construction-data/src/components/datav/index.vue | 126 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 58 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index 0ac35a5..e617d85 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -45,25 +45,7 @@
<el-table :data="orders" v-if="orders.length > 0" class="order-table">
<el-table-column v-for="(item, dex) in Object.keys(orderStatus)" :prop="item" :label="orderStatus[item]" :key="dex" >
<template slot-scope="scope">
- <el-popover
- placement="right"
- trigger="manual"
- class="popover-order"
- v-model="visible"
- v-if="item === 'action'" >
- <template>
- <div>
- <span>閫夋嫨鐩爣鍙戣揣鍖�</span>
- <el-divider/>
- <el-row :gutter="15">
- <el-col v-for="(palt, index) in platforms" :key="index" :span="7" @click.native="bindShipping(palt, scope)">
- <div class="platform" >{{palt.platformNo}}</div>
- </el-col>
- </el-row>
- </div>
- </template>
- <el-button slot="reference" type="text" @click.native.prevent="print(scope.$index, orders)" class="btnPrint">鎵撳嵃鏄庣粏</el-button>
- </el-popover>
+ <el-button slot="reference" type="text" @click.native.prevent="print(scope.$index, orders)" class="btnPrint" v-if="item === 'action'" >鎵撳嵃鏄庣粏</el-button>
<div v-else class="ship-order-list">
{{scope.row[item]}}
</div>
@@ -71,20 +53,37 @@
</el-table-column>
</el-table>
<el-empty description="鏆傛棤鎶曟斁璁㈠崟" class="empty-padding" v-else></el-empty>
+ <el-popover
+ placement="right"
+ trigger="manual"
+ class="popover-order"
+ v-model="visible">
+ <template>
+ <div>
+ <span>閫夋嫨鐩爣鍙戣揣鍖�</span>
+ <el-divider/>
+ <el-row :gutter="15">
+ <el-col v-for="(palt, index) in platforms" :key="index" :span="7" @click.native="bindShipping(palt)">
+ <div class="platform" >{{palt.platformNo}}</div>
+ </el-col>
+ </el-row>
+ </div>
+ </template>
+ </el-popover>
</dv-border-box-11>
</el-row>
<el-row type="flex" align="center" id="datav">
<dv-border-box-11 title="鎾澧�" class="pick-wall" >
- <el-row type="flex" align="center" justify="center" class="pick-wall-circle" >
- <el-col :span="1">
- <p class="pick-wall-tip"></p>
- </el-col>
- <el-col :span="22">
- <p>缁胯壊锛氫换鍔″凡瀹屾垚 榛勮壊锛氱瓑寰呬腑 绾㈣壊锛氭挱绉嶄腑</p>
- </el-col>
- </el-row>
+<!-- <el-row type="flex" align="center" justify="center" class="pick-wall-circle" >-->
+<!-- <el-col :span="1">-->
+<!-- <p class="pick-wall-tip"></p>-->
+<!-- </el-col>-->
+<!-- <el-col :span="22">-->
+<!-- <p>缁胯壊锛氫换鍔″凡瀹屾垚 榛勮壊锛氱瓑寰呬腑 绾㈣壊锛氭挱绉嶄腑</p>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
<div class="pick-wall-box">
- <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" @click.native="lightClick(item)">
+ <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" >
<div class="seed-bracket" :style="getLightStatus(item)" />
</el-col>
</div>
@@ -104,7 +103,7 @@
<el-row>
<el-col class="header-title">澶嶆牳褰撳墠浣滀笟涓暟閲�</el-col>
<el-col style="text-align: center">
- <el-col :span="10" class="content">鎬婚渶姹傛暟閲忥細</el-col>
+ <el-col :span="10" class="content">闇�姹傛暟閲忥細</el-col>
<el-col :span="8" class="content-value">{{ selected.anfme }}</el-col>
</el-col>
<el-col>
@@ -118,7 +117,7 @@
<el-col>
<div class="header-title">鎷ｈ揣鏁伴噺锛�</div>
<dv-border-box-10 class="box">
- <el-input type="text" v-model="workQty"></el-input>
+ <el-input type="text" v-model="selected.revQty" disabled></el-input>
</dv-border-box-10>
</el-col>
</el-row>
@@ -189,13 +188,12 @@
}
},
created () {
- //鑾峰彇褰撳墠鎵ц浠诲姟
- this.getWaves()
- //鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭�
- this.getSeedLoc()
- //鑾峰彇鎵�鏈夊彂璐ф殏瀛樺尯
- this.getAllPlatforms()
+ let that = this
+ setInterval(() => {
+ that.refreshData()
+ }, 10000)
},
+
computed: {
getLightStatus() {
return (item)=> {
@@ -205,9 +203,20 @@
return 'background: gainsboro;'
}
}
+ },
+ getWorkQty() {
+ return this.selected.anfme - this.selected.workQty
}
},
methods: {
+ refreshData() {
+ //鑾峰彇褰撳墠鎵ц浠诲姟
+ this.getWaves()
+ //鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭�
+ this.getSeedLoc()
+ //鑾峰彇鎵�鏈夊彂璐ф殏瀛樺尯
+ this.getAllPlatforms()
+ },
printPage() {
// let element = document.querySelector('#datav');
// let el = this.$refs.datav
@@ -235,9 +244,9 @@
this.slapLight(item)
},
//璁㈠崟鍏ュ簱闆嗚揣鍖�,骞舵墦鍗板崟鎹�
- bindShipping(plat, item) {
+ bindShipping(plat) {
this.visible = false
- let order = item.row
+ let order = this.selectOrder
if (order == null) {
this.$message.error("褰撳墠璁㈠崟淇℃伅涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳锛侊紒")
return
@@ -246,6 +255,7 @@
// eslint-disable-next-line no-undef
$ajax.post('/api/bind/shipping/platform', {orderId: order.id, waveId: order.waveId, platformId: plat.id}).then(response => {
if (response.code === 200) {
+ that.refreshData()
//闅愯棌鍙戣揣鍖�,鎵ц鎵撳嵃
} else {
this.$message.error(response.msg)
@@ -322,7 +332,7 @@
for (let i = 0; i < this.mergeTaskDetl.length; i++) {
if (this.mergeTaskDetl[i].matnr === this.selected.matnr && this.workQty > this.mergeTaskDetl[i].anfme) {
this.$message({
- message: '鎷ｈ揣鏁伴噺涓嶈兘澶т簬浠诲姟鏁伴噺锛侊紒',
+ message: '鎷ｈ揣鏁伴噺搴旂瓑浜庝换鍔℃暟閲忥紒锛�',
type: 'error'
})
return
@@ -331,7 +341,7 @@
//闅愯棌寮规
this.show = false
// eslint-disable-next-line no-undef
- $ajax.post('wave/sow/review', { waveSeedId: this.selected.id, reviewNum: this.workQty }).then(response => {
+ $ajax.post('wave/sow/review', { waveSeedId: this.selected.id, reviewNum: this.selected.revQty }).then(response => {
if (response.code === 200) {
this.getWaves()
} else {
@@ -399,7 +409,7 @@
getTaskDetl (data) {
let that = this
// eslint-disable-next-line no-undef
- $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr }).then(response => {
+ $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr, waveNo: data.waveNo }).then(response => {
if (response.code === 200) {
that.taskDetls = []
// this.show = false
@@ -412,8 +422,6 @@
</script>
<style lang="less">
-
-
@media screen and (max-width: 1920px){
#data-view {
width: 100%;
@@ -433,14 +441,10 @@
margin: 5px 0;
}
-
-
.pick-order-detl {
padding: 0 15px;
-
.detl-box-border {
- height: 59vh;
-
+ height: 45vh;
.detl-box-padding {
height: 65px
}
@@ -451,10 +455,8 @@
text-align: center;
color: white;
margin: 20vh;
-
.container {
padding: 45px 60px;
-
.btn {
width: 30vh;height: 7vh;font-size: 23px;
}
@@ -484,7 +486,7 @@
.pick-wall {
padding: 60px 10px 10px 10px;
- height: 68vh;
+ height: 47vh;
.pick-wall-box {
.seed-bracket {
@@ -504,6 +506,10 @@
width: 1px;
background: #03d3ec;
border-left: 5px solid #50bfff
+ }
+
+ span {
+ margin: 2px;
}
}
}
@@ -547,7 +553,7 @@
.order-box-row {
width: 84vh;
- height: 38vh;
+ height: 33vh;
.order-box {
padding:0px 30px;
@@ -556,6 +562,8 @@
width: 74vh;
padding-top: 65px;
height: 275px;
+ overflow: hidden;
+ overflow-y: auto;
.popover-order {
width: 300px;
@@ -571,22 +579,22 @@
}
}
-
-
-
.ship-order-list {
font-size: 18px; color: white;
}
}
}
.empty-padding {
- padding-top: 65px;
+ padding-top: 105px;
+ .el-empty__image {
+ height: 100px;
+ }
}
}
.order-detl-list {
overflow: hidden;
overflow-y: scroll;
- height: 43vh;
+ height: 38vh;
padding: 0 15px;
}
@@ -641,7 +649,7 @@
}
.table-matnr {
- height: 26vh;
+ height: 16vh;
}
.el-table {
@@ -748,6 +756,8 @@
width: 74vh;
padding-top: 65px;
height: 275px;
+ overflow: hidden;
+ overflow-y: auto;
.btnPrint {
font-size: 9px;
--
Gitblit v1.9.1