From 3fbc75322d31f461431870253dfedfc534e1100c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 06 五月 2023 17:03:20 +0800
Subject: [PATCH] #
---
pages/stock/changePallet.vue | 1
pages/mat/matList.vue | 30 +++++++++++----
pages/print/print.vue | 59 +++++++++++++++++++++++------
3 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/pages/mat/matList.vue b/pages/mat/matList.vue
index 25d9624..e6f3af9 100644
--- a/pages/mat/matList.vue
+++ b/pages/mat/matList.vue
@@ -15,7 +15,7 @@
</view>
</scroll-view>
<view>
- <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item.matnr)">
+ <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
<view class="tag">
<view style="display: flex;">
<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
@@ -91,7 +91,6 @@
'token':uni.getStorageSync('token'),
},
success(result) {
- console.log(result);
that.tagList = null
that.matList = []
var res = result.data
@@ -101,6 +100,7 @@
} else {
that.showMat(parentId)
}
+ that.baColor = "background-color: #0081ff;"
} else if (res.code === 403 ) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
@@ -143,7 +143,6 @@
'token':uni.getStorageSync('token'),
},
success(result) {
- console.log(result);
that.tagList = null
var res = result.data
if (res.code === 200) {
@@ -170,12 +169,27 @@
}
});
},
- findBySelect(matnr) {
- this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: matnr});
- uni.navigateBack({
-
- })
+ toPrint(item) {
+ console.log(item);
+ let that = this
+ uni.navigateTo({
+ url: "../print/print",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('data', {
+ data: item
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data
+ that.findMat(that.matnr)
+ },
+ },
+
+ });
}
}
}
diff --git a/pages/print/print.vue b/pages/print/print.vue
index 3e725ea..0eb7d08 100644
--- a/pages/print/print.vue
+++ b/pages/print/print.vue
@@ -15,11 +15,11 @@
</tr>
<tr>
<td>鍟嗗搧</td>
- <td colspan="1">{{mat.matkx}}</td>
+ <td colspan="1">{{mat.maktx}}</td>
</tr>
<tr>
<td>鏃ユ湡</td>
- <td colspan="2">2023-04-24 15:25:32</td>
+ <td colspan="2">{{time}}</td>
</tr>
</table>
</view>
@@ -37,24 +37,35 @@
},
mat: {
matnr: '1200128-10055',
- matkx: 'X5S-4-M03/333'
+ maktx: 'X5S-4-M03/333'
},
- qrShow: false
+ qrShow: false,
+ time: ''
}
},
onShow() {
let getWindowInfo = uni.getWindowInfo()
- console.log(getWindowInfo.screenHeight); //灞忓箷楂樺害
- console.log(getWindowInfo.screenWidth); //灞忓箷瀹藉害
- console.log(getWindowInfo.windowHeight); //鍙搷浣滈〉闈㈤珮搴�
- console.log(getWindowInfo.windowWidth); //鍙搷浣滈〉闈㈠搴�
- console.log(getWindowInfo);
- console.log('鑾峰彇绐楀彛淇℃伅');
+ // console.log(getWindowInfo.screenHeight); //灞忓箷楂樺害
+ // console.log(getWindowInfo.screenWidth); //灞忓箷瀹藉害
+ // console.log(getWindowInfo.windowHeight); //鍙搷浣滈〉闈㈤珮搴�
+ // console.log(getWindowInfo.windowWidth); //鍙搷浣滈〉闈㈠搴�
+ // console.log(getWindowInfo);
+ // console.log('鑾峰彇绐楀彛淇℃伅');
let height = (getWindowInfo.screenWidth + 10) * 48 / 74
- console.log(height);
+ // console.log(height);
this.style.height = height + 'px'
- this.qrFun("1200128-10055")
+ this.getDate()
+ },
+ onLoad(opt) {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.on('data', function(data) {
+ console.log(data.data);
+ that.mat = data.data
+ that.qrFun(that.mat.matnr)
+ })
+
},
methods: {
//**鐢熸垚浜岀淮鐮�**//
@@ -72,7 +83,29 @@
errorCorrectLevel: uQRCode.errorCorrectLevel.H,
success: res => {}
})
- }
+ },
+ // 鏃ュ巻
+ getDate() {
+ var dt = new Date();
+ var year,month,day,hours,minutes,seconds,weeks
+ year = dt.getFullYear();
+ month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
+ day = dt.getDate() < 10 ? '0'+dt.getDate() : dt.getDate();
+ hours = dt.getHours() < 10 ? '0' + dt.getHours() : dt.getHours();
+ minutes = dt.getMinutes() < 10 ? '0' + dt.getMinutes() : dt.getMinutes();
+ seconds = dt.getSeconds() < 10 ? '0' + dt.getSeconds() : dt.getSeconds();
+ weeks = dt.getDay();
+ switch (weeks) {
+ case 0: weeks = "鏄熸湡鏃�"; break;
+ case 1: weeks = "鏄熸湡涓�"; break;
+ case 2: weeks = "鏄熸湡浜�"; break;
+ case 3: weeks = "鏄熸湡涓�"; break;
+ case 4: weeks = "鏄熸湡鍥�"; break;
+ case 5: weeks = "鏄熸湡浜�"; break;
+ default : weeks = "鏄熸湡鍏�";
+ }
+ this.time = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " "
+ },
}
}
</script>
diff --git a/pages/stock/changePallet.vue b/pages/stock/changePallet.vue
index 6f4a45e..ab0c436 100644
--- a/pages/stock/changePallet.vue
+++ b/pages/stock/changePallet.vue
@@ -135,7 +135,6 @@
},
data: {barcode:that.barcode},
success(res) {
- console.log(res);
res = res.data
if(res.code===200) {
that.dataList = res.data
--
Gitblit v1.9.1