From 3a75daf63f5b64af3388424c3de82662c20aa383 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 18 七月 2025 13:49:01 +0800
Subject: [PATCH] 添加了打印超时定时器清除逻辑，确保打印成功后清除超时回调
---
pages/product/cancelReport/index.vue | 230 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 173 insertions(+), 57 deletions(-)
diff --git a/pages/product/cancelReport/index.vue b/pages/product/cancelReport/index.vue
index a55c853..fd026e7 100644
--- a/pages/product/cancelReport/index.vue
+++ b/pages/product/cancelReport/index.vue
@@ -50,8 +50,7 @@
<view class="content-body">
<view class="row-list">
<view class="_label">
- <view class="_label-icon-1"> </view>
- <view class="_label-name">璁㈠崟鍙凤細</view>
+ <view class="_label-name">鎵瑰彿锛�</view>
</view>
<view class="_content">
{{ item.moNo }}
@@ -59,7 +58,6 @@
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-2"> </view>
<view class="_label-name">闆朵欢鍙凤細</view>
</view>
<view class="_content">
@@ -68,7 +66,6 @@
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-3"> </view>
<view class="_label-name">闆朵欢鎻忚堪锛�</view>
</view>
<view class="_content">
@@ -77,29 +74,10 @@
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-1"> </view>
- <view class="_label-name">鎵归噺澶у皬锛�</view>
+ <view class="_label-name">鍙栨秷鎺ユ敹鏁伴噺锛�</view>
</view>
<view class="_content">
{{ item.qtyRequired }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-icon-2"> </view>
- <view class="_label-name">寮�濮嬫棩鏈燂細</view>
- </view>
- <view class="_content">
- {{ item.startDate }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-icon-3"> </view>
- <view class="_label-name">缁撴潫鏃ユ湡锛�</view>
- </view>
- <view class="_content">
- {{ item.endDate }}
</view>
</view>
</view>
@@ -107,6 +85,58 @@
</u-cell-group>
</scroll-view>
</view>
+ <u-modal
+ width="720rpx"
+ v-model="showModal"
+ title=""
+ :show-cancel-button="true"
+ :show-confirm-button="true"
+ @confirm="confirm"
+ @cancel="cancel"
+ >
+ <view class="popup-content">
+ <view class="packing-registration-param">
+ <view class="packing-registration-param-view">
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">鎵瑰彿</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one">{{ detailedList.moNo }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">闆朵欢鍙�</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one">{{ detailedList.partNo }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">闆朵欢鎻忚堪</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <span class="item-one">{{
+ detailedList.partName
+ }}</span>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">鍙栨秷鎺ユ敹鏁伴噺</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <span class="item-one">{{
+ detailedList.netWeight
+ }}</span>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-modal>
<scan></scan>
</view>
</template>
@@ -130,21 +160,13 @@
form: {
moNo: "",
},
- list: [
- {
- moNo: 1,
- partNo: 1,
- partName: 1,
- qtyRequired: 1,
- startDate: 1,
- endDate: 1,
- },
- ],
+ detailedList: {},
+ list: [],
rules: {},
+ showModal: false,
};
},
- onReady() {
- },
+ onReady() {},
onShow() {
let that = this;
uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
@@ -152,32 +174,31 @@
console.log("onscan");
//鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
- if ((list.moNO = null)) {
- uni.showToast({
- icon: 'none',
- title: '璇峰厛閫夋嫨璁㈠崟鍙凤紒',
- duration: 2 * 1000
- })
- return
- }
- if ((list.moNO = null)) {
- uni.showToast({
- icon: 'none',
- title: '鎵弿鐨勪簩缁寸爜涓庤璁㈠崟涓嶄竴鑷�',
- duration: 2 * 1000
- })
- return
- }
if (data.code) {
let codeInfo = JSON.parse(data.code);
- if (codeInfo.WorkNo) {
+ console.log('222')
+ if (codeInfo.moNo) {
+ console.log('1111')
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
that.saveForm(codeInfo);
+ // that.$forceUpdate();
}
}
});
},
methods: {
+ // 鐐瑰嚮纭鍚庤幏鍙栧彇娑堟姤宸ヨ褰�
+ confirm() {
+ // 澶勭悊纭閫昏緫
+ this.$u.api.cancelReporting.cancelDTAOfWorkApplication({outBatchNo:this.detailedList.outBatchNo}).then((res) => {
+ console.log("res", res);
+ this.list = res.data.records;
+ this.showModal = false;
+ });
+ },
+ cancel() {
+ this.showModal = false; // 鍏抽棴寮圭獥
+ },
openList() {
uni.navigateTo({
url: "/pages/product/report/orderList",
@@ -188,16 +209,111 @@
},
// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
saveForm(val) {
- let { WorkNo, ProcessName, ORDER_NO } = val;
- this.form.value1 = WorkNo;
- this.form.value2 = ProcessName;
- this.form.value3 = ORDER_NO;
+ console.log('1111@@@@@@1',this.form)
+ if (this.form.moNo == '') {
+ uni.showToast({
+ icon: "none",
+ title: "璇峰厛閫夋嫨璁㈠崟鍙凤紒",
+ duration: 2 * 1000,
+ });
+ return;
+ }
+ if (this.form.moNo != val.moNo) {
+ uni.showToast({
+ icon: "none",
+ title: "鎵弿鐨勪簩缁寸爜涓庤璁㈠崟涓嶄竴鑷�",
+ duration: 2 * 1000,
+ });
+ return;
+ }
+ this.detailedList = val;
+ this.showModal = true;
},
},
};
</script>
<style lang="scss" scoped>
+.packing-registration-param {
+ padding: 40rpx 30rpx 10rpx 30rpx;
+ height: 350px;
+ overflow: hidden;
+
+ .packing-registration-param-title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-bottom: 30rpx;
+
+ .title-label {
+ margin-left: 14rpx;
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #283e65;
+ }
+ }
+
+ .packing-registration-param-view {
+ height: 177rpx;
+ background-color: #fff;
+ border-radius: 10rpx;
+ padding: 0rpx 23rpx;
+ margin-bottom: 30rpx;
+
+ .packing-registration-param-item {
+ height: 90rpx;
+ border: 1px solid #adc8e4;
+ line-height: 90rpx;
+ display: flex;
+ justify-content: space-between;
+ border: none;
+
+ .packing-registration-param-item-left {
+ .item-one {
+ word-break: break-all;
+ font-size: 30rpx;
+ color: #666666;
+ }
+ }
+
+ .packing-registration-param-item-right {
+ display: flex;
+ justify-content: space-between;
+
+ .item-one {
+ font-size: 30rpx;
+ color: #060505;
+ margin-right: 6rpx;
+ word-break: break-all;
+ }
+
+ .item-two {
+ font-size: 15rpx;
+ color: #a6b4cc;
+ margin-right: 6rpx;
+ }
+
+ .item-three {
+ font-size: 30rpx;
+ color: #214ded;
+ margin-right: 6rpx;
+ }
+ }
+ }
+
+ .param-extra {
+ border-bottom: 1px solid #ededed;
+ }
+ }
+}
+ .popup-content {
+ width: 720rpx;
+ height: 400rpx;
+ background-color: #fff;
+ border-radius: 8px;
+ z-index: 10;
+ /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
+ }
.page {
box-sizing: border-box;
}
--
Gitblit v1.9.3