From 9094ad08e496e45e288105c4e7b1c57fa8352ea8 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 27 十月 2025 16:46:32 +0800
Subject: [PATCH] 取消报工新增扫码直接取消功能
---
pages/product/cancelReport/index.vue | 126 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 62 deletions(-)
diff --git a/pages/product/cancelReport/index.vue b/pages/product/cancelReport/index.vue
index b453976..0c45d2a 100644
--- a/pages/product/cancelReport/index.vue
+++ b/pages/product/cancelReport/index.vue
@@ -17,7 +17,7 @@
<scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true">
<u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
<view class="content" v-for="(item, index) in list" :key="item.moNo" :index="index"
- @click="cancelReport(item,index)">
+ @click="cancelReport(item, index)">
<view class="content-header">
<view class="content-header-title">{{ index + 1 }}</view>
</view>
@@ -85,9 +85,7 @@
<text class="item-one">闆朵欢鎻忚堪</text>
</view>
<view class="packing-registration-param-item-right">
- <span class="item-one">{{
- detailedList.partName
- }}</span>
+ <span class="item-one">{{ detailedList.partName }}</span>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -95,9 +93,7 @@
<text class="item-one">鍙栨秷鎺ユ敹鏁伴噺</text>
</view>
<view class="packing-registration-param-item-right">
- <span class="item-one">{{
- detailedList.netWeight
- }}</span>
+ <span class="item-one">{{ detailedList.netWeight }}</span>
</view>
</view>
</view>
@@ -132,30 +128,28 @@
detailedList: {},
list: [],
rules: {},
- showModal: false,
- id: "",
+ showModal: false,
+ id: "",
};
},
onReady() {},
- // onShow() {
- // let that = this;
- // uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- // uni.$on("scan", function (data) {
- // console.log("onscan");
- // //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- // console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
- // if (data.code) {
- // let codeInfo = JSON.parse(data.code);
- // console.log('222')
- // if (codeInfo.moNo) {
- // console.log('1111')
- // // 鎵弿鎶ュ伐鍗曚簩缁寸爜
- // that.saveForm(codeInfo);
- // // that.$forceUpdate();
- // }
- // }
- // });
- // },
+ onShow() {
+ let that = this;
+ uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ uni.$on("scan", function(data) {
+ console.log("onscan");
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
+ if (data.code) {
+ let codeInfo = JSON.parse(data.code);
+ if (codeInfo.BN) {
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ that.saveForm(codeInfo);
+ // that.$forceUpdate();
+ }
+ }
+ });
+ },
methods: {
//宸ュ崟
seachWork() {
@@ -183,44 +177,48 @@
},
// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
saveForm(val) {
- 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;
- }
+ // 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.detailedList.outBatchNo = val.BN;
+ this.detailedList.partNo = val.PN;
+ this.detailedList.partName = val.ST;
+ this.detailedList.netWeight = val.NW;
+ console.log("this.detailedList鎵爜鍙栨秷鎶ュ伐", this.detailedList);
this.showModal = true;
},
// 宸ュ崟鍥炴樉
workNo(val) {
- this.id = val.id;
- this.getBGList();
+ this.id = val.id;
+ this.getBGList();
this.form.optaskNo = val.optaskNo;
- },
- getBGList() {
- this.$u.api.workReporting
- .getProductMainV1({
- current: 1,
- size: -1,
- id:this.id,
- })
- .then((res) => {
- console.log('res',res)
- this.list = res.data.productOutputList;
- });
- },
+ },
+ getBGList() {
+ this.$u.api.workReporting
+ .getProductMainV1({
+ current: 1,
+ size: -1,
+ id: this.id,
+ })
+ .then((res) => {
+ console.log("res", res);
+ this.list = res.data.productOutputList;
+ });
+ },
// 鍙栨秷鎶ュ伐
cancelReport(item, index) {
let that = this;
@@ -243,14 +241,18 @@
this.$u.api.cancelReporting
.cancelDTAOfWorkApplication({
outBatchNo: this.detailedList.outBatchNo,
- outputId: this.detailedList.id
+ outputId: this.detailedList.id,
})
.then((res) => {
console.log("res", res);
+ if (this.detailedList.BN) {
+ this.showModal = false;
+ this.$u.toast("鍙栨秷鎶ュ伐鎴愬姛");
+ } else {
this.getBGList();
this.showModal = false;
- // this.getHandelList();
this.$u.toast("鍙栨秷鎶ュ伐鎴愬姛");
+ }
});
},
},
--
Gitblit v1.9.3