From 5a50ffefc186e562c361c7fe672cb0d747dd3130 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 27 一月 2026 17:28:50 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
manifest.json | 4 +++-
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 2 ++
3 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/manifest.json b/manifest.json
index a17e3cc..20eb879 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,6 +2,7 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
+
"versionName" : "2.0.63",
"versionCode" : 263,
"transformPx" : false,
@@ -162,7 +163,8 @@
"LcPrinter" : {
"__plugin_info__" : {
"name" : "LcPrinter",
- "description" : "鎵撳嵃鎻掍欢",
+ // "description" : "鎵撳嵃鎻掍欢",
+ "description" : "鏂扮増鎵撳嵃鎻掍欢",
"platforms" : "Android",
"url" : "",
"android_package_name" : "",
diff --git a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
index bf4ee68..7004637 100644
--- a/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
+++ b/pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue
@@ -72,6 +72,7 @@
<button class="op3" size="mini" plain @tap.stop="fileUpload(item)">鏂囦欢涓婁紶</button>
<button class="op3" size="mini" plain @tap.stop="getImage(item)">棰勮鍥剧墖</button>
<button class="op3" size="mini" plain @tap.stop="Reject(item)">椹冲洖</button>
+ <button class="op3" size="mini" plain @tap.stop="selected(item)">鏌ョ湅鏄庣粏</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
@@ -119,10 +120,12 @@
listData: [],
showList: [],
page: 1,
- HSourceBillTypeList: {棣栦欢妫�楠屽崟:'8505',鏈欢妫�楠屽崟:'8507'},
+ HSourceBillTypeList: {棣栦欢妫�楠屽崟:'8505',鏈欢妫�楠屽崟:'8507',閲囪喘璁㈠崟:'1102',閿�鍞鍗�:'1401'},
arrayHSourceBillTypeName: [
"棣栦欢妫�楠屽崟",
"鏈欢妫�楠屽崟",
+ "閲囪喘璁㈠崟",
+ "閿�鍞鍗�"
],
}
},
@@ -250,6 +253,22 @@
CurUserName: getUserInfo()["Czymc"],
CurUserID:getUserInfo()["Czybm"],
}
+ }else if(this.hform.HSourceBillType=='1102'){
+ url = 'Cg_POOrderBill/AuditCg_POOrderBill_Flow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1401'){
+ url = 'Xs_SeOrderBill/AuditXs_SeOrderBill_Flow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ IsAudit: mode,
+ CurUserName: getUserInfo()["Czymc"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
}
try{
let res = await CommonUtils.doRequest2Sync({
@@ -303,6 +322,18 @@
}
}else if(this.hform.HSourceBillType=='8507'){
url = 'QC_ProcessCheckBill/RejectCheckFlow',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1401'){
+ url = 'Xs_SeOrderBill/RejectCheckFlow_POOrderBill',
+ ajaxData= {
+ HInterID: item["hmainid"],
+ CurUserID:getUserInfo()["Czybm"],
+ }
+ }else if(this.hform.HSourceBillType=='1102'){
+ url = 'Cg_POOrderBill/RejectCheckFlow_POOrderBill',
ajaxData= {
HInterID: item["hmainid"],
CurUserID:getUserInfo()["Czybm"],
@@ -403,6 +434,23 @@
}
})
},
+ async selected(item)
+ {
+ if(this.hform.HSourceBillType=='1401') //閿�鍞�
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/xiaoshoudingdan/xiaoshoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }else if(this.hform.HSourceBillType=='1102') //閲囪喘
+ {
+ console.log(item)
+ uni.navigateTo({
+ url: '/pages/caigoudingdan/caigoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+ })
+ }
+
+ },
// 涓婁紶鏂囦欢
fileUpload(item) {
this.uploadOptions.formData.HBillNo = item.鍗曟嵁鍙�
@@ -476,6 +524,7 @@
}
}
},
+
onShow() {
this.$nextTick(() => {
this.cmdSearch()
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index e7daec9..a5ac33c 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -652,6 +652,8 @@
message: `涓婁紶鎴愬姛`
})
this.attachmentInfo = []
+ // 鍒锋柊鍗曟嵁鍙凤紝闃叉鍗曟嵁鍙烽噸澶�
+ this.GetMaxNumPDA()
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
--
Gitblit v1.9.1