From 5fc7b0755d658b70c33c18b0531acb6e0ad28b17 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 03 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-jdhj-uniapp
---
pages/wareHouse/inventory/index.vue | 175 ++++++++++++++++++------
pages/wareHouse/moveWareHouse/index.vue | 193 ++++++++++++++++++++++++---
2 files changed, 298 insertions(+), 70 deletions(-)
diff --git a/pages/wareHouse/inventory/index.vue b/pages/wareHouse/inventory/index.vue
index 7fea53e..eec0586 100644
--- a/pages/wareHouse/inventory/index.vue
+++ b/pages/wareHouse/inventory/index.vue
@@ -11,7 +11,7 @@
</view>
<view class="packing-registration-param-item-right">
<text class="item-one item-two" @click="seachPersonnelNo()">{{ registerInfo.value1 == '' ?
- "鐐瑰嚮閫夋嫨" : registerInfo.value1}}</text>
+ "鐐瑰嚮閫夋嫨" : registerInfo.value1 }}</text>
<u-icon name="arrow-right" color="#687792" size="28" @click="seachPersonnelNo()"
v-show="registerInfo.value1 == ''"></u-icon>
</view>
@@ -30,9 +30,9 @@
</view>
<view class="packing-registration-param-item-right">
<view class="item-one item-two" @click="openPN()">
- <text>{{ registerInfo.value2 == '' ? "鐐瑰嚮杈撳叆" : registerInfo.value2 }}</text>
+ <text>{{ registerInfo.value6 == '' ? "鐐瑰嚮杈撳叆" : registerInfo.value6 }}</text>
</view>
- <u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value2 == ''"></u-icon>
+ <u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value6 == ''"></u-icon>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -77,11 +77,42 @@
<scroll-view class="packing-registration-scroll-list" scroll-y="true">
<u-cell-group class="packing-registration-scroll-list-group" :border="false">
<!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
- <view class="content" v-for="(x, index) in hasScanSnList" :key="index" :index="index">
- <view class="row-list">
- <view class="row-list-left">
- <view class="num-icon" style="color: #fff;">{{ index + 1 }}</view>
- <view style="margin-left: 30rpx;">{{ x }}</view>
+ <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.value0 }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鎵规鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.value1 }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">搴撲綅鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.value0 }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鐩樼偣鏁伴噺锛�</view>
+ </view>
+ <view class="_content">
+ {{ item.value1 }}
+ </view>
</view>
</view>
</view>
@@ -93,7 +124,7 @@
<scan></scan>
<!-- 闆朵欢鍙� -->
<modalBg ref="openPN" :confirm="confirmPN">
- <u-field v-model="registerInfo.value2" label="闆朵欢鍙凤細" placeholder="璇疯緭鍏�" :border-bottom="false">
+ <u-field v-model="registerInfo.value6" label="闆朵欢鍙凤細" placeholder="璇疯緭鍏�" :border-bottom="false">
</u-field>
</modalBg>
<!-- 鎵规鍙� -->
@@ -108,7 +139,7 @@
</modalBg>
<!-- 鐩樼偣鏁伴噺 -->
<modalBg ref="openPhysicalInventory" :confirm="confirmPhysicalInventory">
- <u-field v-model="registerInfo.value5" label="鐩樼偣鏁伴噺锛�" placeholder="璇疯緭鍏�" :border-bottom="false">
+ <u-field v-model="registerInfo.value5" label="鐩樼偣鏁伴噺锛�" label-width="140" placeholder="璇疯緭鍏�" :border-bottom="false">
</u-field>
</modalBg>
</view>
@@ -140,9 +171,34 @@
value2: '',
value3: '',
value4: '',
- value5: ''
+ value5: '',
+ value6: ''
},
- hasScanSnList: [],
+ hasScanSnList: [{
+ value0: '11111111111111111111111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ ],
delContent: null,
staffList: [],
};
@@ -173,12 +229,12 @@
},
// 寮规淇濆瓨
confirmPN() {
- console.log('淇濆瓨', this.registerInfo.value2);
+ console.log('淇濆瓨', this.registerInfo.value6);
// 璇锋眰鎺ュ彛锛屾牴鎹伐鍗曞彿鏌ヨ鍏朵粬淇℃伅骞惰祴鍊�
},
//鎵规鍙�
openBatch() {
- this.$refs.openBatch.openBatch();
+ this.$refs.openBatch.open();
},
// 寮规淇濆瓨
confirmBatch() {
@@ -206,7 +262,9 @@
setNo(val) {
console.log('11111', val)
- this.registerInfo = val
+ this.registerInfo.value1 = val.value1
+ this.registerInfo.value2 = val.value2
+
},
//鐩樼偣鎶ュ憡鍙�
seachPersonnelNo() {
@@ -399,52 +457,75 @@
}
.content {
- background-image: url('~@/static/custom/packing/row_bg.png');
- background-size: 100% auto;
- background-repeat: no-repeat;
- height: 89rpx;
- width: 691rpx;
font-size: 12px;
- background-color: #FFFFFF;
+ background-color: #ffffff;
box-sizing: border-box;
border-radius: 10rpx;
- margin: 0rpx 0rpx 20rpx;
- padding: 0rpx 50rpx 0rpx 32rpx;
+ margin: 0rpx 0rpx 16rpx;
+ padding: 20rpx 8rpx;
box-shadow: none;
+ display: flex;
+ align-items: center;
- .row-list {
- height: 100%;
+ .content-header {
+ width: 40rpx;
+ height: 90rpx;
display: flex;
- justify-content: space-between;
align-items: center;
- padding-top: 0rpx !important;
- .row-list-left {
+ .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;
- color: #333333;
+ flex-direction: row;
+ padding: 0px;
+ align-items: center;
+ }
- .num-icon {
- background-image: url('~@/static/custom/packing/num-bg.png');
- background-size: 100% auto;
- background-repeat: no-repeat;
- height: 38rpx;
- width: 38rpx;
- text-align: center;
- line-height: 38rpx;
+ .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-right {
- display: flex;
- color: #428BF7;
+ .row-list ._content {
+ flex: 1.5;
+ text-align: right;
+ color: #909399;
+ font-size: 24rpx;
+ }
- .del-icon {
- background-image: url('~@/static/custom/packing/icon_dele.png');
- background-size: 100% auto;
- background-repeat: no-repeat;
- height: 30rpx;
- width: 28rpx;
- }
+ .row-list .s1 {
+ color: #d35651;
}
}
}
diff --git a/pages/wareHouse/moveWareHouse/index.vue b/pages/wareHouse/moveWareHouse/index.vue
index fe2c551..ad765f9 100644
--- a/pages/wareHouse/moveWareHouse/index.vue
+++ b/pages/wareHouse/moveWareHouse/index.vue
@@ -20,7 +20,54 @@
</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">
+ <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
+ <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.value0 }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鎵规鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.value1 }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">搴撲綅鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.value0 }}
+ </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">
@@ -65,15 +112,9 @@
</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>
</view>
</template>
<script>
@@ -96,7 +137,39 @@
storageLocation: "LG001",
num: 0,
},
- show: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+ showModal: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+ hasScanSnList: [
+ {
+ value0: '11111111111111111111111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ {
+ value0: '111',
+ value1: '111',
+ value2: '111',
+ value3: '111',
+ },
+ ],
};
},
onLoad() {},
@@ -120,11 +193,11 @@
});
},
methods: {
- confirmPopup() {
+ confirm() {
// 澶勭悊纭閫昏緫
this.show = false;
},
- closePopup() {
+ cancel() {
this.show = false; // 鍏抽棴寮圭獥
},
},
@@ -137,20 +210,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 +302,89 @@
}
}
}
+ .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