From 00d508740cd6eef96cfedc98965239e69ac2d9d6 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 10:43:57 +0800
Subject: [PATCH] 调试
---
pages/index.vue | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 736b2e4..9e6e43c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -179,12 +179,9 @@
<view class="form-row">
<view style="display: flex; align-items: center;">
<label style="float: left;margin-top: 18px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
- <select v-model="engineeringNo" class="picker" style="padding: 7px 46px;width: 300px;">
- <option v-for="item in engineeringNoMapList" :key="item.label" :value="item.label">{{ item.label }}</option>
- </select>
- <select v-if="engineeringNo === '鍏朵粬'" v-model="engineeringNoSub" class="picker" style="padding: 7px 46px;width: 300px;">
- <option v-for="sub in engineeringNoMapList.find(i=>i.label==='鍏朵粬').children" :key="sub" :value="sub">{{ sub }}</option>
- </select>
+ <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>
@@ -298,12 +295,8 @@
machine: [],
engineeringNoList: [],
- engineeringNoMapList: [
- { label: '鍏朵粬', children: ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠'] },
- { label: '瀹屽伐', children: [] }
- ],
- engineeringNo: '', // 褰撳墠閫変腑椤�
- engineeringNoSub: '', // 閫変腑鐨勨�滃叾浠栤�濆瓙椤�
+ engineeringNoMapList: [],
+ engineeringNo: '',
machineNo: '',
machineName: '',
@@ -415,25 +408,25 @@
getPrintInfo() {
var mac = "";
- //mac = "74:24:ca:4f:b7:9b";
- //this.$post({
- // url: "/DevMachine/GetDevMachineByPdaMac",
- // data: {
- // pdaMac: mac,
- // }
- //}).then(res => {
- // let devMachine = res.data.tbBillList;
- // this.machineNo = devMachine.machineNo;
- // this.machineName = "璋冭瘯妯″紡锛�" + this.machineNo + "鍙烽娇杞満"
+ mac = "74:24:ca:4f:b7:9b";
+ 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);
- // console.log(devMachine.printMac);
+ console.log(devMachine.printMac);
- // this.getWomdaaIsShow();
- //});
- //return;
+ this.getWomdaaIsShow();
+ });
+ return;
if (plus.os.name == "Android") {
@@ -685,9 +678,16 @@
}
this.isShow = true;
- this.engineeringNo = '鍏朵粬';
- this.engineeringNoSub = '寰呭紑宸�';
+ // 榛樿閫変腑鈥滃緟寮�宸モ��
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
this.tableData = [];
+ // 涓嬫媺妗嗗彧鏄剧ず鍚堝苟鍚庣殑鐘舵�佸拰鍏跺畠鐘舵��
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
+ // 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
this.getWomdaaByStatus();
},
// 涓嬫媺妗嗛�変腑鍚庯紝鎸夌姸鎬佺瓫閫夊伐鍗�
@@ -712,12 +712,17 @@
// 鎸夊伐鍗曠姸鎬佺瓫閫夊伐鍗�
getWomdaaByStatus() {
let editDate = this.formatDate(new Date());
- let status = this.engineeringNo === '鍏朵粬' ? this.engineeringNoSub : this.engineeringNo;
+ let statusArr = [];
+ if (this.engineeringNo === '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�') {
+ statusArr = ['寰呭紑宸�', '鏈紑宸�', '鏆傚仠'];
+ } else {
+ statusArr = [this.engineeringNo];
+ }
this.$post({
url: "/Womdaa/GetWomdaasByEngineeringNo",
data: {
machineNo: this.machineNo,
- orderStatus: [status], // 鍙紶閫変腑鐨勭姸鎬�
+ orderStatus: statusArr,
editDate: editDate
}
}).then(res => {
@@ -1014,6 +1019,28 @@
}
}
+ /* 鏀惧湪 style 鏍囩鏈�鍚庯紝纭繚浼樺厛绾� */
+ ::v-deep .uni-table .uni-checkbox-wrapper,
+ ::v-deep .uni-table .uni-checkbox-input {
+ width: 55px !important;
+ height: 55px !important;
+ min-width: 55px !important;
+ min-height: 55px !important;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ ::v-deep .uni-table .uni-checkbox-input {
+ border-radius: 10px !important;
+ border: 2.5px solid #007aff !important;
+ }
+
+ ::v-deep .uni-table .uni-checkbox-input .uni-checkbox-icon {
+ font-size: 38px !important;
+ line-height: 55px !important;
+ }
+
/* 閽堝1280x800鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@media screen and (min-width: 1280px) and (max-width: 1920px) {
.right-side {
--
Gitblit v1.9.3