From bd9a4b7d3b8979297124f9a68f5a1e40bd2cec96 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 16 三月 2026 09:46:23 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/jishikucunchaxun/table.vue | 9 +++++++++
pages/gongxuOut/Cj_StationOutBill_Standard.vue | 36 ++++++++++++++++++------------------
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/pages/gongxuOut/Cj_StationOutBill_Standard.vue b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
index 1ce8c9d..ef003e0 100644
--- a/pages/gongxuOut/Cj_StationOutBill_Standard.vue
+++ b/pages/gongxuOut/Cj_StationOutBill_Standard.vue
@@ -663,9 +663,9 @@
}
}
- this.getHMaterList()
- this.getHProcList()
- this.getHSupList()
+ //this.getHMaterList()
+ //this.getHProcList()
+ //this.getHSupList()
this.getHSourceList()
this.getHGroupList()
this.getHEmpList()
@@ -1059,7 +1059,7 @@
this.$forceUpdate();
} else {
uni.showToast({
- title: res.data.Message,
+ title: "鐝粍鑾峰彇澶辫触"+res.data.Message,
icon: 'none'
})
}
@@ -1163,13 +1163,13 @@
uni.request({
url: this.serverUrl + '/api/newBill/getWorkCenterList',
data: {
- sWhere: ''
+ sWhere: ' and HUSEORGID = '+uni.getStorageSync('OrganizationID')
},
success: (res) => {
if (res.data.code == 1) {
- this.HCenterNameList = res.data.data.Gy_Source
- for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
- this.arrayHCenterName[i] = res.data.data.Gy_Source[i].宸ヤ綔涓績
+ this.HCenterNameList = res.data.data.Gy_WorkCenter
+ for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
+ this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].宸ヤ綔涓績
}
this.$forceUpdate();
} else {
@@ -1712,7 +1712,7 @@
},
addNew() {
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
})
},
submit() {
@@ -1788,7 +1788,7 @@
})
setTimeout(() => {
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBillList'
+ url: '/pages/gongxuOut/Cj_StationOutBill_StandardList'
})
}, 1000)
} else {
@@ -1800,7 +1800,7 @@
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
this.getNextProc()
// uni.redirectTo({
- // url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ // url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
// })
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1808,17 +1808,17 @@
// uni.navigateBack();
// }, 50)
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
})
}
}
});
}
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: res.data.Message
+ })
}
},
fail: (res) => {
@@ -1974,13 +1974,13 @@
icon: 'none'
})
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
})
}else{
this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
uni.redirectTo({
- url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
+ url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1&HBarCode='+HNextBarCode
})
}
}else{
diff --git a/pages/jishikucunchaxun/table.vue b/pages/jishikucunchaxun/table.vue
index 7988855..c3b6361 100644
--- a/pages/jishikucunchaxun/table.vue
+++ b/pages/jishikucunchaxun/table.vue
@@ -51,6 +51,15 @@
<view class="detail" v-if="item['鐗╂枡鍚嶇О']">
<text>鐗╂枡鍚嶇О锛�</text>{{item['鐗╂枡鍚嶇О']}}
</view>
+ <view class="detail" v-if="item['鏁伴噺']">
+ <text>鐗╂枡鏉＄爜鍓╀綑鏁伴噺锛�</text>{{item['鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['鏉＄爜搴撳瓨鏁伴噺']">
+ <text>鏉＄爜搴撳瓨鎬绘暟閲忥細</text>{{item['鏉＄爜搴撳瓨鏁伴噺']}}
+ </view>
+ <view class="detail" v-if="item['閲戣澏搴撳瓨鏁伴噺']">
+ <text>閲戣澏搴撳瓨鏁伴噺锛�</text>{{item['閲戣澏搴撳瓨鏁伴噺']}}
+ </view>
<view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
<text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
</view>
--
Gitblit v1.9.1