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 | 62 +++++++++++++++++++++++++++++-- src/api/warehouse/pallettransports.js | 15 ++++++- 2 files changed, 70 insertions(+), 7 deletions(-) diff --git a/src/api/warehouse/pallettransports.js b/src/api/warehouse/pallettransports.js index 68e7295..15b17cf 100644 --- a/src/api/warehouse/pallettransports.js +++ b/src/api/warehouse/pallettransports.js @@ -17,18 +17,27 @@ }) } //绉诲簱鏀瑰彉 +export function updataStatus(obj) { + return request({ + url: '/mes/palletTransports/'+ obj.id, + method: 'post', + params: obj + }) +} + +//鐘舵�佹敼鍙� export function updateStock(obj) { return request({ url: '/mes/palletTransportsMaterial/updateStock', method: 'post', - data: obj }) } -export function getPalletTransportsObj(id) { +export function getPalletTransportsObj(obj) { return request({ url: '/mes/palletTransports/' + id, - method: 'get' + method: 'get', + data: obj }) } diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue index e40e69e..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> @@ -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){ @@ -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) => { // // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄� -- Gitblit v1.9.3