From f5287b188f882f8d4bc2c6d0e3ca2638c50159c8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 28 一月 2026 09:34:19 +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 +++++++++++++++++++++++++
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue | 14 +++---
2 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
index 553f399..da967e7 100644
--- a/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
+++ b/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
@@ -80,13 +80,6 @@
</view>
</view>
<view class="form-item">
- <view class="title">闂鏉ユ簮:</view>
- <view class="right">
- <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
- @input="HFormChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
<view class="title">鐢熶骇璧勬簮:</view>
<view class="right">
<uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨" v-model="hform.HSourceName"
@@ -150,6 +143,13 @@
<template v-if="tabs == 1">
<view class="form">
<view class="form-item">
+ <view class="title">闂鏉ユ簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHForm" placeholder="璇烽�夋嫨闂鏉ユ簮" v-model="hform.HForm"
+ @input="HFormChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
<view class="title">鎺ユ敹閮ㄩ棬:</view>
<view class="right">
<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HRecDeptName"
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()
--
Gitblit v1.9.1