From cde0e8408bf0e3bef338075732db9939a74e4283 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 25 七月 2025 13:55:06 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/devpOperate.html | 106 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index 785df61..4640278 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -20,9 +20,19 @@
</el-table-column>
<el-table-column property="workNo" label="宸ヤ綔鍙�">
</el-table-column>
- <el-table-column property="locType1" label="楂樹綆搴撲綅">
- </el-table-column>
+<!-- <el-table-column property="locType1" label="楂樹綆搴撲綅">-->
+<!-- </el-table-column>-->
<el-table-column property="pakMk" label="鍏ュ簱鏍囪">
+ </el-table-column>
+ <el-table-column property="pakMkRun" label="閫�鍥炴爣璁�">
+ </el-table-column>
+ <el-table-column property="pakMkTask" label="灏忚溅浠诲姟涓嬪彂鏍囪">
+ </el-table-column>
+ <el-table-column property="weight" label="绉伴噸">
+ </el-table-column>
+ <el-table-column property="barcode" label="鏉＄爜">
+ </el-table-column>
+ <el-table-column property="errorDev" label="寮傚父鎻愮ず">
</el-table-column>
</el-table>
</div>
@@ -41,9 +51,6 @@
<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.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>
- </el-form-item>
</el-form>
<el-form label-position="top" :inline="true" class="demo-form-inline">
<el-form-item label="">
@@ -54,7 +61,14 @@
</el-form-item>
</el-form>
<div>
- <el-button @click="requestOperate('put')" type="primary">鏇存柊</el-button>
+ <el-button @click="requestOperate('update')" type="primary">鏇存柊绔欑偣淇℃伅</el-button>
+<!-- <el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>-->
+ </div>
+ <div style="margin-top: 10px">
+ <el-button @click="requestOperate('pakMk')" type="warning">鍏ュ簱鏍囪澶嶄綅</el-button>
+ <el-button @click="requestOperate('pakMkRun')" type="warning">閫�搴撴爣璁板浣�</el-button>
+ <el-button @click="requestOperate('pakMkTask')" type="warning">灏忚溅浠诲姟涓嬪彂鏍囪澶嶄綅</el-button>
+ <el-button @click="requestOperate('pakMkWalk')" type="warning">WMS浠诲姟涓嬪彂鏍囪澶嶄綅</el-button>
</div>
</div>
</el-card>
@@ -75,21 +89,38 @@
<el-descriptions-item label="宸ヤ綔鍙�">
{{ tableData[currentIndex].workNo }}
</el-descriptions-item>
- <el-descriptions-item label="鑷姩">{{ tableData[currentIndex].autoing }}
+ <el-descriptions-item label="鑷姩">
+ <el-tag>{{ tableData[currentIndex].autoing }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">{{ tableData[currentIndex].loading }}
+ <el-descriptions-item label="鏈夌墿">
+ <el-tag>{{ tableData[currentIndex].loading }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鍙叆">{{ tableData[currentIndex].inEnable }}
+ <el-descriptions-item label="鍙叆">
+ <el-tag>{{ tableData[currentIndex].inEnable }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }}
+ <el-descriptions-item label="鍙嚭">
+ <el-tag>{{ tableData[currentIndex].outEnable }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
- </el-descriptions-item>
- <el-descriptions-item label="绌烘澘淇″彿">{{ tableData[currentIndex].emptyMk }}
+ <el-descriptions-item label="绌烘澘淇″彿">
+ <el-tag>{{ tableData[currentIndex].emptyMk }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
</el-descriptions-item>
<el-descriptions-item label="楂樹綆搴撲綅">{{ tableData[currentIndex].locType1 }}
+ </el-descriptions-item>
+ <el-descriptions-item label="閲嶉噺">{{ tableData[currentIndex].weight }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏉＄爜">{{ tableData[currentIndex].barcode }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鍥為��鏍囪">{{ tableData[currentIndex].pakMkRun }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱灏忚溅浠诲姟涓嬪彂鏍囪">{{ tableData[currentIndex].pakMkTask }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱wms浠诲姟涓嬪彂鏍囪">{{ tableData[currentIndex].pakMkWalk }}
+ </el-descriptions-item>
+ <el-descriptions-item label="寮傚父鎻愮ず">{{ tableData[currentIndex].errorDev }}
</el-descriptions-item>
</el-descriptions>
</div>
@@ -158,29 +189,36 @@
}
});
},
- requestOperate() {
+ requestOperate(method) {
let that = this
- $.ajax({
- url: baseUrl + "/site/detl/update",
- 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 + "/site/detl/"+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'
+ });
+ }
}
- }
- });
+ });
+ })
+
}
}
})
--
Gitblit v1.9.1