From 05aa23e4bce89c2028985e0c98b6ef82e91fc506 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期五, 29 三月 2024 08:30:55 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/crnOperate.html | 126 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 04c9394..d09d214 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -14,15 +14,15 @@
<body>
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
<div style="width: 100%;">
- <el-table ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
- max-height="250" style="width: 100%">
+ <el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
+ max-height="350" style="width: 100%">
<el-table-column property="crnNo" label="鍫嗗灈鏈�">
</el-table-column>
<el-table-column property="workNo" label="宸ヤ綔鍙�">
</el-table-column>
<el-table-column property="statusType" label="妯″紡">
</el-table-column>
- <el-table-column property="wrkStatus" label="浠诲姟鐘舵��">
+ <el-table-column property="wrkStatus$" label="浠诲姟鐘舵��">
</el-table-column>
<el-table-column property="deviceStatus" label="璁惧鐘舵��">
</el-table-column>
@@ -37,32 +37,51 @@
</div>
<div>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="婧愮珯/婧愬簱浣�">
- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>
- </el-form-item>
- <el-form-item label="鎺�">
+<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
+<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
+<!-- </el-form-item>-->
+ <el-form-item label="婧愭帓">
<el-input v-model="formParam.sourceRow" placeholder="鎺�"></el-input>
</el-form-item>
- <el-form-item label="鍒�">
+ <el-form-item label="婧愬垪">
<el-input v-model="formParam.sourceBay" placeholder="鍒�"></el-input>
</el-form-item>
- <el-form-item label="灞�">
+ <el-form-item label="婧愬眰">
<el-input v-model="formParam.sourceLev" placeholder="灞�"></el-input>
</el-form-item>
</el-form>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">
- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�/鐩爣搴撲綅"></el-input>
- </el-form-item>
- <el-form-item label="鎺�">
+<!-- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">-->
+<!-- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�/鐩爣搴撲綅"></el-input>-->
+<!-- </el-form-item>-->
+ <el-form-item label="鐩爣鎺�">
<el-input v-model="formParam.row" placeholder="鎺�"></el-input>
</el-form-item>
- <el-form-item label="鍒�">
+ <el-form-item label="鐩爣鍒�">
<el-input v-model="formParam.bay" placeholder="鍒�"></el-input>
</el-form-item>
- <el-form-item label="灞�">
+ <el-form-item label="鐩爣灞�">
<el-input v-model="formParam.lev" placeholder="灞�"></el-input>
</el-form-item>
+ </el-form>
+ <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
+ <el-form-item label="鎵樼洏鐮�">
+ <el-input v-model="formParam.barcode" placeholder="鏉＄爜"></el-input>
+ </el-form-item>
+ <el-form-item label="鎵樼洏绫诲瀷">
+ <el-input v-model="formParam.barcodeType" placeholder="绫诲瀷"></el-input>
+ </el-form-item>
+ <el-form-item label="绌烘墭鐩�">
+ <el-select v-model="formParam.emptyContainer" placeholder="鏄惁涓虹┖鎵樼洏">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+
</el-form>
<el-form label-position="top" :inline="true" class="demo-form-inline">
<el-form-item label="">
@@ -79,7 +98,18 @@
<el-button @click="requestOperate('siteMove')" type="primary">绔欏埌绔�</el-button>
<el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
<el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>
- <el-button @click="requestOperate('handleReset')" type="primary">澶嶄綅</el-button>
+ <el-button @click="requestOperate('reset')" type="primary">澶嶄綅</el-button>
+ <br/>
+ <br/>
+ <el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
+ <el-button @click="requestOperate('semiAutomatic')" type="warning">鍗婅嚜鍔�</el-button>
+ <el-button @click="requestOperate('hand')" type="warning">鎵嬪姩</el-button>
+ <el-button @click="requestOperate('onlineWrk4')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
+ <el-button @click="requestOperate('onlineWrk3')" type="warning">娓呴櫎鑱旀満浠诲姟</el-button>
+ <el-button @click="requestOperate('onlineWrk1')" type="warning">鐢宠瀹屾垚浠诲姟</el-button>
+ <br/>
+ <br/>
+ <el-button @click="requestOperate('onlineWrk2')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>
</div>
</div>
</el-card>
@@ -177,10 +207,23 @@
staNo: null,
row: 1,
bay: 0,
- lev: 1
+ lev: 1,
+ barcode:null,
+ barcodeType:null,
+ emptyContainer:null
},
enableIn: false,
- enableOut: false
+ enableOut: false,
+ options:[
+ {
+ value:'1',
+ label:'鏄�'
+ },
+ {
+ value:'0',
+ label:'鍚�'
+ }
+ ]
},
created() {
this.init()
@@ -223,27 +266,34 @@
},
requestOperate(method) {
let that = this
- $.ajax({
- url: baseUrl + "/crn/operator/" + method,
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: this.formParam,
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/crn/operator/" + method,
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: this.formParam,
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
}
- }
- });
+ });
+ })
+
},
updateEnableInOut(type) {
let that = this
--
Gitblit v1.9.1