From 835e77ee474054a19747187bfaad722df3e32278 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期五, 19 十二月 2025 18:52:33 +0800
Subject: [PATCH] llj备注
---
pages/QC/RKJ/Add.vue | 74 +++++++++++++++++++++++++++++++-----
manifest.json | 2
pages/QC/LLJ/Add.vue | 29 ++++++++++++++
3 files changed, 93 insertions(+), 12 deletions(-)
diff --git a/manifest.json b/manifest.json
index 45a1155..bfdb960 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "GS-MES-AP",
"appid" : "__UNI__F08FAE3",
"description" : "",
- "versionName" : "1.1.4.9",
+ "versionName" : "1.1.5.0",
"versionCode" : 1,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/QC/LLJ/Add.vue b/pages/QC/LLJ/Add.vue
index ef97229..b2c6560 100644
--- a/pages/QC/LLJ/Add.vue
+++ b/pages/QC/LLJ/Add.vue
@@ -82,6 +82,7 @@
<view class="info-label">澶囨敞锛�</view>
<input type="text" id="lotNo1" v-model="formData.lotNo1"
placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�"
+ @blur="saveLotNo1"
style="color: red; font-weight: bold; background-color: #fff !important; -webkit-user-select: text !important; -moz-user-select: text !important; -ms-user-select: text !important; user-select: text !important; pointer-events: auto !important; opacity: 1 !important; z-index: 1 !important;"/>
</view>
<view class="info-block" style="margin-top: 10px;">
@@ -794,6 +795,34 @@
console.error('淇濆瓨澶辫触锛�', err);
});
},
+ // 淇濆瓨澶囨敞鍒版暟鎹簱
+ saveLotNo1() {
+ if (!this.formData.id || !this.formData.releaseNo) {
+ console.log('缂哄皯蹇呰鍙傛暟锛屾棤娉曚繚瀛樺娉�');
+ return;
+ }
+
+ const requestData = {
+ gid: this.formData.id,
+ releaseNo: this.formData.releaseNo,
+ lotNo1: this.formData.lotNo1 || ''
+ };
+
+ console.log('淇濆瓨澶囨敞:', requestData);
+
+ this.$post({
+ url: "/LLJ/saveLotNo1",
+ data: requestData
+ }).then(res => {
+ if (res.status == 0) {
+ console.log('澶囨敞淇濆瓨鎴愬姛');
+ } else {
+ console.error('澶囨敞淇濆瓨澶辫触:', res.message);
+ }
+ }).catch(err => {
+ console.error('淇濆瓨澶囨敞澶辫触:', err);
+ });
+ },
submitInspection() {
// 閲嶇疆楠岃瘉鐘舵��
diff --git a/pages/QC/RKJ/Add.vue b/pages/QC/RKJ/Add.vue
index cf1f0f0..5e1b5b0 100644
--- a/pages/QC/RKJ/Add.vue
+++ b/pages/QC/RKJ/Add.vue
@@ -21,21 +21,43 @@
<view class="section-title">閫夋嫨淇℃伅</view>
<view class="form-row">
<label class="form-label required">宸ヤ綔杞﹂棿锛�</label>
- <superwei-combox :candidates="departmentList" placeholder="璇烽�夋嫨杞﹂棿" v-model="formData.workShop"
- @select="onDepartmentChange" class="form-select"></superwei-combox>
+ <superwei-combox
+ :candidates="departmentList"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨杞﹂棿"
+ v-model="formData.workShop"
+ @select="onDepartmentChange"
+ :filter="true"
+ :filterKeys="['value']"
+ class="form-select">
+ </superwei-combox>
</view>
<view class="form-row">
<label class="form-label required">鐢熶骇绾垮埆锛�</label>
- <superwei-combox v-if="formData.workShop" :candidates="DAA020List" placeholder="璇烽�夋嫨绾夸綋"
- v-model="formData.lineName" @select="onDaa020Change" class="form-select"></superwei-combox>
+ <superwei-combox
+ v-if="formData.workShop"
+ :candidates="DAA020List"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨绾夸綋"
+ v-model="formData.lineName"
+ @select="onDaa020Change"
+ :filter="true"
+ :filterKeys="['value']"
+ class="form-select">
+ </superwei-combox>
<span v-else class="form-hint">璇峰厛閫夋嫨宸ヤ綔杞﹂棿</span>
</view>
<view class="form-row">
<label class="form-label required">鐢熶骇宸ュ崟锛�</label>
- <superwei-combox v-if="formData.lineName" :candidates="DAA001List" placeholder="璇烽�夋嫨宸ュ崟"
- v-model="formData.rBillNo" @select="onDaa001Change" class="form-select"></superwei-combox>
+ <superwei-combox
+ v-if="formData.lineName"
+ :candidates="filteredDAA001List"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ崟"
+ v-model="formData.rBillNo"
+ @select="onDaa001Change"
+ @input="filterDAA001List"
+ class="form-select">
+ </superwei-combox>
<span v-else class="form-hint">璇峰厛閫夋嫨鐢熶骇绾垮埆</span>
</view>
@@ -487,6 +509,7 @@
DAA020List: [],
DAA001List: [],
+ filteredDAA001List: [], // 杩囨护鍚庣殑宸ュ崟鍒楄〃
BillNoList: [],
@@ -566,7 +589,9 @@
this.$post({
url: "/RKJ/GetDepartmentsWithLines"
}).then(res => {
- this.departmentList = res.data.tbBillList.map(item => item.departmentname);
+ // 纭繚杞﹂棿鍒楄〃鏄瓧绗︿覆鏁扮粍鏍煎紡
+ this.departmentList = res.data.tbBillList.map(item => String(item.departmentname));
+ console.log('杞﹂棿鍒楄〃:', this.departmentList); // 璋冭瘯鏃ュ織
})
}
},
@@ -753,8 +778,13 @@
}
}).then(res => {
this.BillNoList = res.data.tbBillList;
- // 宸ュ崟鍙峰幓閲嶏紝鍙樉绀哄敮涓�
- this.DAA001List = Array.from(new Set(res.data.tbBillList.map(s => s.daa001)));
+ // 宸ュ崟鍙峰幓閲嶏紝鍙樉绀哄敮涓�鍊硷紝骞剁‘淇濇槸瀛楃涓叉暟缁勬牸寮�
+ const uniqueList = Array.from(new Set(res.data.tbBillList.map(s => s.daa001)));
+ // 杞崲涓哄瓧绗︿覆鏁扮粍锛岀‘淇濇ā绯婃悳绱㈡甯稿伐浣�
+ this.DAA001List = uniqueList.map(item => String(item));
+ // 鍒濆鍖栬繃婊ゅ悗鐨勫垪琛紝鏄剧ず鎵�鏈夊伐鍗�
+ this.filteredDAA001List = [...this.DAA001List];
+ console.log('宸ュ崟鍒楄〃:', this.DAA001List); // 璋冭瘯鏃ュ織
this.formData.rBillNo = "";
// 涓嶆竻绌洪�佹鏁伴噺锛屼繚鎸佺敤鎴峰凡杈撳叆鐨勫��
this.formData.itemName = "";
@@ -765,6 +795,20 @@
this.formData.rbillNo = ""; // 娓呯┖閫佹鎵规鍙�
this.tableData = [];
})
+ },
+ // 宸ュ崟鍙疯繃婊ゆ柟娉曪紙鍖呭惈鍖归厤锛�
+ filterDAA001List(value) {
+ if (!value || value.trim() === '') {
+ // 濡傛灉杈撳叆涓虹┖锛屾樉绀烘墍鏈夊伐鍗�
+ this.filteredDAA001List = [...this.DAA001List];
+ } else {
+ // 鍖呭惈鍖归厤锛氳繃婊ゅ嚭鍖呭惈杈撳叆鍏抽敭瀛楃殑宸ュ崟鍙�
+ const keyword = value.toLowerCase();
+ this.filteredDAA001List = this.DAA001List.filter(item =>
+ String(item).toLowerCase().includes(keyword)
+ );
+ }
+ console.log('杩囨护鍏抽敭瀛�:', value, '杩囨护鍚庣殑宸ュ崟:', this.filteredDAA001List);
},
// 杞﹂棿閫夋嫨浜嬩欢
onDepartmentChange(event) {
@@ -787,13 +831,18 @@
}).then(lineRes => {
console.log("绾夸綋鏁版嵁:", lineRes.data.tbBillList); // 娣诲姞璋冭瘯鏃ュ織
this.lineList = lineRes.data.tbBillList;
- this.DAA020List = lineRes.data.tbBillList.map(item => item.linename);
+ // 纭繚绾夸綋鍒楄〃鏄瓧绗︿覆鏁扮粍鏍煎紡
+ this.DAA020List = lineRes.data.tbBillList.map(item => String(item.linename));
+ console.log('绾夸綋鍒楄〃:', this.DAA020List); // 璋冭瘯鏃ュ織
// 娓呯┖鐩稿叧鏁版嵁
this.formData.lineName = "";
this.formData.lineNo = ""; // 娓呯┖鐢熶骇绾跨紪鍙�
this.formData.rBillNo = "";
this.formData.billNo = ""; // 娓呯┖宸ュ崟鍙�
+ // 娓呯┖宸ュ崟鍒楄〃
+ this.DAA001List = [];
+ this.filteredDAA001List = [];
// 涓嶆竻绌洪�佹鏁伴噺锛屼繚鎸佺敤鎴峰凡杈撳叆鐨勫��
this.formData.itemName = "";
this.formData.itemNo = "";
@@ -985,7 +1034,10 @@
}
}).then(workOrderRes => {
this.BillNoList = workOrderRes.data.tbBillList;
- this.DAA001List = Array.from(new Set(workOrderRes.data.tbBillList.map(s => s.daa001)));
+ const uniqueList = Array.from(new Set(workOrderRes.data.tbBillList.map(s => s.daa001)));
+ this.DAA001List = uniqueList.map(item => String(item));
+ // 鍒濆鍖栬繃婊ゅ悗鐨勫垪琛�
+ this.filteredDAA001List = [...this.DAA001List];
});
}
},
--
Gitblit v1.9.3