From b2eb82fce7d36b5c995b8b8058f20f29cae14d2d Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 25 六月 2025 14:27:25 +0800
Subject: [PATCH] 取消报工接口联调
---
pages/product/report/index.vue | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 97 insertions(+), 11 deletions(-)
diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index fdcf7b3..52b71f8 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -43,8 +43,8 @@
<u-form-item label="闆朵欢鎻忚堪" :border-bottom="false" prop="partName">
<u-input v-model="form.partName" placeholder="" disabled />
</u-form-item>
- <u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="qtyrequired">
- <u-input v-model="form.qtyrequired" placeholder="" disabled />
+ <u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="qtyRequired">
+ <u-input v-model="form.qtyRequired" placeholder="" disabled />
</u-form-item>
<u-form-item
label="鍓╀綑鏁伴噺"
@@ -68,8 +68,8 @@
<u-radio name="part">鏇夸唬闆朵欢</u-radio>
</u-radio-group>
</u-form-item>
- <u-form-item label="鐗╂枡" prop="materialcost">
- <u-radio-group v-model="form.materialcost" :disabled="true">
+ <u-form-item label="鐗╂枡" prop="materialCost">
+ <u-radio-group v-model="form.materialCost" :disabled="true">
<u-radio name="鍊掑啿">鍊掑啿</u-radio>
<u-radio name="鎶曟枡">鎶曟枡</u-radio>
</u-radio-group>
@@ -101,6 +101,7 @@
v-for="(item, index) in InventoryReceiptList"
:key="index"
:index="index"
+ @click="cancelReport(item)"
>
<view class="content-header">
<view class="content-header-title">{{ index + 1 }}</view>
@@ -111,7 +112,7 @@
<view class="_label-name">鎵瑰彿锛�</view>
</view>
<view class="_content">
- {{ item.productNo }}
+ {{ item.outBatchNo }}
</view>
</view>
<view class="row-list">
@@ -150,6 +151,54 @@
:operationTaskList="this.form"
@update="handleUpdate"
/>
+ <u-modal
+ width="720rpx"
+ v-model="showModal"
+ title=""
+ :show-cancel-button="true"
+ :show-confirm-button="true"
+ @confirm="confirmModle"
+ @cancel="cancelModle"
+ >
+ <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.outBatchNo }}</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>
</div>
</template>
@@ -187,12 +236,12 @@
moOn: "",
partNo: "",
partName: "",
- qtyrequired: "",
+ qtyRequired: "",
Jianqtyfinished: "",
proposedLocation: "",
productType: "dep",
receive: "mo",
- materialcost: "",
+ materialCost: "",
autoReport: false,
simplifyMaterials: false,
},
@@ -244,6 +293,8 @@
operationTaskId: "",
subdisabled: false,
codeInfoId: "",
+ detailedList: {},
+ showModal: false,
};
},
// 鐐瑰嚮鎻愪氦鎸夐挳鐨勪簨浠跺鐞嗗嚱鏁�
@@ -260,6 +311,7 @@
id: this.form.id,
})
.then((res) => {
+ res.data.name = this.form.name;
this.$refs.saveForm.open(res);
uni.hideLoading();
});
@@ -296,6 +348,40 @@
},
},
methods: {
+ // 鐐瑰嚮纭鍚庤幏鍙栧彇娑堟姤宸ヨ褰�
+ confirmModle() {
+ console.log("鐐瑰嚮纭鍚庤幏鍙栧彇娑堟姤宸ヨ褰�");
+ // 澶勭悊纭閫昏緫
+ this.$u.api.cancelReporting
+ .cancelDTAOfWorkApplication({
+ outBatchNo: this.detailedList.outBatchNo,
+ })
+ .then((res) => {
+ console.log("res", res);
+ this.showModal = false;
+ this.getHandelList();
+ this.$u.toast("鍙栨秷鎶ュ伐鎴愬姛");
+ });
+ },
+ cancelModle() {
+ this.showModal = false; // 鍏抽棴寮圭獥
+ },
+ // 鍙栨秷鎶ュ伐
+ cancelReport(item) {
+ let that = this;
+ uni.showModal({
+ title: "鎻愮ず",
+ content: "鏄惁纭鍙栨秷鎵规" + item.outBatchNo + "鐨勬姤宸�",
+ success: function (res) {
+ if (res.confirm) {
+ that.detailedList = item;
+ that.showModal = true;
+ } else if (res.cancel) {
+ return;
+ }
+ },
+ });
+ },
getHandelList() {
this.$u.api.workReporting
.getProductMainV1({
@@ -354,18 +440,18 @@
moOn: val.moOn,
partNo: val.partNo,
partName: val.partName,
- qtyrequired: val.qtyrequired,
- Jianqtyfinished: val.qtyrequired - val.qtyfinished,
+ qtyRequired: val.qtyRequired,
+ Jianqtyfinished: val.qtyRequired - val.qtyFinished,
proposedLocation: val.proposedLocation,
productType: "dep",
receive: "mo", // 澶嶉�夋缁勭殑鍊�
- materialcost: val.materialcost,
+ materialCost: val.materialCost,
autoReport: false,
simplifyMaterials: false,
};
this.checkboxList[1].value = false;
this.checkboxList[0].value = false;
- if (this.form.materialcost == "鍊掑啿") {
+ if (this.form.materialCost == "鍊掑啿") {
this.checkboxList[1].disabled = true;
}
},
--
Gitblit v1.9.3