From 2ba045658a9e6a1a28cf0bdf1a751395ad283c62 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 12 九月 2025 18:00:30 +0800
Subject: [PATCH] iqc提交检验时，会判断是否要提交异常处置单
---
pages/QC/LLJ/Add.vue | 164 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 38 deletions(-)
diff --git a/pages/QC/LLJ/Add.vue b/pages/QC/LLJ/Add.vue
index d1d1453..171d68d 100644
--- a/pages/QC/LLJ/Add.vue
+++ b/pages/QC/LLJ/Add.vue
@@ -4,8 +4,11 @@
<view class="sheet-header">
<h1>鏉ユ枡妫�楠屽崟</h1>
<view class="inspection-number">妫�楠屽崟鍙凤細{{formData.releaseNo}}</view>
-
- <view style="text-align: right;" v-if="this.current"><a class="sysLike" @click="toSysSubmitFrom(formData.releaseNo)">瀹為獙瀹ら�佹</a></view>
+ <!-- 閫犳ⅵ鑰呯壒娈婂姛鑳� -->
+ <!-- <view style="text-align: right;" >
+ <a class="sysLike"v-if="this.current" @click="toSysSubmitFrom(formData.releaseNo)">瀹為獙瀹ら�佹</a>
+ <a class="sysLike" @click="toYzxSubmitFrom(formData.releaseNo)">涓�鑷存�ф牳瀵�</a>
+ </view> -->
</view>
<!-- 鍩烘湰淇℃伅鍖� -->
@@ -29,25 +32,34 @@
<view class="info-block">
<view class="info-label">鐗╂枡缂栫爜锛�</view>
<view class="info-value">{{formData.itemNo}}</view>
+ <!-- 閫犳ⅵ鑰呯壒娈婂姛鑳� -->
<view class="doc-links">
<a class="doc-link" @click="toFileUrlByU9List(1,formData.itemNo)">鍥剧焊瑙勬牸涔�</a>
<a class="doc-link" @click="toFileUrlByU9List(2,formData.itemNo)">杩涙枡妫�楠屾枃浠�</a>
</view>
- </view>
- <view class="info-block">
- <view class="info-label">鐗╂枡鍚嶇О锛�</view>
- <view class="info-value">{{formData.itemName}}</view>
- <view class="info-label">椤圭洰锛�</view>
- <view class="info-value">{{formData.projectCodes}}</view>
- <view class="info-label" v-if="formData.extendNo1!=null">鎶�鏀圭姸鎬侊細</view>
- <view class="info-value" v-if="formData.extendNo1!=null">{{formData.extendNo1}}</view>
- <view class="info-label">鏁伴噺锛�</view>
- <view class="info-value highlight">{{formData.fcovertQty}}</view>
+
</view>
<view class="info-block">
- <view class="info-label">瑙勬牸鍨嬪彿锛�</view>
- <view class="info-value">{{formData.itemModel}}</view>
+ <view class="info-label">鐗╂枡鍚嶇О锛�</view>
+ <view class="info-value">{{formData.itemName}}</view>
+ </view>
+ <view class="info-block">
+ <view class="info-label">瑙勬牸鍨嬪彿锛�</view>
+ <view class="info-value">{{formData.itemModel}}</view>
</view>
+
+ <view class="info-block">
+
+ <view class="info-label" v-if="formData.extendNo1!=null">鎶�鏀圭姸鎬侊細</view>
+ <view class="info-value" v-if="formData.extendNo1!=null">{{formData.extendNo1}}</view>
+ <view class="info-label">椤圭洰锛�</view>
+ <view class="info-value">{{formData.projectCodes}}</view>
+
+ <view class="info-label">鏁伴噺锛�</view>
+ <view class="info-value highlight">{{formData.fcovertQty}}</view>
+ <view class="info-label">鎶芥锛�</view>
+ <view class="info-value highlight">{{formData.maxCheckQyt}}</view>
+ </view>
<view class="info-block" v-if="formData.fngDesc!=null">
<view class="info-label">涓嶈壇鎻忚堪锛�</view>
<view class="info-value">{{formData.fngDesc}}</view>
@@ -56,11 +68,21 @@
<view class="info-label">涓婃涓嶈壇锛�</view>
<view class="info-value">{{formData.newFngDesc}}</view>
</view>
+ <view class="info-block" v-if="formData.lvli!=null &&this.current" >
+ <view class="info-label">寰�鏈熸楠屽饱鍘嗭細</view>
+ <view class="info-value">{{formData.lvli}}</view>
+ </view>
</view>
<!-- 鎿嶄綔鎸夐挳鍖� -->
- <view class="action-buttons" v-if="this.current" >
- <button class="secondary-btn" @click="getInspectionItems">鑾峰彇妫�楠岄」鐩�</button>
+ <view class="action-buttons" >
+ <!-- <a class="sysLike"v-if="this.current" @click="toSysSubmitFrom(formData.releaseNo)">瀹為獙瀹ら�佹</a>
+ <a class="sysLike" @click="toYzxSubmitFrom(formData.releaseNo)">涓�鑷存�ф牳瀵�</a>
+ -->
+ <button class="secondary-btn" v-if="!this.current" @click="toYCCZFrom(formData.releaseNo)">寮傚父澶勭疆鍗�</button>
+ <button class="secondary-btn" v-if="this.current" @click="toSysSubmitFrom(formData.releaseNo)">瀹為獙瀹ら�佹</button>
+ <button class="secondary-btn" @click="toYzxSubmitFrom(formData.releaseNo)">涓�鑷存�ф牳瀵�</button>
+ <button class="secondary-btn" v-if="this.current" @click="getInspectionItems">鑾峰彇妫�楠岄」鐩�</button>
</view>
<!-- 妫�楠岄」鐩〃鏍� -->
@@ -83,7 +105,7 @@
<view class="description-text">{{ item.fcheckItemDesc }}</view>
</td>
<td>
- <button v-if="item.current" class="record-btn" @click="fillRecord(item,index)">濉啓璁板綍</button>
+ <button v-if="item.current" class="record-btn" @click="fillRecord(item,index)">濉啓</button>
<button v-if="!item.current" class="record-btn" @click="fillRecord(item,index)">鏌ョ湅</button>
</td>
</tr>
@@ -93,8 +115,8 @@
<!-- 鎿嶄綔鎸夐挳鍖� -->
<view class="action-buttons">
- <button class="secondary-btn" @click="uploadImages">涓婁紶/鏌ョ湅鍥剧墖</button>
- <button class="secondary-btn" @click="addDefectDescription" v-if="this.current">娣诲姞涓嶈壇鎻忚堪</button>
+ <button class="secondary-btn" @click="uploadImages">鏌ョ湅鎵�鏈夊浘鐗�</button>
+ <button class="secondary-btn" @click="addDefectDescription">鏌ョ湅涓嶈壇鎻忚堪</button>
<button class="primary-btn" @click="submitInspection" v-if="this.current">妫�楠屾彁浜�</button>
</view>
<view v-if="remarksPopup" class="overlay">
@@ -137,7 +159,8 @@
},
tableData: [],
remarksPopup: false,
- current:true
+ current:true,
+ type:""
}
},
onLoad(options) {
@@ -149,6 +172,7 @@
this.formData.releaseNo = params["releaseNo"];
this.formData.lotNo = params["lotNo"];
this.msgId = params["msgId"];
+ this.type = params["type"];
if(params["current"]==='A')
{
@@ -227,19 +251,24 @@
fillRecord(item,index) {
// 濉啓璁板綍鐨勯�昏緫
uni.navigateTo({
- url: 'detail?mainId=' + item.id+'&formID='+this.formData.id+'&releaseNo='+this.formData.releaseNo+'&index='+index+'¤t='+this.current
+ url: 'detail?mainId=' + item.id+'&formID='+this.formData.id+'&releaseNo='+this.formData.releaseNo+'&index='+index+'¤t='+this.current+'&itemNo='+this.formData.itemNo
});
},
uploadImages() {
// 涓婁紶/鏌ョ湅鍥剧墖鐨勯�昏緫
uni.navigateTo({
- url: 'ImageItem?id=' + this.formData.id
+ url: 'ImageItemALL?id=' + this.formData.releaseNo
});
},
addDefectDescription() {
- // 娣诲姞涓嶈壇鎻忚堪鐨勯�昏緫
- this.remarksPopup = !this.remarksPopup;
- this.remarks = this.formData.remarks;
+ // 娣诲姞涓嶈壇鎻忚堪鐨勯�昏緫锛堢幇鏀逛负鏌ョ湅鎵�鏈変笉鑹弿杩帮級
+ // this.remarksPopup = !this.remarksPopup;
+ // this.remarks = this.formData.remarks;
+ // 涓婁紶/鏌ョ湅鍥剧墖鐨勯�昏緫
+ uni.navigateTo({
+ url: 'Blms?id=' + this.formData.releaseNo
+ });
+
},
submitInspection() {
// 妫�楠屾彁浜ょ殑閫昏緫
@@ -250,19 +279,66 @@
releaseNo: this.formData.releaseNo
}
}).then(res => {
+
if (res.status==0) {
-
- uni.showToast({
- title: res.message.toString(),
- icon: 'success',
- duration: 2000
- })
- // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
- setTimeout(() => {
- uni.navigateTo({
- url: 'List'
- });
- }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
+ if(res.message.toString()=='IQC鎻愪氦鎴愬姛锛佽鎻愪氦寮傚父澶勭疆鍗�'){
+ uni.showModal({
+ title: "鎻愮ず",
+ content: res.message.toString(),
+ confirmText: "纭畾",
+ cancelText: "鍙栨秷", // 濡傛灉瑕佽嚜瀹氫箟鍙栨秷鎸夐挳鏂囧瓧
+ showCancel: true, // 鍏佽鏄剧ず鍙栨秷鎸夐挳
+ success: (res) => {
+ debugger
+ if (res.confirm) {
+ uni.navigateTo({
+ url: 'IqcYcczFrom?releaseNo=' + this.formData.releaseNo+'&userID='+this.$loginInfo.account+'&qty='+this.formData.fcovertQty
+ });
+ } else if (res.cancel) {
+ // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
+ setTimeout(() => {
+ if(this.type==="A"){
+ uni.navigateTo({
+ url: 'ScanCode'
+ });
+ }else{
+ uni.navigateTo({
+ url: 'List'
+ });
+ }
+ // uni.navigateTo({
+ // url: 'List'
+ // });
+
+ }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
+ }
+ }
+ })
+
+ }else{
+ uni.showToast({
+ title: res.message.toString(),
+ icon: 'success',
+ duration: 2000
+ })
+ // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
+ setTimeout(() => {
+ if(this.type==="A"){
+ uni.navigateTo({
+ url: 'ScanCode'
+ });
+ }else{
+ uni.navigateTo({
+ url: 'List'
+ });
+ }
+ // uni.navigateTo({
+ // url: 'List'
+ // });
+
+ }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
+ }
+
} else {
uni.showModal({
@@ -348,6 +424,16 @@
toSysSubmitFrom(releaseNo){
uni.navigateTo({
url: 'SysSubmitFrom?releaseNo=' + releaseNo+'&userID='+this.$loginInfo.account
+ });
+ },
+ toYCCZFrom(releaseNo){
+ uni.navigateTo({
+ url: 'IqcYcczFrom?releaseNo=' + releaseNo+'&userID='+this.$loginInfo.account+'&qty='+this.formData.fcovertQty
+ });
+ },
+ toYzxSubmitFrom(releaseNo){
+ uni.navigateTo({
+ url: 'yzxFrom?id=' +this.formData.id+'¤t='+this.current
});
},
editRemarks() {
@@ -640,7 +726,7 @@
color: white;
}
/* 鍝嶅簲寮忚璁� */
-@media (max-width: 700px) {
+@media (max-width: 500px) {
.info-row, .info-block {
flex-direction: column;
align-items: flex-start;
@@ -660,4 +746,6 @@
overflow-x: auto;
}
}
+
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3