From 46cc7a29dc1f9b3dffee5cdcb9b7f9dfdac3b16d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 05 九月 2025 20:44:14 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/saomachuku/table.vue | 159 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 119 insertions(+), 40 deletions(-)
diff --git a/pages/saomachuku/table.vue b/pages/saomachuku/table.vue
index 8071e68..79c297d 100644
--- a/pages/saomachuku/table.vue
+++ b/pages/saomachuku/table.vue
@@ -61,19 +61,19 @@
<text>鍓╀綑鍙嚭搴撴暟閲忥細</text>{{item['鏁伴噺'] - item['宸插叧鑱旀暟閲�']}}
</view>
</view>
- <view class="more" v-if="operations != index">
+ <!-- <view class="more" v-if="operations != index">
<view class="part" @tap.stop="operations = operations==index?-1:index">
<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
size="14"></uni-icons>鎿嶄綔
</view>
- </view>
+ </view> -->
- <view class="op" v-if="operations == index">
+ <!-- <view class="op" v-if="operations == index">
<input class="input1" type="number" v-model="SeOutNumber" />
<button class="op3" size="mini" plain @tap.stop="submit(item)">鍑哄簱</button>
<button class="op5" size="mini" plain
- @tap.stop="operations = -1,this.SeOutNumber = 0">鍙栨秷鎿嶄綔</button>
- </view>
+ @tap.stop="operations = -1,SeOutNumber = 0">鍙栨秷鎿嶄綔</button>
+ </view> -->
</uni-card>
</view>
</view>
@@ -96,6 +96,7 @@
MpaasScan
} from '@/utils/mpaasScan.js'
export default {
+
data() {
return {
operations: -1,
@@ -106,7 +107,7 @@
arrayHStockPlaceName: [],
HIsStockMgr: false,
scrollTop: 0,
- HBarCode: '101.2100233250718000007',
+ HBarCode: '',
HMaterialID: '',
HBillNo: '',
HCustomer: '',
@@ -131,6 +132,8 @@
HBillSubType: 1205,
HDate: getDateTime.dateTimeStr('y-m-d'),
BillType: 1402,
+ HBillerID: uni.getStorageSync('HBillerID'),
+ HRedBlueFlag: false,
// 閫氳繃item璧嬪��
@@ -254,14 +257,59 @@
}]
}
},
+ props: {
+ HBillType: {
+ type: [String, Number],
+ required: true
+ },
+ HSourceBillType: {
+ type: [String, Number],
+ required: true
+ },
+ HStockOrgID: {
+ type: [String, Number],
+ required: true
+ },
+ },
methods: {
+ popupChangeHandler(e) {
+ if (e.show === true) {
+ this.getBillList()
+ } else {
+ // 娓呯悊璧勬簮
+ this.size = 20
+ this.curPage = 1
+ this.length = 0
+ this.page = 0
+ this.HSourceBillNo = ''
+ this.HMater = ''
+ this.HCustom = ''
+ this.HBillList = []
+ }
+ },
+ exit() {
+ this.$refs.popup.close();
+ },
+ search() {
+ this.getBillList()
+ },
+ showPopup() {
+ this.$refs.popup.open();
+ },
+ clickCard(interid, billno) {
+ uni.$emit('BillSelectComplete', {
+ HInterID: interid,
+ HBillNo: billno
+ })
+ // this.exit()
+ },
clearPage() {
- this.HMaterialID= ''
- this.HBillNo= ''
- this.HCustomer= ''
- this.HSeller= ''
- this.SeOutNumber= 0
- this.operations= -1
+ this.HMaterialID = ''
+ this.HBillNo = ''
+ this.HCustomer = ''
+ this.HSeller = ''
+ this.SeOutNumber = 0
+ this.operations = -1
},
toScanCode() {
var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
@@ -285,6 +333,7 @@
console.log('barCodeMeta: ', barCodeMeta);
this.HMaterialID = barCodeMeta[0]['HMaterID']
this.getMater()
+ console.log('鎵ц: getMater')
this.cmdSearch()
} catch (err) {
return
@@ -312,11 +361,11 @@
HBillNo,
HInterID
} = MaxNum[0]
-
+
this.hform.HBillNo = HBillNo
this.hform.HInterID = HInterID
- this.hform.HSourceBillNo = item['鍗曟嵁鍙�']
- this.hform.HSourceBillType = item['HBillType']
+ this.hform.HMainSourceBillNo = item['鍗曟嵁鍙�']
+ this.hform.HMainSourceBillType = item['HBillType']
this.hform.HMainSourceInterID = item['hmainid']
this.hform.HMainSourceEntryID = item['hsubid']
this.hform.HEmpName = item['涓氬姟鍛�']
@@ -324,7 +373,7 @@
this.hform.HDeptID = item['HDeptID']
this.hform.HDeptName = item['閮ㄩ棬']
this.hform.HSupName = item['瀹㈡埛']
- this.hform.HSupID = item['HSupID']
+ this.hform.HSupID = item['HCusID']
this.hform.HLinkMan = item['HLinkMan']
this.hform.HLinkPhone = item['鑱旂郴鐢佃瘽']
this.hform.HManagerID = item['HManagerID']
@@ -339,10 +388,11 @@
this.hform.HExRate = Number(item['姹囩巼'])
this.hform.HSellSID = '0'
this.hform.HSellSName = item['閿�鍞柟寮�']
- let HQty = this.SeOutNumber;
+ this.hform.HChecker = getUserInfo()["Czymc"]
+ let HQty = this.SeOutNumber;
let HPrice = item['鍗曚环']; //鍗曚环
let HMoney = HQty * HPrice;
- console.log(this.materMeta)
+ console.log("materMeta", this.materMeta)
this.subform[0] = {
'HMaterID': this.materMeta['HItemID'],
"鐗╂枡浠ｇ爜": this.materMeta['鐗╂枡浠ｇ爜'],
@@ -401,9 +451,11 @@
}
await this.$nextTick()
+
+
let sMainStr = JSON.stringify(this.hform)
let sSubStr = JSON.stringify(this.subform)
- let sMainSub = sMainStr + ';' + sSubStr + ';' + getUserInfo()["Czymc"] + ';' + 1;
+ let sMainSub = sMainStr + ';' + sSubStr + ';' + getUserInfo()["Czymc"] + ';' + 1;
CommonUtils.doRequest2({
method: 'POST',
@@ -411,31 +463,20 @@
data: {
msg: sMainSub
},
- resFunction: (res) => {
+ resFunction: async (res) => {
let {
count,
Message
} = res.data
- if (count = 1) {
- uni.showModal({
- title: '鎻愪氦鎴愬姛',
- content: '鏄惁缁х画鍑哄簱?',
- success: (res) => {
- if (res.confirm) {
- this.clearPage()
- this.getCode()
- } else if (res.cancel) {
- uni.navigateBack()
- }
- }
- });
- }else {
+ if (count == 1) {
+ await this.set_CheckBill()
+ } else {
uni.showToast({
icon: 'none',
title: Message
})
}
-
+
}
})
@@ -472,6 +513,44 @@
errFunction: () => {
reject()
}
+ })
+ })
+ },
+ set_CheckBill() {
+ return new Promise((resolve, reject) => {
+ CommonUtils.doRequest2({
+ url: "/Kf_SellOutBill/AuditKf_SellOutBill",
+ data: {
+ "HInterID": this.hform.HInterID,
+ "IsAudit": 0,
+ "CurUserName": getUserInfo()['Czymc']
+ },
+ resFunction: (res) => {
+ let {
+ count,
+ Message,
+ data
+ } = res.data
+ if (count == 1) {
+ uni.showModal({
+ title: '鎻愪氦鎴愬姛',
+ content: '鏄惁缁х画鍑哄簱?',
+ success: (res) => {
+ if (res.confirm) {
+ this.clearPage()
+ this.getCode()
+ } else if (res.cancel) {
+ uni.navigateBack()
+ }
+ }
+ });
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '鎻愪氦鎴愬姛锛岃嚜鍔ㄥ鏍稿け璐ワ紝璇锋墜鍔ㄥ鏍�'
+ })
+ }
+ },
})
})
},
@@ -512,7 +591,7 @@
sWhere: ` and 1 = 1 and HItemID = ${this.HMaterialID}`,
user: getUserInfo()['Czymc'],
// Organization: uni.getStorageSync('Organization'),
- Organization: '',
+ Organization: uni.getStorageSync('Organization'),
page: 1,
size: 50,
},
@@ -522,9 +601,9 @@
Message,
data
} = res.data
- if (count > 0) {
+ if (count == 1) {
this.materMeta = data[0]
-
+
this.$forceUpdate()
} else {
uni.showToast({
@@ -667,10 +746,10 @@
<style lang="scss" scoped>
.page {
/* #ifdef APP */
- height: calc(100vh);
+ height: calc(80vh);
/* #endif */
/* #ifndef APP */
- height: calc(100vh - 44px);
+ height: calc(80vh - 44px);
/* #endif */
box-sizing: border-box;
padding: 20rpx 10rpx;
--
Gitblit v1.9.1