From 39607cc49e13f4d69d2d1ddf69f8e769eea714bc Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 29 十二月 2023 16:50:57 +0800
Subject: [PATCH] modified: src/api/warehouse/pallettransports.js modified: src/views/warehouse/pallettransports/index.vue
---
src/views/warehouse/pallettransports/index.vue | 98 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 152aa20..bcdbd21 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>
@@ -191,6 +203,7 @@
<!-- 寮圭獥, 鏄庣粏鐨処FS搴撲綅鍒楄〃 -->
<detailIfsLocationDialog :currshowlist.sync="showDetailLocation" :detailList="detailList"
@refreshDataList="selectDetailLocationCallback" />
+
</basic-container>
</div>
</template>
@@ -207,6 +220,7 @@
executeMoveLocation,
selectAll,
updateStock,
+ updataStatus,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -222,6 +236,12 @@
export default {
data() {
return {
+ taskTypeArr: [
+ {label:"鑽夌"},
+ {label:"杩涜涓�"},
+ {label:"宸插畬鎴�"},
+ ],
+ command:"",
forbidden:false,
partDesc: null,
ajaxFun: palletTransportsFetchList,
@@ -369,6 +389,23 @@
// this.palletTransportsDetailData = []
// }
// }
+ // palletTransportsChange(val){
+ // console.log("=====");
+ // if(val){
+ // console.log(val);
+ // console.log(this.command,"11111")
+ // }else{
+ // console.log("--");
+ // }
+ // }
+ command: {
+ handler(newVal) {
+ if (newVal != '') {
+ // 褰� aa 涓虹┖瀛楃涓叉椂瑙﹀彂鐨勬搷浣�
+ console.log('aa is now empty');
+ }
+ },
+ }
},
created() {
if(this.permissions.warehouse_pallettransports_edit){
@@ -401,7 +438,7 @@
part_no:el.partNo,
part_desc:el.partDesc,
operation_task_no:el.operationTaskNo,
- transfer_quantity:0,
+ transfer_quantity:el.transferQuantity,
unit:el.unit,
to_ifs_location_no:el.toIfsLocationName,
state:el.state,
@@ -409,9 +446,7 @@
}
})
- })
-
- }
+ })}
// this.palletTransportsMaterialMultipleSelection = val
// if(val && val.length>0){
// let ids =[]
@@ -432,9 +467,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) => {
// // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
@@ -651,7 +705,7 @@
return{
partNo:el.partNo,
partDesc: el.partDesc,
- transferQuantity: el.surplusQuantity,
+ transferQuantity: 0,
toIfsLocationNo:el.toIfsLocationNo,
toIfsLocationName: el.toIfsLocationName,
transportsId: el.transportsId,
@@ -676,6 +730,7 @@
ele.surplusQuantity = 0
}
})
+ this.getPalletTransportsMaterialData()
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
@@ -750,14 +805,27 @@
moveLocation(val){
console.log(val,"---->");
let num = Number(val.transfer_quantity)
- if (val.state !="02submitted") {
- updateStock({id:val.id,transferQuantity:num}).then((res) =>{
- console.log(res,"------>1");
- this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailMultipleSelection.forEach(el =>{
+ console.log(el.transfer_quantity);
+ el.transfer_quantity = num
})
- }else{
- this.$message.error('绉诲簱宸茬粡鎵ц')
- }
+ console.log(this.palletTransportsDetailMultipleSelection,"--->123");
+
+ },
+ 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() {
@@ -773,7 +841,6 @@
flag = false
}
})
- console.log("-----------",flag,ids);
if (flag) {
executeMoveLocation(ids).then((response) => {
const resData = response.data
@@ -797,6 +864,7 @@
} else {
this.$message.error('璇烽�夋嫨绉诲簱鏄庣粏')
}
+
},
selectDetailLocationCallback() {
this.getPalletTransportsDetailData()
--
Gitblit v1.9.3