From 1be8d9547d45332fd2cd15206ddaf98baa565c3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 30 三月 2026 17:27:29 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/shengchanrukushengdan/Kf_ProductInBill.vue | 19 ++++++++++++++-----
pages.json | 6 ++++++
pages/index/login.vue | 2 +-
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue | 8 +++++---
pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue | 3 ++-
5 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/pages.json b/pages.json
index abfcf1d..0c04451 100644
--- a/pages.json
+++ b/pages.json
@@ -1749,6 +1749,12 @@
"navigationBarTitleText": "閿�鍞嚭搴撳崟(楠岃瘉)"
}
},
+ {
+ "path": "pages/tiaomamingxi/tiaomamingxi",
+ "style": {
+ "navigationBarTitleText": "鏉＄爜鏄庣粏"
+ }
+ },
{
"path": "pages/CustomerComplaintsBill/CustomerComplaintsBillList",
"style": {
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
index 9f94805..f5642f3 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue
@@ -41,7 +41,7 @@
</view>
<view class="card-item-wrapper">
<view v-for="(item, index) in materialManifest" :key="index">
- <uni-card :title="item.HSourceBillNo" :extra="item.F_WPVT_Text_tzk ? '璁㈠崟鍙凤細' + item.F_WPVT_Text_tzk : ''"
+ <uni-card :title="item.HSourceBillNo" :extra="item.瀹㈡埛璁㈠崟鍙� ? '璁㈠崟鍙凤細' + item.瀹㈡埛璁㈠崟鍙� : ''"
@tap="toDetail(item, index)">
<view class="card-detail">
<view class="detail">
@@ -208,7 +208,7 @@
<view class="title">璐ㄦ鍛�:</view>
<view class="right">
<uni-combox :candidates="HKeeperNameList" placeholder="璇烽�夋嫨璐ㄦ鍛�"
- v-model="detailManifestItem.HKeeperName" @input="HKeeperNameChange"></uni-combox>
+ v-model="sourceBillInfo.HKeeperName" @input="HKeeperNameChange"></uni-combox>
</view>
</view>
<view class="form-item">
@@ -320,7 +320,9 @@
sourceBillInfo: {
HSourceBillNo: '',
HBillNo: '',
- HInterID: ''
+ HInterID: '',
+ HKeeperID: getUserInfo()["HEmpID"],
+ HKeeperName: getUserInfo()["HEmpName"]
},
// 鐗╂枡娓呭崟
materialManifest: [],
diff --git a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
index 1f4ac04..aa1b92e 100644
--- a/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
+++ b/pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue
@@ -50,7 +50,8 @@
</view>
<view class="card-item-wrapper">
<view v-for="(item, index) in materialManifest" :key="index">
- <uni-card :class="item.selected?'card-selected':''" :title="item.HSourceBillNo" :extra="item.F_WPVT_Text_tzk ? '璁㈠崟鍙凤細' + item.F_WPVT_Text_tzk : ''"
+ <uni-card :class="item.selected?'card-selected':''" :title="item.HSourceBillNo"
+ :extra="item.瀹㈡埛璁㈠崟鍙� ? '璁㈠崟鍙凤細' + item.瀹㈡埛璁㈠崟鍙� : ''"
@tap="selectMater(item, index)">
<view class="card-detail">
<view class="detail">
diff --git a/pages/index/login.vue b/pages/index/login.vue
index be55746..ed44f07 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -114,7 +114,7 @@
"闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.88.82:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
- "鏉ㄦ潈閼湰鍦版祴璇�": 'http://192.168.0.81:8082/API/',
+ "鏉ㄦ潈閼湰鍦版祴璇�": 'http://172.20.10.2:8082/API/',
"鐜嬩华鏈湴娴嬭瘯": 'http://192.168.0.74:8080/API/',
// 灏忓崼鍐呭缃�
"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
diff --git a/pages/shengchanrukushengdan/Kf_ProductInBill.vue b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
index 0fda5a5..8688218 100644
--- a/pages/shengchanrukushengdan/Kf_ProductInBill.vue
+++ b/pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -776,13 +776,22 @@
this.arrayHMainSourceBillType = []
this.arrayHMainSourceBillValue = []
Array.from(data).forEach(e => {
- //this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
- for(var j = 0; j < this.$t("Kf_ProductInBill_PDA.select option").length; j++){
- let HSourceBillType_FY = this.$t("Kf_ProductInBill_PDA.select option[" + j + "]").split("@");
- if(e['HSourceBillType'] == HSourceBillType_FY[0]){
- this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ //鍒ゆ柇缈昏瘧妯″潡瀛楁鍐呭鏄惁瀛樺湪
+ if(this.$t("Kf_ProductInBill_PDA.select option").length > 0 ){
+ //寰幆缈昏瘧涓嬫媺妗嗗瓧娈靛唴瀹�
+ for(var j = 0; j < this.$t("Kf_ProductInBill_PDA.select option").length; j++){
+ //杩欓噷鏄簮鍗曠被鍨嬪姩鎬佸姞杞斤紝鑾峰彇缈昏瘧瀛楁鍐呭涓殑婧愬崟ID杩涜缈昏瘧鍖归厤
+ let HSourceBillType_FY = this.$t("Kf_ProductInBill_PDA.select option[" + j + "]").split("@");
+ //鍔ㄦ�佸姞杞界殑婧愬崟绫诲瀷ID涓庣炕璇戞枃浠朵腑璁剧疆鐨勬簮鍗曠被鍨婭D涓�鑷�
+ if(e['HSourceBillType'] == HSourceBillType_FY[0]){
+ //瀵规簮鍗曠被鍨嬫枃鏈繘琛岀炕璇戣祴鍊�
+ this.arrayHMainSourceBillType.push(HSourceBillType_FY[1])
+ }
}
}
+ else{
+ this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+ }
this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
})
--
Gitblit v1.9.1