From da245c6f1995c5668866184d8068794c27622f62 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 24 九月 2025 11:05:20 +0800
Subject: [PATCH] 首检，巡检，入库检的数值判断
---
pages/QC/SJ/Add.vue | 92 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/pages/QC/SJ/Add.vue b/pages/QC/SJ/Add.vue
index fcc02df..060cb3c 100644
--- a/pages/QC/SJ/Add.vue
+++ b/pages/QC/SJ/Add.vue
@@ -53,12 +53,8 @@
<view class="info-value highlight">{{ formData.daa008 }}</view>
</view>
<view v-if="formData.remarks" class="info-block">
- <view class="info-label">涓嶅悎鏍兼弿杩帮細</view>
- <view class="info-value">{{ formData.remarks }}</view>
- </view>
- <view v-if="formData.comments" class="info-block">
<view class="info-label">澶囨敞锛�</view>
- <view class="info-value">{{ formData.comments }}</view>
+ <view class="info-value">{{ formData.remarks }}</view>
</view>
</view>
@@ -134,12 +130,12 @@
<view class="action-buttons">
<button v-if="isUpdate && !isShowTable" class="secondary-btn" @click="save">鍒涘缓妫�楠屽崟骞剁敓鎴愰儴鍒嗛粯璁ゅ��</button>
<button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="toImage">涓婁紶/鏌ョ湅鍥剧墖</button>
+ <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="toYzxSubmitFrom(formData.releaseNo)">涓�鑷存�ф牳瀵�</button>
<button v-if="!isUpdate && !formData.statusUser && !isShowTable" class="secondary-btn" @click="removeXJ">
鍒犻櫎鍗曟嵁
</button>
- <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
- <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="saveComments">娣诲姞澶囨敞</button>
- <button v-if="!isUpdate && !isShowTable" class="primary-btn" @click="submit">瀹℃牳鍗曟嵁</button>
+ <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="saveRemarks">娣诲姞澶囨敞</button>
+ <button v-if="!isUpdate && !isShowTable && formData.fSubmit != 1" class="primary-btn" @click="submit">瀹℃牳鍗曟嵁</button>
<button v-if="isShowTable" class="secondary-btn" @click="getTable">鑾峰彇妫�楠岄」鐩�</button>
<button v-if="isShowTable && isUpdate" class="primary-btn" @click="saveTable">鐢熸垚妫�楠岄」鐩�</button>
</view>
@@ -147,28 +143,14 @@
<!-- 寮圭獥 -->
<view v-if="remarksPopup" class="overlay">
<view class="popup">
- <h3>淇敼涓嶅悎鏍兼弿杩�</h3>
- <form>
- <view class="form-group">
- <label class="form-label">涓嶅悎鏍兼弿杩�:</label>
- <input v-model="remarks" class="form-input" type="text"/>
- </view>
- <button class="updateBut" @click="editRemarks">淇敼</button>
- <button @click="remarksPopup = !remarksPopup">鍙栨秷</button>
- </form>
- </view>
- </view>
-
- <view v-if="commentsPopup" class="overlay">
- <view class="popup">
<h3>淇敼澶囨敞</h3>
<form>
<view class="form-group">
<label class="form-label">澶囨敞:</label>
- <input v-model="comments" class="form-input" type="text"/>
+ <textarea v-model="remarks" class="form-input form-textarea" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�..."></textarea>
</view>
- <button class="updateBut" @click="editComments">淇敼</button>
- <button @click="commentsPopup = !commentsPopup">鍙栨秷</button>
+ <button class="updateBut" @click="editRemarks">淇敼</button>
+ <button @click="remarksPopup = !remarksPopup">鍙栨秷</button>
</form>
</view>
</view>
@@ -191,6 +173,7 @@
comments: "",
statusUser: "",
itemId: "",
+ fSubmit: 0,
},
DAA020List: [],
@@ -225,7 +208,12 @@
//options涓寘鍚簡url闄勫甫鐨勫弬鏁�
let params = options;
-
+ if(params["current"]==='A')
+ {
+ this.current=true;
+ }else if(params["current"]==='B'){
+ this.current=false;
+ }
if (params["id"]) {
this.isUpdate = false;
this.formData.id = params["id"];
@@ -300,17 +288,26 @@
}).then(res => {
//2024-11-28 kyy 鏍￠獙鍚堟牸鎻愪氦澧炲姞鎻愮ず
+ console.log("瀹屾暣鍝嶅簲鏁版嵁:", res);
console.log("Status Code鐨勫��:", res.statusCode);
- if (res.statusCode === 200) {
+ console.log("杩斿洖鐨勬暟鎹�:", res.data);
+
+ // 妫�鏌ュ绉嶆垚鍔熸潯浠�
+ if (res.statusCode === 200 || res.status === 0 || res.data === true || res.data.tbBillList === true) {
this.$showMessage("鎴愬姛鎻愪氦妫�楠�");
- // 浣跨敤setTimeout鍦�7绉掑悗闅愯棌娑堟伅
+ // 鎻愪氦鎴愬姛鍚庤烦杞埌鍒楄〃椤甸潰
setTimeout(() => {
- this.hideCustomMessage();
- }, 7000); // 7000姣绛変簬7绉�
+ uni.navigateTo({
+ url: '/pages/QC/SJ/List'
+ });
+ }, 1500); // 1.5绉掑悗璺宠浆锛岃鐢ㄦ埛鐪嬪埌鎴愬姛鎻愮ず
} else {
- this.$showMessage(res.data.message);
+ this.$showMessage(res.data.message || res.message || "鎻愪氦澶辫触");
}
+ }).catch(err => {
+ console.log("鎻愪氦鍑洪敊:", err);
+ this.$showMessage("鎻愪氦澶辫触锛岃閲嶈瘯");
})
},
@@ -426,7 +423,7 @@
this.$post({
url: "/SJ/SetQSItems",
data: {
- itemId: this.formData.itemNo
+ itemNo: this.formData.itemNo
}
}).then(res => {
if (res.data.tbBillList.length > 0) {
@@ -459,7 +456,7 @@
this.$post({
url: "/SJ/SetQSItems",
data: {
- itemId: this.formData.itemNo
+ itemNo: this.formData.itemNo
}
}).then(res => {
if (res.data.tbBillList.length > 0) {
@@ -492,6 +489,11 @@
this.isUpdate = false;
})
},
+ toYzxSubmitFrom(releaseNo){
+ uni.navigateTo({
+ url: 'yzxFrom?id=' +this.formData.id+'¤t='+this.current
+ });
+ },
save() {
// if (this.tableData.length === 0) {
@@ -1001,8 +1003,9 @@
padding: 20px;
border: 1px solid #ccc;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- width: 68vw;
- height: 25vh;
+ width: 85vw;
+ min-height: 35vh;
+ max-height: 60vh;
border-radius: 8px;
}
@@ -1035,6 +1038,13 @@
border-radius: 4px;
font-size: 14px;
box-sizing: border-box;
+}
+
+.popup .form-textarea {
+ min-height: 120px;
+ resize: vertical;
+ font-family: inherit;
+ line-height: 1.5;
}
.popup-buttons {
@@ -1155,6 +1165,18 @@
width: 6px;
height: 6px;
}
+
+ /* 绉诲姩绔脊鍑烘浼樺寲 */
+ .popup {
+ width: 95vw;
+ min-height: 40vh;
+ max-height: 70vh;
+ padding: 15px;
+ }
+
+ .popup .form-textarea {
+ min-height: 100px;
+ }
}
/* 骞虫澘璁惧鏍峰紡 */
--
Gitblit v1.9.3