From de8ded5d2e7ebc42c1a204199aa9bd8aa7106763 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 07 八月 2025 16:54:01 +0800
Subject: [PATCH] 修改采购订单页面 修改取值逻辑 修改采购订单页面条码打印传值逻辑 打印模板
---
pages/caigoudingdan/generate.vue | 225 +++++++++++++++++++++++++++-----------------
pages/tiaomadaying/tiaomadaying.vue | 2
pages/caigoudingdan/caigoudingdan.vue | 14 +-
3 files changed, 147 insertions(+), 94 deletions(-)
diff --git a/pages/caigoudingdan/caigoudingdan.vue b/pages/caigoudingdan/caigoudingdan.vue
index b75cc51..da4217d 100644
--- a/pages/caigoudingdan/caigoudingdan.vue
+++ b/pages/caigoudingdan/caigoudingdan.vue
@@ -32,7 +32,7 @@
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
- <view class="list" v-for="(item,index) in listData" :key="index" @tap="toSon(item, index+1)">
+ <view class="list" v-for="(item,index) in listData" :key="index" @tap="toSon(item)">
<uni-card :title="item.鐗╂枡浠ｇ爜" :extra="'No. ' + Number(index+1)" style="margin: 10px;">
<view class="card-detail">
<view class="detail">
@@ -44,6 +44,10 @@
<view class="detail">
<text>璁㈠崟鏁伴噺锛�</text>{{item.鏁伴噺}}
</view>
+ <view class="detail">
+ <text>琛屽彿锛�</text>{{item.琛屽彿}}
+ </view>
+
</view>
</uni-card>
@@ -114,9 +118,9 @@
if(count == 1 && Array.from(data).length> 0){
CommonUtils.playSound(1)
this.baseInfo = {
- HBillNo: data[0].鍗曟嵁鍙�,
- HSupName: data[0].渚涘簲鍟�,
- HDeptName: data[0].閮ㄩ棬,
+ HBillNo: data[0]['鍗曟嵁鍙�'],
+ HSupName: data[0]['渚涘簲鍟�'],
+ HDeptName: data[0]['閮ㄩ棬'],
HInterID: data[0].hmainid,
}
this.listData = data
@@ -147,7 +151,7 @@
},
toSon(item, lineNo) {
uni.navigateTo({
- url: `./generate?OperationType=1&closeType=1&linterid=${this.baseInfo.HInterID}&hmaterid=${item["HMaterID"]}&lineNo=${lineNo}`
+ url: `./generate?OperationType=1&closeType=1&billNo=${item['鍗曟嵁鍙�']}&lineNo=${item['琛屽彿']}`
})
}
}
diff --git a/pages/caigoudingdan/generate.vue b/pages/caigoudingdan/generate.vue
index dc3a29a..b7e2f02 100644
--- a/pages/caigoudingdan/generate.vue
+++ b/pages/caigoudingdan/generate.vue
@@ -98,6 +98,7 @@
export default {
data() {
return {
+ billNo: '',
lineNo: 0,
printInfo: "",
userInfo: getUserInfo(),
@@ -108,23 +109,33 @@
hmaterid: '',
codeGenComplete: false,
baseInfo: {
- HBillNo: '',
HMainID: '',
- HSupName: '',
HSubID: '',
HOrderBillNo: '',
HMaterID: '',
+ // barCodeNo: '',
+ HBillNo: '',
+ HBillLineNo: '',
HMaterNumber: '',
HMaterName: '',
HMaterModel: '',
- HQty: '',
- HMTONo: '',
- HQty: '',
- HMinQty: '',
- HBQty: '',
- HSupID: '',
+ HPcsName: '',
HBatchNo: '',
+ HQty: 0,
+ HMTONo: '',
+ HSupName: '',
+ HSupNameShort: '',
+ HMinQty: 0,
+ HBQty: 0,
+ HSupID: '',
+ HUnitID: '',
HDate: '',
+ HSourceBillNo: '',
+ HMaker: getUserInfo()["Czymc"],
+ HSupNumber: '',
+ HStyleNo: '',
+ HGroup: '',
+ HCustomNo: '',
},
sWhere: '',
listData: [],
@@ -135,10 +146,9 @@
labelPrinterComponentVue
},
onLoad(e) {
- console.log("椤甸潰浼犻�掑弬鏁�: ",e)
+ console.log("椤甸潰浼犻�掑弬鏁�: ", e)
this.OperationType = e.OperationType
- this.linterid = e.linterid
- this.hmaterid = e.hmaterid
+ this.billNo = e.billNo
this.lineNo = e.lineNo
this.getData()
},
@@ -146,8 +156,8 @@
getData() {
CommonUtils.doRequest(
"/Cg_POOrderBill/list", {
- sWhere: ` and hmainid = ${this.linterid} and HMaterID = ${this.hmaterid}`,
- user: this.userInfo.Czymc
+ sWhere: ` and 鍗曟嵁鍙� = '${this.billNo}' and 琛屽彿 = ${this.lineNo}`,
+ user: this.userInfo.Czymc,
},
(res) => {
console.log('閲囪喘璁㈠崟: ', res)
@@ -156,22 +166,32 @@
count
} = res.data
if (count > 0) {
- this.baseInfo = {
- HMainID: data[0]['hmainid'],
- HSubID: data[0]['HEntryID'],
- HBillNo: data[0]['鍗曟嵁鍙�'],
- HMaterID: data[0]['HMaterID'],
- HMaterNumber: data[0]['鐗╂枡浠ｇ爜'],
- HMaterName: data[0]['鐗╂枡鍚嶇О'],
- HMaterModel: data[0]['瑙勬牸鍨嬪彿'],
- HQty: data[0]['鏁伴噺'],
- HMTONo: data[0]['璁″垝璺熻釜鍙�'],
- HSupID: data[0]['HSupID'],
- HBatchNo: data[0]['鎵瑰彿'],
- HSupName: data[0]['渚涘簲鍟�'],
- HBatchNo: data[0]['鎵瑰彿'],
- HDate: data[0]['鏃ユ湡'],
- }
+ let d = data[0]
+ this.baseInfo = Object.assign(this.baseInfo, {
+ HMaterNumber: d['鐗╂枡缂栫爜'],
+ HMaterName: d['鐗╂枡鍚嶇О'],
+ HMaterModel: d['瑙勬牸鍨嬪彿'],
+ // HBatchNo: d['鎵瑰彿'],
+ HQty: d['鏁伴噺'],
+ HMinQty: d['鏁伴噺'],
+ HBQty: d['鏁伴噺'],
+ HSupID: d['HSupID'],
+ HSupNumber: d['渚涘簲鍟嗕唬鐮�'],
+ HSupName: d['渚涘簲鍟�'],
+ HUnitID: d['HUnitID'],
+ HPcsName: d['璁￠噺鍗曚綅'],
+ HSupNameShort: d['渚涘簲鍟�'],
+ HMTONo: d['璁″垝璺熻釜鍙�'],
+ HMainID: d['hmainid'],
+ HSubID: d['HEntryID'],
+ HMaterID: d['HMaterID'],
+ HDate: d['鏃ユ湡'],
+ HStyleNo: d['娆惧彿'],
+ HGroup: d['鍒嗙粍'],
+ HCustomNo: d['瀹㈡埛缂栧彿']
+ })
+ console.log(this.baseInfo)
+ // CommonUtils.playSound(1)
this.listData = data
} else {
uni.showToast({
@@ -204,6 +224,9 @@
if (this.$printer.isConnected() === false) {
this.$refs.labelPrinter.openPopup()
} else {
+ let HBarCodeNoStr =
+ `${this.baseInfo.HBillNo}@${this.baseInfo.HBillLineNo}@${this.baseInfo.HMaterNumber || ''}@${this.baseInfo.HMTONo || ''}@${this.baseInfo.HQty || 0}@${this.baseInfo.HSupNumber || ''}`
+ let pcsInfo = this.baseInfo.HPcsName ? '(' + this.baseInfo.HPcsName + ')' : ''
let printContent = []
let printInfoBuffer = []
let count = 0
@@ -211,38 +234,42 @@
printContent.push(`! 0 200 200 400 1
PAGE-WIDTH 608
SETQRVER 3
-B QR 500 30 M 2 U 3
-LA,${listOne['鏉＄爜缂栧彿']}
+B QR 475 15 Q 0 U 3
+LA,${HBarCodeNoStr}
ENDQR
-T 24 0 10 30 渚涘簲鍟�: ${this.baseInfo.HSupName}
-T 24 0 10 55 (eng)
-T 24 0 10 80 渚涘簲鍟嗘枡鍙�: ${this.baseInfo.HMaterNumber}
-T 24 0 10 105 (eng)
-T 24 0 10 130 鐗╂枡鍚嶇О: ${this.baseInfo.HMaterName}
-T 24 0 5 155 (eng)
-T 24 0 5 180 鍒嗙粍: ${this.baseInfo.HBatchNo}
-T 24 0 5 205 (eng)
-T 24 0 300 180 瑙勬牸: ${this.baseInfo.HMaterModel}
-T 24 0 300 205 (eng)
-T 24 0 10 230 鏁伴噺: ${this.baseInfo.HQty} (${this.baseInfo.HPcsName})
-T 24 0 5 255 (eng)
-T 24 0 300 230 鏃ユ湡: ${this.baseInfo.HDate}
-T 24 0 300 255 (eng)
-T 24 0 5 280 妫�楠屽憳:
-T 24 0 5 305 (eng)
-T 24 0 300 280 閲囪喘鍗曞彿: ${this.baseInfo.HBillNo || ''}
-T 24 0 300 305 (eng)
-T 24 0 5 330 妫�楠岀粨鏋�:
-T 24 0 5 355 (eng)
-BOX 260 330 280 350 4
-T 24 0 290 330 鍚堟牸
-T 24 0 290 355 (eng)
-BOX 360 330 380 350 4
-T 24 0 390 330 涓嶅悎鏍�
-T 24 0 390 355 (eng)
-BOX 480 330 500 350 4
-T 24 0 510 330 鐗归噰
-T 24 0 510 355 (eng)
+T 24 0 0 30 渚涘簲鍟�: ${this.baseInfo.HSupName}
+T 55 0 0 55 (Supplier)
+T 24 0 0 75 渚涘簲鍟嗘枡鍙�: ${this.baseInfo.HMaterNumber}
+T 55 0 0 100 (Supplier Sku No.)
+T 24 0 0 120 鐗╂枡鍚嶇О: ${this.baseInfo.HMaterName}
+T 55 0 0 145 (Material Code)
+T 24 0 0 165 娆惧彿: ${this.baseInfo.HStyleNo}
+T 55 0 0 190 (Style No.)
+T 24 0 300 165 瀹㈡埛缂栧彿: ${this.baseInfo.HCustomNo}
+T 55 0 300 190 (Consumer No.)
+T 24 0 0 210 鍒嗙粍: ${this.baseInfo.HGroup || ''}
+T 55 0 0 235 (Group)
+T 24 0 300 210 瑙勬牸: ${this.baseInfo.HMaterModel}
+T 55 0 300 235 (SKU NO.)
+T 24 0 0 255 鏁伴噺: ${ parseFloat(this.baseInfo.HQty || 0).toFixed(0) } ${pcsInfo}
+T 55 0 0 280 (Quantity)
+T 24 0 300 255 鏃ユ湡: ${this.baseInfo.HDate || ''}
+T 55 0 300 280 (Date)
+T 24 0 0 300 妫�楠屽憳:
+T 55 0 0 325 (QC)
+T 24 0 300 300 閲囪喘鍗曞彿: ${this.baseInfo.HBillNo || ''}
+T 55 0 300 325 (Purchase Order No.)
+T 24 0 0 345 妫�楠岀粨鏋�:
+T 55 0 0 370 (Inspection status)
+BOX 240 345 260 365 4
+T 24 0 270 345 鍚堟牸
+T 55 0 250 370 (Pass)
+BOX 340 345 360 365 4
+T 24 0 370 345 涓嶅悎鏍�
+T 55 0 370 370 (Fail)
+BOX 460 345 480 365 4
+T 24 0 490 345 鐗归噰
+T 55 0 440 370 (Spec. accepted)
FORM
PRINT`)
count++;
@@ -263,6 +290,8 @@
}
},
getList() {
+ let HBarCodeNoStr =
+ `${this.baseInfo.HBillNo}@${this.baseInfo.HBillLineNo}@${this.baseInfo.HMaterNumber || ''}@${this.baseInfo.HMTONo || ''}@${this.baseInfo.HQty || 0}@${this.baseInfo.HSupNumber || ''}`
var sMain = []
sMain[0] = this.baseInfo
var sMainStr = JSON.stringify(sMain);
@@ -276,35 +305,55 @@
var HSelectBarCodeType = "鍝佺鏉＄爜";
//鑾峰彇褰撳墠鐧诲綍浜哄憳
var UserName = uni.getStorageSync('HUserName');
- var sMainSub = sMainStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' +
- CampanyName + ';' + UserName;
- uni.request({
- url: this.serverUrl + '/Sc_BarCode/Sub_SaveBill',
- method: 'POST',
- data: {
- msg: sMainSub,
- CampanyName: CampanyName
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.listData = res.data.data
+ let sMainSub = sMainStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' +
+ CampanyName + ';' + UserName + ';' + HBarCodeNoStr;
+ CommonUtils.doRequest(
+ "/Sc_BarCode/SaveBarCode_NoGenerate", {
+ msg: sMainSub,
+ CampanyName: CampanyName
+ },
+ (res) => {
+ console.log(res)
+ let {
+ data,
+ count,
+ Message
+ } = res.data
+ if (count > 0) {
+ // this.generatedBarCode = data[0]['鏉＄爜缂栧彿']/
+ // console.log(this.generatedBarCode)
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
this.codeGenComplete = true
- } else {
- this.codeGenComplete = false
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
+ this.buttonStatus = {
+ btn1: true,
+ btn2: false
+ }
+ } else {
+ this.buttonStatus = {
+ btn1: false,
+ btn2: false
+ }
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ }
+ },
+ (err) => {
+ this.buttonStatus = {
+ btn1: false,
+ btn2: false
+ }
+ uni.showToast({
+ icon: 'none',
+ title: err
+ })
+ },
+ "POST"
+ )
}
}
}
diff --git a/pages/tiaomadaying/tiaomadaying.vue b/pages/tiaomadaying/tiaomadaying.vue
index fffa3a1..68dfb7c 100644
--- a/pages/tiaomadaying/tiaomadaying.vue
+++ b/pages/tiaomadaying/tiaomadaying.vue
@@ -234,7 +234,7 @@
},
setLailiaoInfo(data, row, HQty) {
let d = data[0]
- console.log('鏁伴噺: ', parseFloat(d['鏁伴噺']).toFixed(10));
+ // console.log('鏁伴噺: ', parseFloat(d['鏁伴噺']).toFixed(10));
this.lailiaoInfo = Object.assign(this.lailiaoInfo, {
HMaterNumber: d['鐗╂枡缂栫爜'],
HMaterName: d['鐗╂枡鍚嶇О'],
--
Gitblit v1.9.1