From 255e7ef8d8d282305baa43e77115bfff1cfffccb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 20:13:51 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/crnOperate.html | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 8406daf..15ed4b0 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -28,6 +28,8 @@
</el-table-column>
<el-table-column property="deviceStatus" label="璁惧鐘舵��">
</el-table-column>
+ <el-table-column property="taskComplete" label="浠诲姟瀹屾垚鎸囦护">
+ </el-table-column>
<el-table-column property="errorCrn" label="寮傚父鎻愮ず">
</el-table-column>
</el-table>
@@ -41,9 +43,9 @@
</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-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>
@@ -55,9 +57,9 @@
</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-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>
@@ -75,13 +77,20 @@
<el-form-item label="">
<el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">鍙嚭</el-checkbox>
</el-form-item>
+ <el-form-item label="">
+ <el-checkbox @change="updateEnableInOut('demo')" v-model="hpMkDemo">婕旂ず</el-checkbox>
+ </el-form-item>
</el-form>
<div>
<!-- <el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>-->
<!-- <el-button @click="requestOperate('take')" type="primary">鍑哄簱</el-button>-->
-<!-- <el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>-->
+ <el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>
+
+ <div style="margin-top: 10px">
+ <el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
+ <el-button @click="requestOperate('taskCompleteClearCommand')" type="primary">浠诲姟瀹屾垚鎸囦护娓呴櫎</el-button>
+ </div>
<!-- <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('reset')" type="primary">澶嶄綅</el-button>-->
<br/>
@@ -197,7 +206,8 @@
lev: 1
},
enableIn: false,
- enableOut: false
+ enableOut: false,
+ hpMkDemo: false
},
created() {
this.init()
@@ -221,6 +231,7 @@
this.formParam.crnNo = row.crnNo
this.enableIn = row.inEnable == "Y" ? true : false
this.enableOut = row.outEnable == "Y" ? true : false
+ this.hpMkDemo = row.hpMk == "Y" ? true : false
},
getTableData() {
let that = this;
@@ -277,6 +288,11 @@
inEnable: this.enableIn ? "Y" : "N",
crnNo: this.formParam.crnNo
}
+ } else if (type == "demo") {
+ param = {
+ hpMk: this.hpMkDemo ? "Y" : "N",
+ crnNo: this.formParam.crnNo
+ }
} else {
param = {
outEnable: this.enableOut ? "Y" : "N",
--
Gitblit v1.9.1