From 134a6c521a6adcf5402091ac97a418cf5dbe4d43 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 25 六月 2025 11:09:06 +0800
Subject: [PATCH] 取消报工页面功能迁移至报工页面
---
pages/product/report/index.vue | 87 ++++++++++++++++++++++++++++
pages/product/report/index.scss | 80 ++++++++++++++++++++++++++
2 files changed, 166 insertions(+), 1 deletions(-)
diff --git a/pages/product/report/index.scss b/pages/product/report/index.scss
index 7e411a6..77e15ec 100644
--- a/pages/product/report/index.scss
+++ b/pages/product/report/index.scss
@@ -1,3 +1,83 @@
+ .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;
padding: 30rpx;
diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index 448dd3a..84e1bea 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -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>
@@ -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>
@@ -244,6 +293,8 @@
operationTaskId: "",
subdisabled: false,
codeInfoId: "",
+ detailedList: {},
+ showModal: false,
};
},
// 鐐瑰嚮鎻愪氦鎸夐挳鐨勪簨浠跺鐞嗗嚱鏁�
@@ -260,7 +311,7 @@
id: this.form.id,
})
.then((res) => {
- res.data.name = this.form.name
+ res.data.name = this.form.name;
this.$refs.saveForm.open(res);
uni.hideLoading();
});
@@ -297,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;
+ that.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({
--
Gitblit v1.9.3