From 5d0f7a5aa4ee994782f3f3bcc66e23653a6ac40a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 七月 2024 10:07:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 167 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 127 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index ab59e9f..8c3d4a9 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -38,7 +38,7 @@
<span>璁惧璋冭瘯</span>
</div>
<div>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
+ <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline" v-if="rgvMode !== 2 && rgvMode !== 1 ">
<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
<!-- </el-form-item>-->
@@ -53,43 +53,74 @@
</el-form-item>
</el-form>
+ <div v-if="rgvMode === 2 ">
+ <el-form :model="formParamD" label-position="top" :inline="true" class="demo-form-inline">
+ <el-form-item label="璧峰绔�">
+ <el-input v-model="formParamD.sourceRow" placeholder="璧峰绔�"></el-input>
+ </el-form-item>
+ <el-form-item label="鐩爣绔�">
+ <el-input v-model="formParamD.sourceBay" placeholder="鐩爣绔�"></el-input>
+ </el-form-item>
+ <el-form-item label="鍚姩">
+ <el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
+ <el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
+ <el-button @click="initiateD(3)" type="warning">X绉诲姩</el-button>
+ <el-button @click="initiateD(4)" type="warning">鎼繍</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div v-if="demo === 'N' ">
+ <el-button v-if="rgvMode === 0 " type="danger">鏈煡</el-button>
+ <el-button v-if="rgvMode === -1 " type="danger">鏈煡</el-button>
+ <el-button v-if="rgvMode === 3 " type="primary">鑱旀満</el-button>
+ <el-button v-if="rgvMode === 2 " type="primary">鍗曟満</el-button>
+ <el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
+ </div>
+ <div v-if="demo === 'N' ">
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
+ <el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
+ <el-button v-if="rgvMode !== 1 " @click="rgvStatus(12)" type="warning">鎵嬪姩</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button @click="rgvStatus(8)" type="primary">鍚姩</el-button>
+ <el-button @click="rgvStatus(9)" type="primary">鍋滄</el-button>
+ <el-button @click="rgvStatus(11)" type="primary">澶嶄綅鎸夐挳</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
+ <el-button v-if="rgvMode === 1 " @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
+ <el-button v-if="rgvMode === 3 " @click="rgvStatus(17)" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
+ <el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
+ <el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
+ <el-button @click="rgvStatus(18)" type="danger">娓呴櫎浠诲姟</el-button>
+ </div>
+ </div>
<div>
- <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
- <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
- </div>
- <div style="margin: 10px auto 10px auto">
- <el-button v-if="demo === 'N' " @click="rgvStatus(8)" type="primary">鍚姩</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(9)" type="primary">鍋滄</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(11)" type="primary">澶嶄綅鎸夐挳</el-button>
- </div>
- <div style="margin: 10px auto 10px auto">
- <el-button v-if="demo === 'N' " @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(12)" type="warning">鎵嬪姩</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
- </div>
- <div style="margin: 10px auto 10px auto">
- <el-button v-if="demo === 'N' " :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
- <el-button v-if="demo === 'N' " @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
- <el-button @click="staTova(2,3)" type="warning">杈撻��-缃崲2</el-button>
- <el-button @click="staTova(2,5)" type="warning">杈撻��-缃崲3</el-button>
- <el-button @click="staTova(2,7)" type="warning">杈撻��-缃崲4</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,4)" type="warning">杈撻��-鐏岃1</el-button>
- <el-button @click="staTova(2,6)" type="warning">杈撻��-鐏岃2</el-button>
- <el-button @click="staTova(2,8)" type="warning">杈撻��-鐏岃3</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(1,10)" type="warning">缃崲1-鏀捐揣</el-button>
- <el-button @click="staTova(2,10)" type="warning">缃崲2-鏀捐揣</el-button>
- <el-button @click="staTova(3,10)" type="warning">缃崲3-鏀捐揣</el-button>
- <el-button @click="staTova(4,10)" type="warning">缃崲4-鏀捐揣</el-button>
+ <div style="margin: 10px auto 10px auto">
+ <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
+ <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
+ </div>
+ <div style="margin-top: 5px" v-if="demo === 'Y'">
+ <el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
+ <el-button @click="staTova(2,3)" type="warning">杈撻��-缃崲2</el-button>
+ <el-button @click="staTova(2,5)" type="warning">杈撻��-缃崲3</el-button>
+ <el-button @click="staTova(2,7)" type="warning">杈撻��-缃崲4</el-button>
+ </div>
+ <div style="margin-top: 5px" v-if="demo === 'Y'">
+ <el-button @click="staTova(2,4)" type="warning">杈撻��-鐏岃1</el-button>
+ <el-button @click="staTova(2,6)" type="warning">杈撻��-鐏岃2</el-button>
+ <el-button @click="staTova(2,8)" type="warning">杈撻��-鐏岃3</el-button>
+ </div>
+ <div style="margin-top: 5px" v-if="demo === 'Y'">
+ <el-button @click="staTova(1,10)" type="warning">缃崲1-鏀捐揣</el-button>
+ <el-button @click="staTova(2,10)" type="warning">缃崲2-鏀捐揣</el-button>
+ <el-button @click="staTova(3,10)" type="warning">缃崲3-鏀捐揣</el-button>
+ <el-button @click="staTova(4,10)" type="warning">缃崲4-鏀捐揣</el-button>
+ </div>
</div>
</div>
</el-card>
@@ -159,6 +190,20 @@
barcodeType:null,
emptyContainer:null
},
+ formParamD: {
+ rgvNo: 1,
+ sourceStaNo: null,
+ sourceRow: 1,
+ sourceBay: 0,
+ sourceLev: 1,
+ staNo: null,
+ row: 1,
+ bay: 0,
+ lev: 1,
+ barcode:null,
+ barcodeType:null,
+ emptyContainer:null
+ },
enableIn: false,
enableOut: false,
options:[
@@ -171,7 +216,8 @@
label:'鍚�'
}
],
- demo: 'X'
+ demo: 'X',
+ rgvMode: 0
},
created() {
this.init()
@@ -260,8 +306,9 @@
contentType: 'application/json;charset=UTF-8',
method: 'get',
success: function (res) {
- that.demo = res.msg
-
+ // console.log(res)
+ that.demo = res.data.demo
+ that.rgvMode = res.data.rgvMode
}
});
},
@@ -295,6 +342,46 @@
});
})
},
+ initiateD(method){
+ let urlS = "/rgv/operator/single/step/three/put";
+ if (method===1){
+ urlS = "/rgv/operator/single/step/one/put";
+ }else if (method === 2){
+ urlS = "/rgv/operator/single/step/two/put";
+ }else if (method === 3){
+ urlS = "/rgv/operator/single/step/three/put";
+ }else if (method === 4){
+ urlS = "/rgv/operator/single/step/four/put";
+ }
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + urlS,
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: this.formParamD,
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
demos(method){
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
--
Gitblit v1.9.1