From 3e9975c591183d77e25b506292d702da653a94fb Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 10 十月 2025 10:03:27 +0800
Subject: [PATCH] 上下刀提交
---
.vs/前端2/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm | 0
.vs/前端2/CopilotIndices/17.14.878.3237/CodeChunks.db-shm | 0
.vs/前端2/v17/DocumentLayout.backup.json | 39 +++++++++----------
.vs/slnx.sqlite | 0
.vs/前端2/CopilotIndices/17.14.878.3237/CodeChunks.db-wal | 0
.vs/前端2/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal | 0
.vs/前端2/v17/.wsuo | 0
.vs/前端2/v17/DocumentLayout.json | 14 +++---
components/mold.vue | 52 +++++++++++++++++++++----
9 files changed, 68 insertions(+), 37 deletions(-)
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 8a0aec3..d83ad60 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-shm" "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
index 28c8182..3b389a7 100644
--- "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
+++ "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-wal" "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
index 0a444d1..7cde397 100644
--- "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
+++ "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm" "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
index 5a85d7f..07eb04a 100644
--- "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
+++ "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal" "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
index 26e9dea..f52d329 100644
--- "a/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
+++ "b/.vs/\345\211\215\347\253\2572/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/v17/.wsuo" "b/.vs/\345\211\215\347\253\2572/v17/.wsuo"
index f6c20a1..796c805 100644
--- "a/.vs/\345\211\215\347\253\2572/v17/.wsuo"
+++ "b/.vs/\345\211\215\347\253\2572/v17/.wsuo"
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.backup.json" "b/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.backup.json"
index c2111ac..4e68cc6 100644
--- "a/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.backup.json"
+++ "b/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.backup.json"
@@ -38,8 +38,20 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 1,
+ "SelectedChildIndex": 4,
"Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
+ },
+ {
+ "$type": "Bookmark",
+ "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+ },
{
"$type": "Document",
"DocumentIndex": 1,
@@ -48,7 +60,7 @@
"RelativeDocumentMoniker": "components\\machine.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\machine.vue",
"RelativeToolTip": "components\\machine.vue",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAABHAAAAAAAAAA==",
+ "ViewState": "AgIAAEsAAAAAAAAAAAAAAGMAAAAaAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
"WhenOpened": "2025-10-08T06:28:46.548Z",
"EditorCaption": ""
@@ -61,22 +73,10 @@
"RelativeDocumentMoniker": "components\\mold.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\mold.vue",
"RelativeToolTip": "components\\mold.vue",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAPgAAAAAAAAAAAAUwCMBAAAIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
"WhenOpened": "2025-10-08T05:39:55.433Z",
"EditorCaption": ""
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
@@ -92,8 +92,7 @@
"RelativeToolTip": "store\\index.js",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAADAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001646|",
- "WhenOpened": "2025-09-25T08:50:23.315Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-09-25T08:50:23.315Z"
},
{
"$type": "Document",
@@ -105,8 +104,7 @@
"RelativeToolTip": "pages\\index.vue",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAsAAAAIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
- "WhenOpened": "2025-09-24T02:18:33.79Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-09-24T02:18:33.79Z"
},
{
"$type": "Document",
@@ -118,8 +116,7 @@
"RelativeToolTip": "components\\WorkOrder.vue",
"ViewState": "AgIAAM0AAAAAAAAAAAAAAN8AAAA6AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
- "WhenOpened": "2025-09-23T08:05:50.481Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-09-23T08:05:50.481Z"
},
{
"$type": "Document",
diff --git "a/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.json" "b/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.json"
index 4e68cc6..49f18fa 100644
--- "a/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.json"
+++ "b/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.json"
@@ -38,7 +38,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 5,
"Children": [
{
"$type": "Bookmark",
@@ -53,6 +53,10 @@
"Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
+ {
"$type": "Document",
"DocumentIndex": 1,
"Title": "machine.vue",
@@ -60,7 +64,7 @@
"RelativeDocumentMoniker": "components\\machine.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\machine.vue",
"RelativeToolTip": "components\\machine.vue",
- "ViewState": "AgIAAEsAAAAAAAAAAAAAAGMAAAAaAAAAAAAAAA==",
+ "ViewState": "AgIAAEUAAAAAAAAAAAAAAEUAAAACAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
"WhenOpened": "2025-10-08T06:28:46.548Z",
"EditorCaption": ""
@@ -73,14 +77,10 @@
"RelativeDocumentMoniker": "components\\mold.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\mold.vue",
"RelativeToolTip": "components\\mold.vue",
- "ViewState": "AgIAAPgAAAAAAAAAAAAUwCMBAAAIAAAAAAAAAA==",
+ "ViewState": "AgIAAMIAAAAAAAAAAAAUwLsAAAATAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
"WhenOpened": "2025-10-08T05:39:55.433Z",
"EditorCaption": ""
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
},
{
"$type": "Document",
diff --git a/components/mold.vue b/components/mold.vue
index 9daac6d..5c608d3 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -104,6 +104,8 @@
export default {
data() {
return {
+ machineNo: '',//鏈哄彴缂栫爜
+ workOrderNo: '',//宸ュ崟鍙�
pageIndex: 1,
pageSize: 18,
total: 0,
@@ -173,14 +175,44 @@
confirmTool() {
this.showToolDialog = false;
},
- handleUpTool() {
- // 涓婂垁鎻愪氦閫昏緫锛岃皟鐢ㄥ悗绔帴鍙�
- this.$showMessage('涓婂垁鎻愪氦鎴愬姛锛堢ず渚嬶級');
- },
- handleDownTool() {
- // 涓嬪垁鎻愪氦閫昏緫锛岃皟鐢ㄥ悗绔帴鍙�
- this.$showMessage('涓嬪垁鎻愪氦鎴愬姛锛堢ず渚嬶級');
- },
+ async handleUpTool() {
+ const payload = {
+ workOrderNo: this.workOrderNo, // 宸ュ崟鍙�
+ machineNo: this.machineNo, // 鏈哄彴缂栧彿
+ toolNo: this.selectedToolNo, // 鍒�鍏风紪鍙�
+ type: '涓婂垁', // 涓婂垁
+ useLimit: this.useLimitInput ? Number(this.useLimitInput) : null // 浣跨敤涓婇檺
+ };
+ const res = await this.$post({
+ url: '/MesCutterLedger/SubmitToolAction',
+ data: JSON.stringify(payload),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0) {
+ this.$showMessage('涓婂垁鎻愪氦鎴愬姛');
+ } else {
+ this.$showMessage(res.message || '涓婂垁鎻愪氦澶辫触');
+ }
+ },
+ async handleDownTool() {
+ const payload = {
+ workOrderNo: this.workOrderNo,
+ machineNo: this.machineNo,
+ toolNo: this.selectedToolNo,
+ type: '涓嬪垁', // 涓嬪垁
+ useLimit: this.useLimitInput ? Number(this.useLimitInput) : null
+ };
+ const res = await this.$post({
+ url: '/MesCutterLedger/SubmitToolAction',
+ data: JSON.stringify(payload),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0) {
+ this.$showMessage('涓嬪垁鎻愪氦鎴愬姛');
+ } else {
+ this.$showMessage(res.message || '涓嬪垁鎻愪氦澶辫触');
+ }
+ },
cancel() {
this.selectedToolNo = '';
this.toolName = '';
@@ -193,7 +225,9 @@
},
mounted() {
// 椤甸潰鍔犺浇鏃舵媺鍙栧叏閮ㄥ垁鍏�
- this.fetchTools('');
+ this.fetchTools('');
+ this.machineNo = uni.getStorageSync('machineNo') || '';// 璇诲彇鏈湴缂撳瓨鐨勬満鍙扮紪鍙�
+ this.workOrderNo = uni.getStorageSync('workOrderNo') || '';// 璇诲彇鏈湴缂撳瓨鐨勫伐鍗曠紪鍙�
}
};
</script>
--
Gitblit v1.9.3