From 11939aa712c013aad41c08dece5c979fd821ffcb Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 15:28:46 +0800
Subject: [PATCH] 调试
---
pages/index.vue | 183 +++++++++++++++++++++++++++++----------------
1 files changed, 117 insertions(+), 66 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index e54f119..b8eded8 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -18,8 +18,8 @@
鐢熶骇鎶ュ伐
</view>
<view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
- 寮�宸ュ畬宸�
- </view>
+ 寮�宸ュ畬宸�
+ </view>
<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
</view>
@@ -30,8 +30,8 @@
璁惧鐐规
</view>
<!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
- 鎵撳嵃鏈鸿缃�
- </view> -->
+ 鎵撳嵃鏈鸿缃�
+ </view> -->
</view>
<view class="font"></view>
@@ -45,12 +45,13 @@
<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
</view>
<view class="section top-section">
+ <!--鏄剧ず褰撳墠鏈哄彴-->
<view class="form-row">
<view>
- <!-- <label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px">绗竴姝ラ�夋嫨鏈哄彴:</label> -->
- <!-- <superwei-combox :candidates="machineList" placeholder="璇烽�夋嫨" v-model="machineName"
- @select="onMachineChange" class="picker"></superwei-combox> -->
- <input v-model="machineName" disabled="true" type="text" style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px" />
+ <input v-model="machineName"
+ disabled="true"
+ type="text"
+ class="machine-name-box" />
</view>
</view>
@@ -130,9 +131,9 @@
<view>
<!--<text style="color: red;">
- 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
- 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
- </text>-->
+ 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
+ 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
+ </text>-->
</view>
</view>
</view>
@@ -191,21 +192,26 @@
<view class="section card">
<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
- @selection-change="selectionChange">
+ class="large-selection-table" @selection-change="selectionChange">
<uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">鎶ュ伐浜�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">閫夋嫨</uni-th>
</uni-tr>
- <uni-tr v-for="(item, index) in tableData" :key="index">
+ <uni-tr v-for="(item, index) in tableData"
+ :key="index"
+ :class="{'row-selected': selectedIndexs.includes(index)}"
+ @click="onRowClick(index)"
+ style="cursor: pointer;">
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
</uni-td>
@@ -338,6 +344,9 @@
this.refresh();
},
methods: {
+ onRowClick(index) {
+ this.selectedIndexs = [index]; // 鍗曢��
+ },
checkForUpdate() {
this.$post({
url: "/DevMachine/getAppUpgradeInfo",
@@ -553,27 +562,13 @@
return str;
},
- // 鍒ゆ柇鍗曟潯璁板綍鏄惁缁戝畾鍒�鍏�
- isCutterBound(row) {
- if (!row) return false;
- const idBound = typeof row.outToolId === 'number' ? row.outToolId > 0 : (
- row.outToolId && row.outToolId.toString().trim() !== ''
- );
- const codeBound = !!(row.outToolCode && row.outToolCode.toString().trim() !== '');
- const nameBound = !!(row.outToolName && row.outToolName.toString().trim() !== '');
- return idBound || codeBound || nameBound;
- },
-
- // 鏃х殑閽╁瓙鏇挎崲涓鸿皟鐢� isCutterBound(鍙湅绗竴鏉℃垨鏍规嵁闇�瑕侀亶鍘�)
- hasBindedCutter() {
- // 褰撳墠鍙厑璁镐竴鏉℃鍦ㄦ搷浣滅殑宸ュ崟锛屽彇绗竴鏉�
- return this.isCutterBound(this.isShowTableData[0]);
- },
-
cancel() {
- if (!this.machineNo) return;
- // 鍚庣鏁版嵁鍒ゆ柇
- if (this.hasBindedCutter()) {
+ if (!this.machineNo) {
+ return;
+ }
+
+ // 鐩存帴鐢� flag 鍒ゆ柇
+ if (this.hasBindedCutterFlag) {
uni.showToast({
title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘娓呯┖閲嶉��',
icon: 'error',
@@ -581,11 +576,16 @@
});
return;
}
- const editDate = this.formatDate(new Date());
+
+ let editDate = this.formatDate(new Date());
this.selectedIndexs = [];
+
this.$post({
url: "/MesOrderSelect/Remove",
- data: { machineNo: this.machineNo, editDate }
+ data: {
+ machineNo: this.machineNo,
+ editDate: editDate
+ },
}).then(res => {
if (res.data.tbBillList > 0) {
this.isShowTableData = [];
@@ -651,23 +651,25 @@
getWomdaaIsShow() {
this.$post({
url: "/Womdaa/GetWomdaasByShow",
- data: { machineNo: this.machineNo }
- }).then(res => {
- const list = res.data.tbBillList || [];
- // 缁熶竴鏄犲皠骞惰緭鍑鸿皟璇曟棩蹇�
- this.isShowTableData = list.map(r => {
- return {
- ...r,
- // 鍏煎澶у皬鍐欐垨涓嬪垝绾垮懡鍚�(鑻ヤ笉瀛樺湪鍒欎娇鐢ㄥ師鍊兼垨绌�)
- outToolId: r.outToolId ?? r.out_tool_id ?? r.outToolID ?? r.toolId ?? 0,
- outToolCode: r.outToolCode ?? r.out_tool_code ?? r.toolCode ?? '',
- outToolName: r.outToolName ?? r.out_tool_name ?? r.toolName ?? ''
- };
- });
- if (this.isShowTableData.length > 0) {
- console.log("GetWomdaasByShow 绗竴鏉¤褰�:", this.isShowTableData[0]);
+ data: {
+ machineNo: this.machineNo,
}
- if (this.isShowTableData.length === 1) {
+ }).then(res => {
+ this.isShowTableData = res.data.tbBillList;
+
+ // 鍙垽鏂涓�鏉★紙鍙厑璁镐竴鏉″伐鍗曪級
+ const order = this.isShowTableData[0];
+ let hasBindedCutter = false;
+ if (order) {
+ hasBindedCutter =
+ (order.outToolId && order.outToolId.toString().trim() !== '') ||
+ (order.outToolCode && order.outToolCode.trim() !== '') ||
+ (order.outToolName && order.outToolName.trim() !== '');
+ }
+ // 瀛樺偍鍒� data 鍙橀噺
+ this.hasBindedCutterFlag = hasBindedCutter;
+
+ if (this.isShowTableData.length == 1) {
uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
uni.setStorageSync('id', this.isShowTableData[0].id);
}
@@ -686,10 +688,14 @@
this.isShow = true;
// 榛樿閫変腑鈥滃緟寮�宸モ��
- this.engineeringNo = '寰呭紑宸�';
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
this.tableData = [];
- // 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
- this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠', '瀹屽伐'];
+ // 涓嬫媺妗嗗彧鏄剧ず鍚堝苟鍚庣殑鐘舵�佸拰鍏跺畠鐘舵��
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
// 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
this.getWomdaaByStatus();
},
@@ -715,11 +721,17 @@
// 鎸夊伐鍗曠姸鎬佺瓫閫夊伐鍗�
getWomdaaByStatus() {
let editDate = this.formatDate(new Date());
+ let statusArr = [];
+ if (this.engineeringNo === '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�') {
+ statusArr = ['寰呭紑宸�', '鏈紑宸�', '鏆傚仠'];
+ } else {
+ statusArr = [this.engineeringNo];
+ }
this.$post({
url: "/Womdaa/GetWomdaasByEngineeringNo",
data: {
machineNo: this.machineNo,
- orderStatus: [this.engineeringNo], // 鍙紶閫変腑鐨勭姸鎬�
+ orderStatus: statusArr,
editDate: editDate
}
}).then(res => {
@@ -739,6 +751,19 @@
</script>
<style lang="scss">
+
+ :deep(.checkbox),
+ :deep(.checkbox__inner) {
+ padding: 10px !important;
+ width: 44px !important;
+ min-width: 44px !important;
+ box-sizing: border-box;
+ }
+
+ .row-selected {
+ background-color: #e0f3ff !important;
+ }
+
.font {
background-color: #666666;
height: 30px;
@@ -1001,6 +1026,24 @@
border-radius: 0.8vw;
}
+ .machine-name-box {
+ border: 2px solid #e53935; /* 绾㈣壊杈规 */
+ border-radius: 8px;
+ font-family: fantasy;
+ font-size: 33px;
+ margin-top: 20px;
+ padding: 15px 48px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
+ width: 500px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
+ height: 70px; /* 澧炲姞楂樺害 */
+ box-sizing: border-box;
+ background: #fff;
+ color: #222;
+ font-weight: bold;
+ text-align: left;
+ display: block;
+ }
+
+
@media screen and (max-width: 1920px) {
.tab-item {
font-size: 1.6vw;
@@ -1016,6 +1059,14 @@
}
}
+ .uni-td, .uni-th, td, th {
+ word-break: break-all;
+ white-space: normal;
+ /* 鍙�夛細璁剧疆鏈�澶у搴︼紝闃叉鎾戠牬琛ㄦ牸 */
+ max-width: 180px;
+ overflow-wrap: break-word;
+ }
+
/* 閽堝1280x800鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@media screen and (min-width: 1280px) and (max-width: 1920px) {
.right-side {
--
Gitblit v1.9.3