From ef4e46f182aee6253805e66286dee847c573cbde Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 22 五月 2024 17:18:34 +0800
Subject: [PATCH] 完成原材料、产品检验、过程检，包装检键盘切换输入框
---
src/views/warehouse/pallettransports/index.vue | 88 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 18 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 80c83f1..681e61a 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -9,6 +9,18 @@
<template #toolbar>
<el-button v-if="permissions.warehouse_pallettransports_add" type="primary"
@click="addOrUpdateHandle()">鏂板</el-button>
+ <el-dropdown style="margin-left: 20px;" @command="handleCommand">
+ <el-button >
+ 鐘舵�佸彉鏇�<i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item :key="index"
+ :command="item.label"
+ v-for="(item,index) in taskTypeArr"
+ >{{ item.label }}</el-dropdown-item
+ >
+ </el-dropdown-menu>
+ </el-dropdown>
</template>
</ttable>
@@ -113,7 +125,7 @@
<!-- <el-button type="warning" v-if="permissions.warehouse_pallettransports_detail_library" round
@click="openDetailLocationDialog">涓�閿嚦搴撲綅</el-button> -->
<el-button type="success" v-if="permissions.warehouse_pallettransports_detail_execute" round
- @click="executeMove">鎵� 琛�</el-button>
+ @click="updateStockFun">鎵� 琛�</el-button>
</div>
</div>
<div>
@@ -136,7 +148,7 @@
<el-table-column prop="transfer_quantity" label="绉诲簱鏁伴噺" align="center">
<template slot-scope="scope">
- <el-input v-model="scope.row.transfer_quantity" border="none"></el-input>
+ <el-input v-model="scope.row.transfer_quantity" @change="moveLocation(scope.row)" :disabled = "scope.row.state == '02submitted' " border="none"></el-input>
</template>
</el-table-column>
@@ -191,6 +203,7 @@
<!-- 寮圭獥, 鏄庣粏鐨処FS搴撲綅鍒楄〃 -->
<detailIfsLocationDialog :currshowlist.sync="showDetailLocation" :detailList="detailList"
@refreshDataList="selectDetailLocationCallback" />
+
</basic-container>
</div>
</template>
@@ -206,6 +219,8 @@
delPalletTransportsDetailObj,
executeMoveLocation,
selectAll,
+ updateStock,
+ updataStatus,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -221,6 +236,13 @@
export default {
data() {
return {
+ taskTypeArr: [
+ {label:"鑽夌"},
+ {label:"杩涜涓�"},
+ {label:"宸插畬鎴�"},
+ ],
+ command:"",
+ forbidden:false,
partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
@@ -360,13 +382,6 @@
...mapGetters(['permissions'])
},
watch:{
- // palletTransportsMaterialMultipleSelection(newVal){
- // if(newVal.length>0){
- // this.palletTransportsMaterialSelectionChange(newVal)
- // }else{
- // this.palletTransportsDetailData = []
- // }
- // }
},
created() {
if(this.permissions.warehouse_pallettransports_edit){
@@ -393,7 +408,6 @@
palletTransportsMaterialSelectionChange() {
if(this.cid){
selectAll({transportsId:this.cid}).then((res)=>{
- console.log(res.data.data);
this.palletTransportsDetailData = res.data.data.map(el =>{
return{
part_no:el.partNo,
@@ -407,9 +421,7 @@
}
})
- })
-
- }
+ })}
// this.palletTransportsMaterialMultipleSelection = val
// if(val && val.length>0){
// let ids =[]
@@ -430,9 +442,28 @@
// }
// }
},
+ //鐘舵��
+ handleCommand(event){
+ let str = ""
+ console.log(event);
+ if (event == "鑽夌") {
+ str = "draft"
+ }else if (event == "杩涜涓�") {
+ str = "processing"
+ }else{
+ str = "finished"
+ }
+
+ if (this.cid) {
+ updataStatus({id:this.cid,state:str}).then((res) =>{
+ this.$refs.pallettransportsTable.getDataList()
+ })
+ }else{
+ this.$message.error('璇烽�夋嫨' + str + '鐨勫璞�')
+ }
+ },
// 鍗曡閫変腑
handleCurrentChange(row) {
- console.log(row,"--->1");
this.palletTransportsMaterialMultipleSelection = row
// this.palletTransportsMaterialData.forEach((item) => {
// // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
@@ -644,12 +675,11 @@
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
let transportsDetails =[]
- console.log(this.palletTransportsMaterialMultipleSelection,"----+");
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
partNo:el.partNo,
partDesc: el.partDesc,
- transferQuantity: el.surplusQuantity,
+ transferQuantity: 0,
toIfsLocationNo:el.toIfsLocationNo,
toIfsLocationName: el.toIfsLocationName,
transportsId: el.transportsId,
@@ -674,6 +704,7 @@
ele.surplusQuantity = 0
}
})
+ this.getPalletTransportsMaterialData()
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
@@ -744,6 +775,28 @@
}
})
},
+ //鏀瑰彉
+ moveLocation(val){
+ let num = Number(val.transfer_quantity)
+ this.palletTransportsDetailMultipleSelection.forEach(el =>{
+ el.transfer_quantity = num
+ })
+ },
+ updateStockFun(){
+ let data = []
+ data = this.palletTransportsDetailMultipleSelection.map(el =>{
+ return {
+ id:el.id,
+ transferQuantity:el.transfer_quantity
+ }
+ })
+ updateStock(data).then((res) =>{
+ if(res.data.code===0){
+ this.getPalletTransportsMaterialData()
+ this.executeMove()
+ }
+ })
+ },
// 鎵ц绉诲簱
executeMove() {
if (
@@ -758,7 +811,6 @@
flag = false
}
})
- console.log("-----------",flag,ids);
if (flag) {
executeMoveLocation(ids).then((response) => {
const resData = response.data
@@ -782,6 +834,7 @@
} else {
this.$message.error('璇烽�夋嫨绉诲簱鏄庣粏')
}
+
},
selectDetailLocationCallback() {
this.getPalletTransportsDetailData()
@@ -792,7 +845,6 @@
this.showDetailStock = true
},
palletTransportsDetailSelectionChange(val) {
- console.log(val,"-=-=-=");
this.palletTransportsDetailMultipleSelection = val
},
getOptasks() {
--
Gitblit v1.9.3