From ffe32b53fdd713391a39ef6cea7d157f21ddc888 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 08 十月 2025 13:43:11 +0800
Subject: [PATCH] 换模界面改为刀具管理
---
.vs/前端2/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm | 0
/dev/null | 0
.vs/前端2/CopilotIndices/17.14.878.3237/CodeChunks.db-shm | 0
.vs/前端2/copilot-chat/d2d02e8e/sessions/21dbb0ca-a73e-49a1-b73f-28408d23e381 | 0
.vs/前端2/v17/DocumentLayout.backup.json | 11
pages/index.vue | 2
.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 | 26 +-
components/mold.vue | 450 +++++++++++++++++++++++---------------------------
12 files changed, 229 insertions(+), 260 deletions(-)
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index e602786..accf80d 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 669f8ba..30d5105 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 a95cd9a..4d87f86 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 5711495..e75ed32 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 3a24403..2fbdc3a 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/copilot-chat/d2d02e8e/sessions/20eb85ea-4482-4e35-8bf7-82a70f564949" "b/.vs/\345\211\215\347\253\2572/copilot-chat/d2d02e8e/sessions/20eb85ea-4482-4e35-8bf7-82a70f564949"
deleted file mode 100644
index 27214a4..0000000
--- "a/.vs/\345\211\215\347\253\2572/copilot-chat/d2d02e8e/sessions/20eb85ea-4482-4e35-8bf7-82a70f564949"
+++ /dev/null
Binary files differ
diff --git "a/.vs/\345\211\215\347\253\2572/copilot-chat/d2d02e8e/sessions/21dbb0ca-a73e-49a1-b73f-28408d23e381" "b/.vs/\345\211\215\347\253\2572/copilot-chat/d2d02e8e/sessions/21dbb0ca-a73e-49a1-b73f-28408d23e381"
new file mode 100644
index 0000000..fcf1c1e
--- /dev/null
+++ "b/.vs/\345\211\215\347\253\2572/copilot-chat/d2d02e8e/sessions/21dbb0ca-a73e-49a1-b73f-28408d23e381"
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 f9cc9c2..97c9f59 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 458029d..6b38786 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"
@@ -30,7 +30,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 5,
"Children": [
{
"$type": "Bookmark",
@@ -45,6 +45,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": "index.js",
@@ -54,7 +58,8 @@
"RelativeToolTip": "store\\index.js",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAADAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001646|",
- "WhenOpened": "2025-09-25T08:50:23.315Z"
+ "WhenOpened": "2025-09-25T08:50:23.315Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
@@ -64,7 +69,7 @@
"RelativeDocumentMoniker": "pages\\index.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\pages\\index.vue",
"RelativeToolTip": "pages\\index.vue",
- "ViewState": "AgIAACEAAAAAAAAAAAAAALUAAAAMAAAAAAAAAA==",
+ "ViewState": "AgIAANIBAAAAAAAAAAAcwP4BAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
"WhenOpened": "2025-09-24T02:18:33.79Z",
"EditorCaption": ""
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 6b38786..d5fd00b 100644
--- "a/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.json"
+++ "b/.vs/\345\211\215\347\253\2572/v17/DocumentLayout.json"
@@ -3,16 +3,16 @@
"WorkspaceRootPath": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\WorkOrder.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}",
+ "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:components\\WorkOrder.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\pages\\index.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:pages\\index.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\store\\index.js||{14D17961-FE51-464D-9111-C4AF11D7D99A}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:store\\index.js||{14D17961-FE51-464D-9111-C4AF11D7D99A}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\WorkOrder.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}",
- "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:components\\WorkOrder.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\WorkOrderPrint.vue||{40D31677-CBC0-4297-A9EF-89D907823A98}",
@@ -30,7 +30,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 6,
"Children": [
{
"$type": "Bookmark",
@@ -50,7 +50,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 2,
"Title": "index.js",
"DocumentMoniker": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\store\\index.js",
"RelativeDocumentMoniker": "store\\index.js",
@@ -58,33 +58,33 @@
"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",
- "DocumentIndex": 0,
+ "DocumentIndex": 1,
"Title": "index.vue",
"DocumentMoniker": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\pages\\index.vue",
"RelativeDocumentMoniker": "pages\\index.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\pages\\index.vue",
"RelativeToolTip": "pages\\index.vue",
- "ViewState": "AgIAANIBAAAAAAAAAAAcwP4BAAAAAAAAAAAAAA==",
+ "ViewState": "AgIAAAkAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
"WhenOpened": "2025-09-24T02:18:33.79Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 0,
"Title": "WorkOrder.vue",
"DocumentMoniker": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\WorkOrder.vue",
"RelativeDocumentMoniker": "components\\WorkOrder.vue",
"ToolTip": "F:\\\u516C\u53F8\u9879\u76EE\u8F6F\u4EF6\\GIT\\01\u9F7F\u8F6E\u8BBE\u8BA1\\\u524D\u7AEF2\\components\\WorkOrder.vue",
"RelativeToolTip": "components\\WorkOrder.vue",
- "ViewState": "AgIAAF4BAAAAAAAAAAAAAG4BAAAJAAAAAAAAAA==",
+ "ViewState": "AgIAAM0AAAAAAAAAAAAAAN8AAAA6AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003491|",
- "WhenOpened": "2025-09-23T08:05:50.481Z"
+ "WhenOpened": "2025-09-23T08:05:50.481Z",
+ "EditorCaption": ""
},
{
"$type": "Document",
diff --git a/components/mold.vue b/components/mold.vue
index 53563b2..3ee0817 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -1,322 +1,286 @@
<template>
<view class="page">
-
- <view>
- <h4>璇存槑:澶氬伐鍗曟ā寮忔椂鎹㈡ā鏄粺涓�鐨�</h4>
- </view>
- <view class="refresh-btn" @click="handleRefresh">鍒锋柊</view>
- <!-- 椤堕儴琛ㄥ崟閮ㄥ垎 -->
+ <!-- 椤堕儴Tab鏍忥紙濡傛湁闇�瑕佸彲淇濈暀锛� -->
+ <!-- 鍒�鍏烽�夋嫨鍖� -->
<view class="top-section">
<view class="form-group">
- <label>妯″叿缂栧彿锛�</label>
- <input class="input" v-model="order.moldId" placeholder="宸ュ崟甯﹀嚭" disabled="true" />
+ <label>閫夋嫨鍒�鍏风紪鍙凤細</label>
+ <select v-model="selectedToolNo">
+ <option v-for="tool in toolList" :key="tool.no" :value="tool.no">{{ tool.no }} | {{ tool.name }}</option>
+ </select>
+ <button class="btn-blue" @click="showToolDialog = true">鍒�鍏风洰褰�</button>
</view>
<view class="form-group">
- <label>浣跨敤娆℃暟锛�</label>
- <input class="input" v-model="order.moldInseptionQty" placeholder="妯″叿甯﹀嚭" disabled="true" />
+ <label>鍒�鍏峰悕绉帮細</label>
+ <input class="input" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
</view>
<view class="form-group">
- <label>鎻愰啋淇濆吇娆℃暟锛�</label>
- <input class="input" v-model="order.modlLifeWorning" placeholder="妯″叿甯﹀嚭" disabled="true" />
+ <label>瑙勬牸鍨嬪彿锛�</label>
+ <input class="input" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
</view>
</view>
- <!-- 涓棿鐘舵�侀儴鍒嗭紝涓婁笅缁撴瀯 -->
- <view class="middle-section">
- <view class="item">
- <button class="btn-disabled">鎹㈡ā寮�濮嬶紙=鍓嶅伐鍗曞畬宸ワ級</button>
- <input class="txt-inp" v-model="startTime" placeholder="杈撳叆鎹㈡ā寮�濮嬫椂闂�" />
- </view>
- <view class="item">
- <button @click="stateCheck(1)" class="btn-blue">鎹㈡ā瀹屾垚锛堢偣鍑绘寜閽級</button>
- <input class="txt-inp" v-model="endTime" placeholder="鐐瑰嚮鎹㈡ā瀹屾垚鍐欏叆" />
+ <!-- 鍒�鍏风洰褰曞脊绐� -->
+ <view v-if="showToolDialog" class="dialog-overlay">
+ <view class="dialog">
+ <view class="form-group">
+ <input v-model="searchKey" placeholder="杈撳叆鍒�鍏风紪鐮併�佸悕绉版ā绯婃悳绱�" class="input" />
+ <button class="btn-blue" @click="searchTool">鎼滅储</button>
+ </view>
+ <view class="tool-list">
+ <button v-for="tool in filteredTools" :key="tool.no" class="tool-btn" @click="selectTool(tool)">
+ {{ tool.no }} | {{ tool.name }}
+ </button>
+ </view>
+ <view class="dialog-actions">
+ <button class="btn-blue" @click="confirmTool">纭畾</button>
+ <button class="btn-disabled" @click="showToolDialog = false">鍙栨秷</button>
+ </view>
</view>
</view>
- <!-- 搴曢儴淇濆瓨/鍙栨秷鎸夐挳 -->
+ <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
+ <view class="table-section">
+ <table>
+ <thead>
+ <tr>
+ <th>鍒�鍏风紪鍙�</th>
+ <th>鍒�鍏峰悕绉�</th>
+ <th>涓婂垁鏃堕棿</th>
+ <th>涓婂垁璁℃暟</th>
+ <th>涓嬪垁鏃堕棿</th>
+ <th>涓嬪垁璁℃暟</th>
+ <th>浣跨敤娆℃暟</th>
+ <th>浣跨敤涓婇檺</th>
+ <th>瀵垮懡姣�%</th>
+ <th>瀵垮懡棰勮鍊�</th>
+ <th>棰勮鐘舵��</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="item in toolRecords" :key="item.id">
+ <td>{{ item.no }}</td>
+ <td>{{ item.name }}</td>
+ <td>{{ item.upTime }}</td>
+ <td>{{ item.upCount }}</td>
+ <td>{{ item.downTime }}</td>
+ <td>{{ item.downCount }}</td>
+ <td>{{ item.useCount }}</td>
+ <td>{{ item.useLimit }}</td>
+ <td>{{ item.lifePercent }}</td>
+ <td>{{ item.lifeWarn }}</td>
+ <td :class="item.warnStatus === '璀﹀憡' ? 'warn' : ''">{{ item.warnStatus }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </view>
+
+ <!-- 涓婁笅鍒�鎸夐挳 -->
<view class="bottom-section">
- <button class="save-btn" @click="save">淇濆瓨骞剁敓鏁�</button>
+ <button class="save-btn" @click="handleUpTool">涓婂垁鎻愪氦</button>
+ <button class="save-btn" @click="handleDownTool">涓嬪垁鎻愪氦</button>
<button class="cancel-btn" @click="cancel">鍙栨秷</button>
+ </view>
+
+ <!-- 璇存槑 -->
+ <view class="tool-desc">
+ <p style="color:red;">褰撳墠宸ュ崟涓紝鎹簡鍑犳鍒�锛屽氨浼氫骇鐢熷嚑鏉℃暟鎹�備笂鍒�鏃堕棿銆佷笅鍒�鏃堕棿鍦ㄨ〃涓兘鐪嬪埌銆�</p>
+ <p style="color:red;">涓婂垁鏃堕棿鍜屽搴旀椂闂寸敤鐢熶骇璁℃暟鍣ㄥ尮閰嶏紝鏌ュ嚭褰撴椂鐨勭敓浜ф暟锛堢疮璁¤鏁帮級銆�</p>
+ <p style="color:red;">瀵垮懡姣旈璀﹀�煎湪鍒�鍏蜂笂锛岄粯璁ょ粺涓�銆�</p>
</view>
</view>
</template>
<script>
export default {
- props: {
- orderNo: String,
- orderId: Number,
- machineNo: String
- },
data() {
return {
- startTime: '',
- endTime: '',
- order: {},
- statusForm: {}
- }
- },
- created() {
-
- // let machine = uni.getStorageSync('machine');
- // let orderId = uni.getStorageSync('orderId');
- // let orderNo = uni.getStorageSync('orderNo');
-
- // if (orderId) {
- // this.orderId = orderId;
- // } else {
- // if (!this.orderId) {
- // this.orderId = uni.getStorageSync('id');
- // }
-
- // }
-
- // if (orderNo) {
- // this.orderNo = orderNo;
- // } else {
- // if (!this.orderNo) {
- // this.orderNo = uni.getStorageSync('daa001');
- // }
- // }
-
- // if (machine) {
- // this.machineNo = machine;
- // } else {
- // if (!this.machineNo) {
- // this.machineNo = uni.getStorageSync('machineNo');
- // }
- // }
-
- if (!this.orderId && !this.orderNo) {
- return;
- }
-
- this.getOrderById();
-
- this.findByOrderId();
+ toolList: [
+ // 绀轰緥鏁版嵁锛屽疄闄呭簲浠庡悗绔帴鍙ｈ幏鍙�
+ { no: 'T22050338', name: 'm1.5鍚堥噾闀垮垁', model: 'xxx' },
+ { no: 'T22050337', name: 'm0.546鍚堥噾闀垮垁', model: 'yyy' }
+ ],
+ selectedToolNo: '',
+ toolName: '',
+ toolModel: '',
+ showToolDialog: false,
+ searchKey: '',
+ filteredTools: [],
+ toolRecords: [
+ // 绀轰緥鏁版嵁锛屽疄闄呭簲浠庡悗绔帴鍙ｈ幏鍙�
+ { id: 1, no: 'T22050338', name: 'm1.5鍚堥噾闀垮垁', upTime: '7-13 9:00', upCount: 15, downTime: '7-13 19:00', downCount: 3115, useCount: 3100, useLimit: 8888, lifePercent: '34.88%', lifeWarn: '90%', warnStatus: '姝ｅ父' }
+ ]
+ };
},
methods: {
-
- handleRefresh() {
- this.getOrderById();
- this.findByOrderId();
+ searchTool() {
+ this.filteredTools = this.toolList.filter(t =>
+ t.no.includes(this.searchKey) || t.name.includes(this.searchKey)
+ );
},
-
- save() {
- if (!this.statusForm.id) {
- this.$showMessage("id涓虹┖锛屼笉鍏佽鎺ㄩ��");
- return;
- }
-
- this.$post({
- url: "/MesOrderSta/ChangeMoldTime",
- data: {
- changeMoldStartTime: this.startTime,
- changeMoldEndTime: this.endTime,
- id: this.statusForm.id,
- orderId: this.orderId,
- machineNo: this.machineNo,
- flag: this.flag
- }
- }).then(res => {
- if (res.data.tbBillList) {
- this.$showMessage("淇濆瓨鎴愬姛");
- this.findByOrderId();
-
- uni.showToast({
- icon: 'success',
- title: '淇濆瓨鎴愬姛',
- duration: 30001,
- });
-
- } else {
- this.$showMessage("淇濆瓨澶辫触");
- this.cancel();
- }
- })
+ selectTool(tool) {
+ this.selectedToolNo = tool.no;
+ this.toolName = tool.name;
+ this.toolModel = tool.model;
+ },
+ confirmTool() {
+ this.showToolDialog = false;
+ },
+ handleUpTool() {
+ // 涓婂垁鎻愪氦閫昏緫锛岃皟鐢ㄥ悗绔帴鍙�
+ this.$showMessage('涓婂垁鎻愪氦鎴愬姛锛堢ず渚嬶級');
+ },
+ handleDownTool() {
+ // 涓嬪垁鎻愪氦閫昏緫锛岃皟鐢ㄥ悗绔帴鍙�
+ this.$showMessage('涓嬪垁鎻愪氦鎴愬姛锛堢ず渚嬶級');
},
cancel() {
- this.startTime = this.statusForm.changeMoldStartTime;
- this.endTime = this.statusForm.changeMoldEndTime;
- },
- getOrderById() {
- this.$post({
- url: "/Womdaa/GetWomdaaById",
- data: {
- orderId: this.orderId,
- orderNo: this.orderNo
- }
- }).then(res => {
- this.order = res.data.tbBillList;
- })
- },
- findByOrderId() {
- this.$post({
- url: "/MesOrderSta/FindByOrderNo",
- data: {
- orderId: this.orderId,
- orderNo: this.orderNo
- }
- }).then(res => {
- this.statusForm = res.data.tbBillList;
- this.startTime = res.data.tbBillList.changeMoldStartTime;
- this.endTime = res.data.tbBillList.changeMoldEndTime;
- })
- },
- stateCheck(item) {
- switch (item) {
- case 0:
- this.startTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
- this.endTime = this.statusForm.changeMoldEndTime;
- break;
- case 1:
- this.startTime = this.statusForm.changeMoldStartTime;
- this.endTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
- break;
- }
- this.flag = item;
+ this.selectedToolNo = '';
+ this.toolName = '';
+ this.toolModel = '';
}
+ },
+ mounted() {
+ // 瀹為檯搴斾粠鍚庣鍔犺浇鍒�鍏风洰褰曞拰浣跨敤璁板綍
+ this.filteredTools = this.toolList;
}
};
</script>
<style scoped>
- /* 椤甸潰鎾戞弧绐椾綋 */
.page {
padding: 2vh;
display: flex;
flex-direction: column;
- justify-content: space-between;
box-sizing: border-box;
}
- .refresh-btn {
- position: absolute;
- top: -5px;
- right: 40px;
- background-color: #00A2E9;
- color: white;
- padding: 10px 15px;
- font-size: 35px;
- border-radius: 5px;
- cursor: pointer;
- }
-
- .refresh-btn:disabled {
- background-color: #ccc;
- }
-
- /* 椤堕儴琛ㄥ崟閮ㄥ垎 */
.top-section {
- /* display: flex;
- justify-content: space-between;
- margin-bottom: 2vh; */
display: flex;
- margin-bottom: 2vh;
- flex-direction: row;
- flex-wrap: nowrap;
- align-content: center;
- justify-content: space-between;
- align-items: baseline;
+ flex-wrap: wrap;
+ margin-bottom: 2vh;
}
.form-group {
display: flex;
align-items: center;
+ margin-right: 2vw;
margin-bottom: 1.5vh;
- }
-
- label {
- /* margin-right: 1vw;
- font-size: 1.6vw; */
- /* Larger font size for labels */
- float: left;
- /* margin-right: 1vw; */
- font-size: 1.6vw;
- margin-top: 24px;
}
.input {
padding: 1vh;
font-size: 1.5vw;
- /* Larger font size for input fields */
border: 1px solid #ccc;
- width: 20vw;
- /* Set relative width for input fields */
- }
-
- /* 涓棿鐘舵�侀儴鍒嗭紝涓婁笅甯冨眬 */
- .middle-section {
- display: flex;
- flex-direction: column;
- margin-bottom: 4vh;
- }
-
- .item {
- display: flex;
- flex-direction: row;
- /* Arrange items vertically */
- align-items: flex-start;
- margin-bottom: 2vh;
- }
-
- button {
- width: 100%;
- /* Full width for buttons */
- padding: 1.5vh;
- font-size: 1.5vw;
- /* Larger font size for buttons */
- border: none;
- text-align: center;
- }
-
- .btn-disabled {
- background-color: #ccc;
- color: white;
+ width: 16vw;
}
.btn-blue {
background-color: #00A2E9;
color: white;
+ border: none;
+ padding: 8px 18px;
+ margin-left: 10px;
+ border-radius: 5px;
+ cursor: pointer;
}
- input {
- margin-top: 10px;
- padding: 10px;
- font-size: 14px;
+ .btn-disabled {
+ background-color: #ccc;
+ color: white;
+ border: none;
+ padding: 8px 18px;
+ margin-left: 10px;
+ border-radius: 5px;
+ cursor: not-allowed;
+ }
+
+ .dialog-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0,0,0,0.3);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 1000;
+ }
+
+ .dialog {
+ background: #fff;
+ padding: 2vh 2vw;
+ border-radius: 8px;
+ width: 60vw;
+ }
+
+ .tool-list {
+ display: flex;
+ flex-wrap: wrap;
+ margin: 1vh 0;
+ }
+
+ .tool-btn {
+ margin: 5px 10px 5px 0;
+ padding: 8px 16px;
+ background: #f5f5f5;
border: 1px solid #ccc;
- width: 100%;
- /* 杈撳叆妗嗘拺婊″搴� */
+ border-radius: 4px;
+ cursor: pointer;
}
- /* 搴曢儴淇濆瓨/鍙栨秷鎸夐挳 */
- .bottom-section {
+ .dialog-actions {
display: flex;
justify-content: space-between;
- margin-top: 4vh;
- margin-bottom: 4vh;
+ margin-top: 2vh;
}
- .save-btn,
- .cancel-btn {
- width: 48%;
- /* Half-width buttons */
+ .table-section {
+ margin: 2vh 0;
+ overflow-x: auto;
+ }
+
+ table {
+ width: 100%;
+ border-collapse: collapse;
+ }
+
+ th, td {
+ border: 1px solid #ccc;
+ padding: 8px 4px;
+ text-align: center;
+ font-size: 1vw;
+ }
+
+ .warn {
+ color: red;
+ font-weight: bold;
+ }
+
+ .bottom-section {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 2vh;
+ }
+
+ .save-btn, .cancel-btn {
+ width: 28%;
padding: 1.5vh;
background-color: #00A2E9;
color: white;
- font-size: 1.6vw;
- /* Larger font size for save/cancel buttons */
+ font-size: 1.2vw;
border: none;
text-align: center;
+ border-radius: 5px;
}
- .txt-inp {
- height: 8vh;
- padding: 1vh;
- font-size: 1.5vw;
- /* Increased font size */
- width: 100%;
- /* Full width for input in middle section */
- box-sizing: border-box;
+ .cancel-btn {
+ background-color: #ccc;
+ color: #333;
+ }
+
+ .tool-desc {
+ margin-top: 2vh;
}
</style>
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index fd3d8ad..117cfa8 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -12,7 +12,7 @@
璋冩満閫佹
</view>
<view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
- 鎹㈡ā
+ 鍒�鍏风鐞�
</view>
<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
寮�宸ュ畬宸�
--
Gitblit v1.9.3