From 8b1b8a60b6280c4aae555e6914103db644c36c4e Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 28 十月 2025 15:56:14 +0800
Subject: [PATCH] 取消报工页面订单号字段变更
---
pages/product/WorkshopOrderIssued/index.vue | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index d9f2b5b..f5949b1 100644
--- a/pages/product/WorkshopOrderIssued/index.vue
+++ b/pages/product/WorkshopOrderIssued/index.vue
@@ -3,7 +3,7 @@
<view class="page">
<view class="packing-registration-bg" />
<u-navbar
- title="璁㈠崟涓嬪彂"
+ title="鐗╂枡涓嬪彂"
:background="background"
:border-bottom="false"
:title-bold="true"
@@ -18,18 +18,20 @@
</view>
<view class="packing-registration-param-item-right">
<text class="item-one item-two" @click="seachPersonnelNo()">{{
- registerInfo.moNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.moNo
+ registerInfo.ifsOrderNo == ""
+ ? "鐐瑰嚮閫夋嫨"
+ : registerInfo.ifsOrderNo
}}</text>
<u-icon
name="arrow-right"
color="#687792"
size="28"
@click="seachPersonnelNo()"
- v-show="registerInfo.moNo == ''"
+ v-show="registerInfo.ifsOrderNo == ''"
></u-icon>
</view>
</view>
- <view class="packing-registration-param-item param-extra">
+ <!-- <view class="packing-registration-param-item param-extra">
<view class="packing-registration-param-item-left">
<text class="item-one">宸ュ崟</text>
</view>
@@ -45,8 +47,8 @@
v-show="registerInfo.optaskNo == ''"
></u-icon>
</view>
- </view>
- <view class="packing-registration-param-item param-extra">
+ </view> -->
+ <!-- <view class="packing-registration-param-item param-extra">
<view class="packing-registration-param-item-left">
<text class="item-one">鏈哄彴</text>
</view>
@@ -79,10 +81,10 @@
size="28"
></u-icon>
</view>
- </view>
+ </view> -->
<view class="packing-registration-param-item param-extra">
<view class="packing-registration-param-item-left">
- <text class="item-one">瀛愪欢</text>
+ <text class="item-one">鐗╂枡缁撴瀯</text>
</view>
<view class="packing-registration-param-item-right">
<text class="item-one item-two" @click="seachComp()">{{
@@ -225,11 +227,12 @@
registerInfo: {
operationTaskId: "",
id: "",
- moNo: "",
+ ifsOrderNo: "",
partNo: "",
partName: "",
optaskNo: "",
workstationId: "",
+ ifsLineItemNo: "",
},
// 涓嬪彂璁板綍鍒楄〃
hasScanSnList: [],
@@ -244,36 +247,40 @@
uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
uni.$on("scan", function (data) {
console.log("onscan");
- if (that.registerInfo.partNo == "") {
- uni.showToast({
- icon: "none",
- title: "璇峰厛閫夋嫨瀛愪欢锛�",
- duration: 2 * 1000,
- });
- return;
- }
- if (that.registerInfo.workstationId == "") {
- uni.showToast({
- icon: "none",
- title: "璇峰厛閫夋嫨鏈哄彴锛�",
- duration: 2 * 1000,
- });
- return;
- }
if (data.code) {
//鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
console.log("鎵爜缁撴灉锛�", data.code);
let codeInfo = JSON.parse(data.code);
that.codeInfoId = codeInfo.id;
- if (codeInfo.partNo) {
- if (that.registerInfo.partNo != codeInfo.partNo) {
- this.$u.toast("褰撳墠瀛愪欢鍜屾壂鐮佸瓙浠朵笉涓�鑷达紒");
+ if (codeInfo.PN) {
+ if (that.registerInfo.partNo != codeInfo.PN) {
+ this.$u.toast("褰撳墠鐗╂枡缁撴瀯鍜屾壂鐮佺墿鏂欑粨鏋勪笉涓�鑷达紒");
return;
}
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
that.scanHandle(codeInfo);
that.$forceUpdate();
// that.getHandelList();
+ }
+ if (codeInfo.moOn) {
+ this.$u.api.WorkshopOrderIssued.getManuOrder({
+ moOn: codeInfo.moOn,
+ }).then((res) => {
+ if (res.code === 0) {
+ that.registerInfo = {
+ operationTaskId: "",
+ id: res.data.id,
+ ifsOrderNo: res.data.ifsOrderNo,
+ partNo: "",
+ partName: "",
+ optaskNo: "",
+ workstationId: "",
+ ifsLineItemNo: "",
+ };
+ }
+ })
+ .catch((err) => {
+ })
}
}
});
@@ -318,9 +325,9 @@
return;
}
// 澶勭悊纭閫昏緫
- this.$u.api.WorkshopOrderIssued.feeding({
+ this.$u.api.WorkshopOrderIssued.feedingPDA({
feedingFrom: "stocker",
- operationTaskId: this.registerInfo.operationTaskId,
+ moId: this.registerInfo.id,
feeds: [
{
...this.modalList,
@@ -370,6 +377,7 @@
compNo(val) {
this.registerInfo.partNo = val.partNo;
this.registerInfo.partName = val.partName;
+ this.registerInfo.ifsLineItemNo = val.ifsLineItemNo;
},
// 璁㈠崟鍙峰洖鏄�
setNo(val) {
@@ -377,11 +385,12 @@
(this.registerInfo = {
operationTaskId: "",
id: val.id,
- moNo: val.moNo,
+ ifsOrderNo: val.ifsOrderNo,
partNo: "",
partName: "",
optaskNo: "",
workstationId: "",
+ ifsLineItemNo: "",
}),
(this.machineList = []);
this.machineIndex = null;
@@ -396,8 +405,12 @@
},
//瀛愪欢
seachComp() {
- if (this.registerInfo.optaskNo == "") {
- this.$u.toast("璇烽�夋嫨宸ュ崟鍙�");
+ // if (this.registerInfo.optaskNo == "") {
+ // this.$u.toast("璇烽�夋嫨宸ュ崟鍙�");
+ // return;
+ // }
+ if (this.registerInfo.ifsOrderNo == "") {
+ this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
return;
}
console.log("瀛愪欢");
@@ -405,12 +418,12 @@
uni.navigateTo({
url:
"/pages/product/WorkshopOrderIssued/comp?operationTaskId=" +
- encodeURIComponent(JSON.stringify(this.registerInfo.operationTaskId)),
+ encodeURIComponent(JSON.stringify(this.registerInfo.id)),
});
},
//宸ュ崟
seachWork() {
- if (this.registerInfo.moNo == "") {
+ if (this.registerInfo.ifsOrderNo == "") {
this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
return;
}
@@ -424,17 +437,18 @@
},
// 鎵爜鍚庢暟鎹洖鏄�
scanHandle(val) {
- const { outBatchNo } = val;
+ const { BN } = val;
const { workstationId, operationTaskId } = this.registerInfo;
const obj = {
- outBatchNo: outBatchNo,
- workstationId: workstationId,
- operationTaskId: operationTaskId,
+ outBatchNo: BN,
+ // workstationId: workstationId,
+ // operationTaskId: operationTaskId,
};
this.$u.api.WorkshopOrderIssued.checkRawPartPDA(obj).then((res) => {
console.log("res", res);
if (res.code === 0) {
(res.data.workstationId = workstationId), (this.modalList = res.data);
+ this.modalList.ifsLineItemNo = this.registerInfo.ifsLineItemNo;
this.showModal = true;
}
});
@@ -484,7 +498,7 @@
}
.packing-registration-param-view {
- height: 550rpx;
+ height: 350rpx;
background-color: #fff;
border-radius: 10rpx;
padding: 0rpx 23rpx;
@@ -500,8 +514,8 @@
.packing-registration-param-item-left {
.item-one {
- font-size: 30rpx;
- color: #666666;
+ font-size: small;
+ color: #232222;
}
}
@@ -516,7 +530,7 @@
}
.item-two {
- font-size: 30rpx;
+ font-size: small;
color: #a6b4cc;
margin-right: 6rpx;
}
@@ -601,7 +615,7 @@
._label-name {
margin-left: 11rpx;
- font-size: 26rpx;
+ font-size: small;
font-weight: 500;
color: #666666;
}
@@ -611,7 +625,7 @@
flex: 1.5;
text-align: right;
color: #909399;
- font-size: 24rpx;
+ font-size: small;
}
.row-list .s1 {
--
Gitblit v1.9.3