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 | 102 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 84 insertions(+), 18 deletions(-) diff --git a/pages/QC/LLJ/Add.vue b/pages/QC/LLJ/Add.vue index 2b3c6f5..171d68d 100644 --- a/pages/QC/LLJ/Add.vue +++ b/pages/QC/LLJ/Add.vue @@ -5,10 +5,10 @@ <h1>鏉ユ枡妫�楠屽崟</h1> <view class="inspection-number">妫�楠屽崟鍙凤細{{formData.releaseNo}}</view> <!-- 閫犳ⅵ鑰呯壒娈婂姛鑳� --> - <view style="text-align: right;" > + <!-- <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> --> </view> <!-- 鍩烘湰淇℃伅鍖� --> @@ -57,6 +57,8 @@ <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> @@ -66,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> <!-- 妫�楠岄」鐩〃鏍� --> @@ -147,7 +159,8 @@ }, tableData: [], remarksPopup: false, - current:true + current:true, + type:"" } }, onLoad(options) { @@ -159,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') { @@ -237,7 +251,7 @@ 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() { @@ -265,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({ @@ -365,6 +426,11 @@ 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 -- Gitblit v1.9.3