From 76486524892abdfd3039eedc28d83cbbfb56d042 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 六月 2025 16:17:05 +0800
Subject: [PATCH] 取消报工/车间订单下发/车间订单取消下发/功能点逻辑编写
---
pages/wareHouse/moveWareHouse/index.vue | 252 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 211 insertions(+), 41 deletions(-)
diff --git a/pages/wareHouse/moveWareHouse/index.vue b/pages/wareHouse/moveWareHouse/index.vue
index fe2c551..5b35f7e 100644
--- a/pages/wareHouse/moveWareHouse/index.vue
+++ b/pages/wareHouse/moveWareHouse/index.vue
@@ -10,17 +10,69 @@
<text class="item-one">搴撲綅</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{registerInfo.storageLocation}}</text>
+ <text class="item-one item-two">{{
+ registerInfo.proposedLocation == ""
+ ? "璇锋壂鎻忓簱浣�"
+ : registerInfo.proposedLocation
+ }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
<view class="packing-registration-param-item-left">
- <text class="item-one">{{`绉诲簱璁板綍(${registerInfo.num}鏉�)锛歚}}</text>
+ <text class="item-one">{{
+ `绉诲簱璁板綍(${registerInfo.num}鏉�)锛歚
+ }}</text>
</view>
</view>
</view>
</view>
- <view class="popup-container" v-if="show">
+ <view class="wrap">
+ <scroll-view class="packing-registration-scroll-list" scroll-y="true">
+ <u-cell-group class="packing-registration-scroll-list-group" :border="false">
+ <view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
+ <view class="content-header">
+ <view class="content-header-title">{{ index + 1 }}</view>
+ </view>
+ <view class="content-body">
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">闆朵欢鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.partNo }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鎵规鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.moNo }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">搴撲綅鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.proposedLocation }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鐩樼偣鏁伴噺锛�</view>
+ </view>
+ <view class="_content">
+ {{ item.value1 }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-cell-group>
+ </scroll-view>
+ </view>
+ <u-modal 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">
@@ -29,7 +81,7 @@
<text class="item-one">鎵瑰彿</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{ detailedList.moNo }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -37,7 +89,9 @@
<text class="item-one">闆朵欢鎻忚堪</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{
+ detailedList.partName
+ }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -45,7 +99,7 @@
<text class="item-one">WDR</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{ detailedList.WDR }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -61,19 +115,16 @@
<text class="item-one">褰撳墠搴撲綅</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{
+ detailedList.proposedLocation
+ }}</text>
</view>
</view>
</view>
- <view class="person-btn-view">
- <u-button type="primary" shape="square" text="鍙栨秷" style="height: 80rpx; line-height: 80rpx"
- size="medium" @click="closePopup()">鍙栨秷</u-button>
- <u-button type="primary" shape="square" text="纭畾" style="height: 80rpx; line-height: 80rpx"
- size="medium" @click="confirmPopup()">纭畾</u-button>
- </view>
</view>
</view>
- </view>
+ </u-modal>
+ <scan></scan>
</view>
</template>
<script>
@@ -93,40 +144,84 @@
backgroundRepeat: "no-repeat",
},
registerInfo: {
- storageLocation: "LG001",
+ storageLocation: "",
num: 0,
},
- show: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+ showModal: false, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+ hasScanSnList: [],
+ detailedList: {
+ moNo: "",
+ partNo: "",
+ proposedLocation: "",
+ WDR: "",
+ },
+ codeInfoId: '',
};
},
onLoad() {},
onShow() {
let that = this;
-
uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
uni.$on("scan", function(data) {
console.log("onscan");
//鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- console.log("鎵爜缁撴灉锛�", data.code);
- });
- },
- onNavigationBarButtonTap(e) {
- uni.scanCode({
- success: (res) => {
- try {
- const result = JSON.parse(res.result);
- } catch (e) {}
- },
+ console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
+ if (data.code) {
+ let codeInfo = JSON.parse(data.code);
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ // 鍒ゆ柇鎵弿鐨勬槸搴撲綅鐮佽繕鏄祦杞爜
+ if (codeInfo.LN) {
+ that.saveForm(codeInfo)
+ } else {
+ that.codeInfoId = codeInfo.id
+ that.saveModalForm(codeInfo)
+ that.getHandelList();
+ }
+ }
});
},
methods: {
- confirmPopup() {
+ getHandelList() {
+ this.$u.api.workReporting
+ .getProductMainV1({
+ current: 1,
+ size: -1,
+ id: this.codeInfoId,
+ })
+ .then((res) => {
+ this.hasScanSnList = res.data.productOutputList;
+ });
+ },
+ confirm() {
// 澶勭悊纭閫昏緫
+ // 鐐瑰嚮纭绉诲簱
+ if (true) {
+ uni.showToast({
+ icon: "none",
+ title: "浣犳棤娉曞皢闆朵欢绉诲埌鐩稿悓浣嶇疆",
+ duration: 2 * 1000,
+ });
+ return
+ }
+ this.getHandelList()
this.show = false;
},
- closePopup() {
+ cancel() {
this.show = false; // 鍏抽棴寮圭獥
},
+ // 鍥炴樉鎵爜鐨勪俊鎭�
+ saveForm(val) {
+ this.registerInfo.proposedLocation = val.LN
+ }
+ saveModalForm(val) {
+ this.detailedList: {
+ moNo: val.moNo,
+ partNo: val.partNo,
+ proposedLocation: val.proposedLocation,
+ WDR: val.WDR,
+ },
+ this.show = true;
+ }
},
};
</script>
@@ -137,20 +232,9 @@
margin-top: 300rpx;
}
- .popup-container {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-
.popup-content {
width: 600rpx;
- height: 600rpx;
+ height: 500rpx;
background-color: #fff;
border-radius: 8px;
z-index: 10;
@@ -240,4 +324,90 @@
}
}
}
+
+ .wrap .packing-registration-scroll-list {
+ height: calc(100vh - var(--window-top) - var(--window-bottom) - 360rpx);
+ width: 100%;
+ }
+
+ .packing-registration-scroll-list-group {
+ ::v-deep .u-cell-item-box {
+ background-color: rgba(250, 252, 255, 0.36) !important;
+ padding: 0rpx 30rpx;
+ }
+
+ .content {
+ font-size: 12px;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ border-radius: 10rpx;
+ margin: 0rpx 0rpx 16rpx;
+ padding: 20rpx 8rpx;
+ box-shadow: none;
+ display: flex;
+ align-items: center;
+
+ .content-header {
+ width: 40rpx;
+ height: 90rpx;
+ display: flex;
+ align-items: center;
+
+ .content-header-icon {
+ background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+ background-size: 100% auto;
+ background-repeat: no-repeat;
+ height: 28rpx;
+ width: 28rpx;
+ }
+
+ .content-header-title {
+ margin-left: 11rpx;
+ font-size: 26rpx;
+ font-weight: bold;
+ color: #626369;
+ }
+ }
+
+ .content-body {
+ flex: 1;
+ background-color: #ffffff;
+ border-radius: 10rpx;
+ padding: 0rpx 23rpx;
+
+ .row-list {
+ height: 60rpx;
+ display: flex;
+ flex-direction: row;
+ padding: 0px;
+ align-items: center;
+ }
+
+ .row-list ._label {
+ display: flex;
+ flex: 0.8;
+ color: #909399;
+ align-items: center;
+
+ ._label-name {
+ margin-left: 11rpx;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #666666;
+ }
+ }
+
+ .row-list ._content {
+ flex: 1.5;
+ text-align: right;
+ color: #909399;
+ font-size: 24rpx;
+ }
+
+ .row-list .s1 {
+ color: #d35651;
+ }
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3