From 4ca2b716f8861633dae19d13aab738cfa995188b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 17 三月 2026 11:02:01 +0800
Subject: [PATCH] 检验单 下推 生成 异常反馈单 修改
---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 2
pages/baogong/OA_ErrMsgBackBill.vue | 152 ++++++++++++++++++++++++++++++++++++++++++++++++--
manifest.json | 4
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 2
.hbuilderx/launch.json | 2
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue | 4
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 2
pages/baogong/DayPlanBillList.vue | 2
8 files changed, 153 insertions(+), 17 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index c9b1af1..49a12f7 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -26,7 +26,7 @@
"localRepoPath" : "C:/Users/19858/Desktop/鏅轰簯杩堟��/APP/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.iflytek.inputmethod",
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
}
]
diff --git a/manifest.json b/manifest.json
index 6594c99..e8b663c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.095",
- "versionCode" : 295,
+ "versionName" : "2.096",
+ "versionCode" : 296,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
index c62e755..c9dbf23 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
@@ -545,7 +545,7 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast"
+ url: "./Kf_QCStockInCheckBill_Fast2"
})
},
async cmdSubmit() { // 鍚庣鍦ㄥ崟娆′笂浼犳枃浠舵彁浜ゅ悗浼氬垹闄ゆ湰鍦版枃浠讹紝涓�娆″彧鑳芥彁浜や竴涓暟鎹�
@@ -597,7 +597,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: './kf_QCStockInCheckBill_Fast2'
+ url: '/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 5ad8fa7..8af49b4 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -703,7 +703,7 @@
'&HSourceName=' + this.hform.HSourceName +
'&HSourceBillNo=' + this.hform.HSourceBillNo +
'&HType=' + item +
- '&OperationType=4&linterid=&HSouceBillType=7507'
+ '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7507'
})
},
// 婧愬崟绫诲瀷閫夋嫨
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index e5a74f4..914d70f 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -2146,7 +2146,7 @@
'&HSourceName=' + this.hform.HSourceName +
'&HSourceBillNo=' + this.hform.HSourceBillNo +
'&HType=' + item +
- '&OperationType=4&linterid=&HSouceBillType=7505'
+ '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7505'
})
},
async auditBill() {
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 3a0170e..8039c12 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -654,7 +654,7 @@
'&HSourceName=' + this.hform.HSourceName +
'&HSourceBillNo=' + this.hform.HSourceBillNo +
'&HType=' + item +
- '&OperationType=4&linterid=&HSouceBillType=7520'
+ '&OperationType=5&linterid='+ this.hform.HInterID +'&HSouceBillType=7520'
})
},
// 婧愬崟绫诲瀷閫夋嫨
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index 4e5257d..b49420d 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -1,6 +1,6 @@
<template>
<view class="content">
- <view class="list">
+ <view class="list" v-if="currentOrder.length > 0">
<uni-card :title="'褰撴湡璁㈠崟锛�'+currentOrder[0].HSourceBillNo"
style="margin: 10px;">
<view class="card-detail">
diff --git a/pages/baogong/OA_ErrMsgBackBill.vue b/pages/baogong/OA_ErrMsgBackBill.vue
index 5f20f76..7095aaa 100644
--- a/pages/baogong/OA_ErrMsgBackBill.vue
+++ b/pages/baogong/OA_ErrMsgBackBill.vue
@@ -383,6 +383,16 @@
HUpDateDate: '',
HChecker: '',
HCheckDate: '',
+
+ HICMOInterID: 0,
+ HICMOEntryID: 0,
+ HICMOBillNo: '',
+
+ HProcExchInterID: 0,
+ HProcExchEntryID: 0,
+ HProcExchBillNo: '',
+
+ HBarCode: '',
}
}
},
@@ -409,7 +419,15 @@
this.getMaxNum()
this.set_Sc_ICMOBillStatus(e.HSourceBillNo, e.HType, e.HSourceName); //鍥炲～淇℃伅
this.hform.HContext = e.HType
- this.hform.HBillTypeName = e.HSouceBillType
+ this.hform.HBillTypeName = e.HSouceBillType
+ this.eData = e
+ } else if (this.OperationType == 5) {
+ // 妫�楠屽崟璺宠浆
+ console.log('e: ', e);
+ this.getMaxNum()
+ this.set_CheckBillStatus(e.linterid, e.HType, e.HSourceName, e.HSouceBillType, e.HBarCode || ''); //鍥炲～淇℃伅
+ this.hform.HContext = e.HType
+ this.hform.HBillTypeName = e.HSouceBillType
this.eData = e
}
},
@@ -421,12 +439,23 @@
},
dynamicDesc: {
get() {
- return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
- .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
- ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
- .hform.HMaterModel +
- ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
- .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ if (this.OperationType == 4) {
+ return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
+ .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
+ ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
+ .hform.HMaterModel +
+ ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
+ .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ }
+ if (this.OperationType == 5) {
+ return '寮傚父鍙嶉鍗曞彿:' + this.hform.HBillNo + ',寮傚父绫诲瀷:' + this.eData.HType + ',璁㈠崟鍙�:' + this
+ .eData.HICMOBillNo + ',娴佽浆鍗″彿:' + this.eData.HICMOBillNo +
+ ', 浜у搧缂栫爜:' + this.hform.HMaterNumber + ',浜у搧鍚嶇О:' + this.hform.HMaterName + ',瑙勬牸鍨嬪彿:' + this
+ .hform.HMaterModel +
+ ',鍙戦�佷汉:' + this.hform.HMaker + ',鍙戠敓鏃堕棿:' + this.hform.HDate + ',鐢熶骇璧勬簮:' + this.hform
+ .HSourceName + ',璁惧缂栫爜:' + this.hform.EquipNumber + ',瀵瑰簲澶勭悊浜�:' + this.hform.HHandleEmpName
+ + `,妫�楠屽崟鍙�: ${this.hform.HMainSourceBillNo}`
+ }
}
}
},
@@ -845,6 +874,113 @@
},
});
},
+ // 妫�楠屽崟璺宠浆
+ async set_CheckBillStatus(HSourceInterID, HType, HSourceName, HSourceBillType, HBarCode) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Web/getCheckBillStatus',
+ data: {
+ HInterID: HSourceInterID,
+ HBillType: HSourceBillType
+ }
+ })
+
+ let {
+ data,
+ count,
+ message
+ } = res.data
+ if (count == 1) {
+ this.hform.HMaterNumber = data[0].浜у搧鍐呯爜 //浜у搧鍚嶇О
+ this.hform.HMaterName = data[0].浜у搧鍚嶇О //浜у搧鍚嶇О
+ this.hform.HMaterModel = data[0].浜у搧鍨嬪彿 //浜у搧瑙勬牸
+ this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙� //婧愬崟鍗曞彿
+ this.hform.HMainSourceInterID = data[0].hmainid //婧愬崟涓诲唴鐮�
+ this.hform.HMainSourceEntryID = data[0].hsubid //婧愬崟瀛愬唴鐮�
+ this.hform.HMainSourceBillType = HSourceBillType //婧愬崟绫诲瀷
+ this.hform.HQty = data[0].妫�楠屾暟閲� //璁″垝鏁伴噺
+ this.hform.HSourceID = data[0].HSourceID //鐢熶骇璧勬簮id
+ this.hform.HSourceName = data[0].鐢熶骇璧勬簮鍚嶇О //鐢熶骇璧勬簮
+ this.hform.HProcExchBillNo = data[0].宸ュ簭娴佽浆鍗″彿 //婧愬崟鍗曞彿
+ this.hform.HProcExchEntryID = data[0].HProcExchInterID //婧愬崟涓诲唴鐮�
+ this.hform.HProcExchInterID = data[0].HProcExchEntryID //婧愬崟瀛愬唴鐮�
+ this.hform.HICMOBillNo = data[0].鐢熶骇璁㈠崟鍙�
+ this.hform.HICMOInterID = data[0].HICMOInterID
+ this.hform.HICMOEntryID = data[0].HICMOEntryID
+
+ this.hform.HBarCode = data[0]["鏉＄爜"] || ''
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓嬫帹寮傚父鍙嶉鍗曞け璐�: ${message}`
+ })
+ }
+
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/Get_ErrMsgBackType',
+ type: "GET",
+ data: {
+ "TypeName": HType
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ if (res.data.count == 1) {
+ this.hform.HErrMsgBackTypeID = data.HItemID
+ this.hform.HErrMsgBackTypeName = data.HName
+ } else {
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷鏁版嵁澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇寮傚父绫诲瀷澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ uni.request({
+ url: this.serverUrl + '/Sc_MESTransFerWorkBill/set_EquipFile',
+ type: "GET",
+ data: {
+ "HSourceName": HSourceName
+ },
+ success: (res) => {
+ var data = res.data.data[0]
+ console.log(res.data)
+ if (res.data.count == 1) {
+ this.hform.EquipNumber = data.璁惧缂栫爜
+
+ this.getEquipBindingEmpInfo()
+ } else {
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇璁惧缂栫爜澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `涓嬫帹寮傚父鍙嶉鍗曞け璐�: ${err}`
+ })
+ }
+ },
//鎶ュ伐鍙拌烦杞�
set_Sc_ICMOBillStatus(HSourceBill, HType, HSourceName) {
uni.request({
@@ -1099,7 +1235,7 @@
uni.showLoading({
title: '璇风◢鍊�'
})
- if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4) {
+ if (this.OperationType == 1 || this.OperationType == 2 || this.OperationType == 4 || this.OperationType == 5) {
this.refSav = "Add";
}
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
--
Gitblit v1.9.1