From 7ce0e7ec84b19ec5550eb2a1353b43ff59ad40d1 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 11:01:30 +0800
Subject: [PATCH] 调试
---
pages/index.vue | 357 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 221 insertions(+), 136 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index ac90ed8..801878a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -8,27 +8,30 @@
<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
涓荤晫闈�
</view>
+ <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
+ 涓婂垁涓嬪垁
+ </view>
<view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
璋冩満閫佹
- </view>
- <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
- 鍒�鍏风鐞�
</view>
<view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
鐢熶骇鎶ュ伐
</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>
<view class="tab-item" :class="{ active: currentTab === 6 }" @click="changeTab(6)">
宸ヨ壓鍙傛暟
</view>
- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
- 鎵撳嵃鏈鸿缃�
+ <view class="tab-item" :class="{ active: currentTab === 9 }" @click="changeTab(9)">
+ 璁惧鐐规
</view>
+ <!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
+ 鎵撳嵃鏈鸿缃�
+ </view> -->
</view>
<view class="font"></view>
@@ -63,28 +66,28 @@
<view class="section card">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" @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">閫夋嫨</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 140px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 220px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">瑙勬牸</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: 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: 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: 120px;">閫夋嫨</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in isShowTableData" :key="index">
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa001" />
+ <input class="form-input" disabled="true" type="text" v-model="item.daa001" /><!--宸ュ崟鍙�-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+ <input class="form-input" disabled="true" type="text" v-model="item.daa002" /><!--浜у搧缂栫爜-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
@@ -112,7 +115,7 @@
</uni-td>
<uni-td>
<view class="uni-group">
- <button type="default" @click="toDetail(item)">
+ <button class="select-btn" type="default" @click="toDetail(item)">
閫夋嫨
</button>
</view>
@@ -126,10 +129,10 @@
</view>
<view>
- <text style="color: red;">
+ <!--<text style="color: red;">
璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
- </text>
+ </text>-->
</view>
</view>
</view>
@@ -163,6 +166,10 @@
<view v-if="currentTab === 6" class="tab-content">
<Technology :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
+ <view v-if="currentTab === 9" class="tab-content">
+ <!-- 璁惧鐐规瑙嗗浘 -->
+ <EquipmentInspection :machineNo="machineNo" />
+ </view>
</scroll-view>
@@ -170,11 +177,12 @@
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="form-row">
- <view>
- <label style="float: left;margin-top: 18px;">閫夋嫨宸ュ崟鐘舵��:</label>
+ <view style="display: flex; align-items: center;">
+ <label style="float: left;margin-top: 18px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
@select="onEngineeringNoChange" class="picker"
style="padding: 7px 46px;width: 650px;"></superwei-combox>
+ <span style="margin-left: 20px; color: #ff6600; font-size: 18px;">澶氶�夋椂鍙繚鐣欐渶鍚庝竴鏉″伐鍗�</span>
</view>
</view>
@@ -248,16 +256,17 @@
</template>
<script>
- import WorkOrderStatus from '../components/WorkOrderStatus.vue'; // 纭繚璺緞姝ｇ‘
- import UniTable from "../uni_modules/uni-table/components/uni-table/uni-table.vue";
- import Mold from "../components/mold.vue";
- import Machine from "../components/machine.vue";
- import WorkOrderPrint from "../components/WorkOrderPrint.vue";
- import WorkOrder from "../components/WorkOrder.vue";
- import Technology from "../components/Technology.vue";
- import PDFShow from "../components/PDFShow.vue";
- import PrintInit from "../components/PrintInit.vue";
- import PrintTest from "../components/PrintTest.vue";
+import WorkOrderStatus from '../components/WorkOrderStatus.vue'; // 纭繚璺緞姝ｇ‘
+import UniTable from "../uni_modules/uni-table/components/uni-table/uni-table.vue";
+import Mold from "../components/mold.vue";
+import Machine from "../components/machine.vue";
+import WorkOrderPrint from "../components/WorkOrderPrint.vue";
+import WorkOrder from "../components/WorkOrder.vue";
+import Technology from "../components/Technology.vue";
+import PDFShow from "../components/PDFShow.vue";
+import PrintInit from "../components/PrintInit.vue";
+import PrintTest from "../components/PrintTest.vue";
+import EquipmentInspection from "../components/EquipmentInspection.vue";
export default {
components: {
@@ -270,7 +279,8 @@
WorkOrderStatus,
PDFShow,
PrintInit,
- PrintTest
+ PrintTest,
+ EquipmentInspection
},
data() {
return {
@@ -396,9 +406,9 @@
this.getWomdaaIsShow();
},
getPrintInfo() {
- var mac = "ac:f4:2c:20:0d:b4";
+ var mac = "";
- mac = "e8:51:9e:7d:dc:95";
+ mac = "74:24:ca:4f:b7:9b";
this.$post({
url: "/DevMachine/GetDevMachineByPdaMac",
data: {
@@ -416,45 +426,46 @@
this.getWomdaaIsShow();
});
+ return;
- // if (plus.os.name == "Android") {
- // //鑾峰彇鎵嬫満MAC鍦板潃
- // var Context = plus.android.importClass("android.content.Context");
- // var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
- // var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
- // var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
- // var wifiInfo = wifiManager.getConnectionInfo();
- // mac = wifiInfo.getMacAddress();
+ if (plus.os.name == "Android") {
+ //鑾峰彇鎵嬫満MAC鍦板潃
+ var Context = plus.android.importClass("android.content.Context");
+ var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
+ var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
+ var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
+ var wifiInfo = wifiManager.getConnectionInfo();
+ mac = wifiInfo.getMacAddress();
- // //濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
- // if (mac == "02:00:00:00:00:00") {
- // mac = this.getMacNew();
- // }
- // //濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
- // if (mac == "02:00:00:00:00:00") {
- // return;
- // }
- // uni.setStorageSync('pdaMac', mac);
+ //濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
+ if (mac == "02:00:00:00:00:00") {
+ mac = this.getMacNew();
+ }
+ //濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
+ if (mac == "02:00:00:00:00:00") {
+ return;
+ }
+ uni.setStorageSync('pdaMac', mac);
- // this.$post({
- // url: "/DevMachine/GetDevMachineByPdaMac",
- // data: {
- // pdaMac: mac,
- // }
- // }).then(res => {
- // let devMachine = res.data.tbBillList;
- // this.machineNo = devMachine.machineNo;
- // this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙锋敞濉戞満";
+ this.$post({
+ url: "/DevMachine/GetDevMachineByPdaMac",
+ data: {
+ pdaMac: mac,
+ }
+ }).then(res => {
+ let devMachine = res.data.tbBillList;
+ this.machineNo = devMachine.machineNo;
+ this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙烽娇杞満";
- // uni.setStorageSync('machineNo', this.machineNo);
- // uni.setStorageSync('printMac', devMachine.printMac);
+ uni.setStorageSync('machineNo', this.machineNo);
+ uni.setStorageSync('printMac', devMachine.printMac);
- // this.getWomdaaIsShow();
+ this.getWomdaaIsShow();
- // });
- // }
+ });
+ }
},
save() {
let data = this.selectedItems();
@@ -541,28 +552,38 @@
}
return str;
},
- cancel() {
- if (!this.machineNo) {
- return;
- }
+ cancel() {
+ if (!this.machineNo) {
+ return;
+ }
- let editDate = this.formatDate(new Date());
+ // 鐩存帴鐢� flag 鍒ゆ柇
+ if (this.hasBindedCutterFlag) {
+ uni.showToast({
+ title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘娓呯┖閲嶉��',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
- this.selectedIndexs = [];
+ let editDate = this.formatDate(new Date());
+ this.selectedIndexs = [];
- this.$post({
- url: "/MesOrderSelect/Remove",
- data: {
- machineNo: this.machineNo,
- editDate: editDate
- },
- }).then(res => {
- if (res.data.tbBillList > 0) {
- this.isShowTableData = [];
- }
- });
- },
+ this.$post({
+ url: "/MesOrderSelect/Remove",
+ data: {
+ machineNo: this.machineNo,
+ editDate: editDate
+ },
+ }).then(res => {
+ if (res.data.tbBillList > 0) {
+ this.isShowTableData = [];
+ }
+ });
+ },
+
formatDate(date) {
let year = date.getFullYear(); // 鑾峰彇骞翠唤
let month = String(date.getMonth() + 1).padStart(2, '0'); // 鑾峰彇鏈堜唤骞惰ˉ闆�
@@ -618,46 +639,57 @@
})
},
//鑾峰彇琛ㄦ牸鐨勬暟鎹簮
- getWomdaaIsShow() {
- this.$post({
- url: "/Womdaa/GetWomdaasByShow",
- data: {
- machineNo: this.machineNo,
- }
- }).then(res => {
- this.isShowTableData = res.data.tbBillList;
+ getWomdaaIsShow() {
+ this.$post({
+ url: "/Womdaa/GetWomdaasByShow",
+ data: {
+ machineNo: this.machineNo,
+ }
+ }).then(res => {
+ this.isShowTableData = res.data.tbBillList;
- if (this.isShowTableData.length == 1) {
- uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
- uni.setStorageSync('id', this.isShowTableData[0].id);
- //this.toDetail(this.isShowTableData[0]);
- }
- });
- },
+ // 鍙垽鏂涓�鏉★紙鍙厑璁镐竴鏉″伐鍗曪級
+ 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;
- isShowTab() {
+ if (this.isShowTableData.length == 1) {
+ uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
+ uni.setStorageSync('id', this.isShowTableData[0].id);
+ }
+ });
+ },
- if (this.isShowTableData.length > 0) {
- uni.showToast({
- title: '宸叉湁姝ｅ湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
- //灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
- icon: 'error',
- //鏄剧ず鎸佺画鏃堕棿涓� 2绉�
- duration: 2000
- });
+ isShowTab() {
+ if (this.isShowTableData.length > 0) {
+ uni.showToast({
+ title: '宸叉湁姝ｅ湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
- return;
- }
-
- this.isShow = true;
-
- this.engineeringNo = null;
- this.tableData = [];
- // 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
- this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠'];
- // 榛樿鏄剧ず鍏ㄩ儴宸ュ崟
- this.getWomdaa();
- },
+ this.isShow = true;
+ // 榛樿閫変腑鈥滃緟寮�宸モ��
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
+ this.tableData = [];
+ // 涓嬫媺妗嗗彧鏄剧ず鍚堝苟鍚庣殑鐘舵�佸拰鍏跺畠鐘舵��
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
+ // 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
+ this.getWomdaaByStatus();
+ },
// 涓嬫媺妗嗛�変腑鍚庯紝鎸夌姸鎬佺瓫閫夊伐鍗�
onEngineeringNoChange(status) {
this.engineeringNo = status;
@@ -680,11 +712,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 => {
@@ -881,16 +919,21 @@
/* Increased font size for content */
}
- .picker {
- float: left;
- margin-top: 7px;
- margin-left: 10px;
- text-align: center;
- font-size: 100%;
- padding: 5.5px 1px;
- background-color: #f8f8f8;
- border: 2px solid #ccc;
- }
+ .picker {
+ float: left;
+ margin-top: 7px;
+ margin-left: 10px;
+ text-align: center;
+ font-size: 32px !important; // 寮哄埗澶у瓧浣擄紝閫傞厤浣庡瘑搴�
+ min-height: 60px; // 璁╅�夋嫨妗嗛珮搴︿篃鍙樺ぇ
+ line-height: 60px;
+ padding: 5.5px 1px;
+ background-color: #fff; // 杩欓噷鏀逛负钃濊壊
+ border: 2px solid #007aff; // 杈规涔熸敼涓鸿摑鑹�
+ color: #007aff; // 瀛椾綋棰滆壊鏀逛负鐧借壊锛屼繚璇佸彲璇绘��
+ border-radius: 6px;
+ transition: background 0.2s;
+ }
.th {
background-color: lightskyblue;
@@ -976,6 +1019,35 @@
}
}
+ /* 鏀惧ぇ uni-table 鐨勫閫夋锛坈heckbox锛� */
+ :deep(.uni-table .uni-checkbox-wrapper),
+ :deep(.uni-table .uni-checkbox-input) {
+ width: 48px !important;
+ height: 48px !important;
+ min-width: 48px !important;
+ min-height: 48px !important;
+ display: flex !important;
+ align-items: center !important;
+ justify-content: center !important;
+ box-sizing: border-box !important;
+ }
+
+ /* 鍙 input[type=checkbox] 鏀惧ぇ锛屼笉瑕佸姞 :deep() */
+ .uni-table .uni-checkbox-input input[type="checkbox"] {
+ transform: scale(2.2) !important;
+ accent-color: #007aff !important;
+ cursor: pointer !important;
+ }
+
+ /* 鏀惧ぇ uni-table 鐨勫閫夋鍒楀 */
+ :deep(.uni-table .uni-table-selection),
+ :deep(.uni-table th.is-selection),
+ :deep(.uni-table td.is-selection) {
+ width: 100px !important;
+ min-width: 100px !important;
+ max-width: 120px !important;
+ }
+
/* 閽堝1280x800鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@media screen and (min-width: 1280px) and (max-width: 1920px) {
.right-side {
@@ -1001,4 +1073,17 @@
font-size: 20px;
}
}
-</style>
\ No newline at end of file
+
+ .select-btn {
+ width: 180px; // 鏇村
+ height: 80px; // 鏇撮珮
+ font-size: 1.8vw; // 瀛椾綋涔熺暐澶�
+ border-radius: 10px;
+ background-color: #f5f5f5;
+ color: #007aff;
+ border: 2px solid #007aff;
+ margin: 0 auto;
+ display: block;
+ }
+
+</style>
--
Gitblit v1.9.3