From 3878c57a2bd710295931303ea85439a596838dfd Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 05 九月 2023 16:01:31 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue | 380 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 262 insertions(+), 118 deletions(-)
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
index 95f001b..2aa3d23 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
@@ -1,131 +1,287 @@
<template>
- <view class="content">
+ <view class="content2">
<view class="order-message">
<view class="content_list_item_top">
<view class="content_list_item_top_left">
- <!--<text>鍏ュ簱鍗曞彿锛�</text>-->
+ <!-- <text>杞簱鍗曞彿锛�</text>-->
<text>{{ data.code }}</text>
</view>
<view class="content_list_item_top_right">
- <text class="warning" v-if="data.status === 0">寰呭叆搴�</text>
- <text class="green" v-else-if="data.status === 1">宸插叆搴�</text>
- <text class="info" v-else-if="data.status === 2">宸插彇娑�</text>
+ <text class="created" v-if="data.status === 0">寰呭嚭搴�</text>
+ <text class="warning" v-else-if="data.status === 1">宸插嚭搴�</text>
+ <text class="green" v-else-if="data.status == 2">宸插叆搴�</text>
+ <text class="info" v-else-if="data.status === 3">宸插彇娑�</text>
</view>
</view>
+ <!-- item涓婚淇℃伅閮ㄥ垎 -->
<view class="content_list_item_content">
- <view class="content_list_item_content_item">
+ <view style="margin-top: 0 " class="content_list_item_content_item">
<view class="content_list_item_content_item_label">鍗曟嵁绫诲瀷锛�</view>
<view class="content_list_item_content_item_nr">
- {{ orderTyepToStr(data.billType) }}
+ {{ tyepToStr(data.type) }}
</view>
</view>
<view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鍏ヨ揣浠撳簱锛�</view>
+ <view class="content_list_item_content_item_label">杞嚭缁勭粐锛�</view>
<view class="content_list_item_content_item_nr">
- {{ data.warehouseCode + ' | ' + data.warehouseName }}
+ {{ data.outDepartName }}
</view>
</view>
<view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝鏃ユ湡锛�</view>
+ <view class="content_list_item_content_item_label">杞叆缁勭粐锛�</view>
<view class="content_list_item_content_item_nr">
- {{ data.planDate }}
+ {{ data.inDepartName }}
</view>
</view>
<view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鏉ユ簮绫诲瀷锛�</view>
+ <view class="content_list_item_content_item_label">杞嚭浠撳簱锛�</view>
<view class="content_list_item_content_item_nr">
- {{ tyepToStr(data.originType) }}
+ {{ data.outWarehouseName }}
</view>
</view>
<view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鏉ユ簮鍗曞彿锛�</view>
+ <view class="content_list_item_content_item_label">杞嚭浠撶鍛橈細</view>
<view class="content_list_item_content_item_nr">
- {{ data.originCode ? data.originCode : '-' }}
+ {{ data.outUserName }}
</view>
</view>
- <view v-if="data.updateName" class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鎿嶄綔浜猴細</view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">杞叆浠撳簱锛�</view>
<view class="content_list_item_content_item_nr">
- {{ data.updateName + ' - ' + data.updateMobile }}
+ {{ data.inWarehouseName }}
</view>
</view>
- <view v-if="data.updateTime" class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鎿嶄綔鏃堕棿锛�</view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">杞叆浠撶鍛橈細</view>
<view class="content_list_item_content_item_nr">
- {{ data.updateTime }}
+ {{ data.inUserName }}
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">璁″垝杞嚭鏃ユ湡锛�</view>
+ <view class="content_list_item_content_item_nr">
+ {{ data.outPlandate }}
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">璁″垝杞叆鏃ユ湡锛�</view>
+ <view class="content_list_item_content_item_nr">
+ {{ data.inPlandate }}
</view>
</view>
</view>
- </view>
- <!-- 杞簱鐗╂枡 -->
- <view class="title">
- <text class="title-prefix"></text>
- <text>{{ data.status==1 ? '宸插叆搴撶墿鏂�' : '寰呭叆搴撶墿鏂�' }}</text>
- </view>
- <view class="material-content">
- <view class="item-style" v-for="(item, index) in materailArray" :key="index">
- <view class="item-title-style">
- <text style="font-weight: 500;">{{ item.materialName + ' | ' + item.materialCode}}</text>
+ <!-- 杞簱鐗╂枡 -->
+ <view class="material-title">
+ <view class="title">
+ <text class="title-prefix"></text>
+ <text>杞簱鐗╂枡</text>
</view>
- <view class="item-content-style">
- <view class="content_list_item_content_item">
- <text class="content_list_item_content_item_label">鎵规鍙凤細</text>
- <text class="content_list_item_content_item_nr">{{ item.batch || '-' }}</text>
+ </view>
+ <view class="material-content">
+ <view class="item-style" v-for="(item, index) in data.wtransferDetailList" :key="index">
+ <view class="item-title-style">
+ <text style="font-weight: 500;">{{ item.materialName + ' | ' + item.materialCode}}</text>
</view>
- <view class="content_list_item_content_item">
- <text class="content_list_item_content_item_label">鏁伴噺锛�</text>
- <text class="content_list_item_content_item_nr">{{ item.doneNum + item.unitName }}</text>
- </view>
- <view class="content_list_item_content_item">
- <text class="content_list_item_content_item_label">宸ュ簭锛�</text>
- <text class="content_list_item_content_item_nr">{{ item.procedureName || '-' }}</text>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璐ㄩ噺锛�</view>
- <view class="content_list_item_content_item_nr">
- <text v-if="item.qualityType == 0" class="green">鍚堟牸</text>
- <text v-else-if="item.qualityType == 1" class="yellow">涓嶈壇</text>
- <text v-else-if="item.qualityType == 2" class="red">鎶ュ簾</text>
- <text v-else>-</text>
+ <view class="item-content-style">
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">鎵规鍙凤細</view>
+ <view class="content_list_item_content_item_nr">
+ {{ item.batch }}
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">宸ュ簭锛�</view>
+ <view class="content_list_item_content_item_nr">
+ {{ item.procedureName || '-' }}
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">璐ㄩ噺锛�</view>
+ <view class="content_list_item_content_item_nr">
+ <text v-if="item.qualityType==0" class="green">鍚堟牸</text>
+ <text v-else-if="item.qualityType==1" class="yellow">涓嶈壇</text>
+ <text v-else-if="item.qualityType==2" class="red">鎶ュ簾</text>
+ <text v-else>-</text>
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">璁″垝杞簱鏁伴噺锛�</view>
+ <view class="content_list_item_content_item_nr">
+ {{ item.outPlannum + item.unitName }}
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">瀹為檯杞嚭鏁伴噺锛�</view>
+ <view class="content_list_item_content_item_nr">
+ {{ item.outActnum + item.unitName }}
+ </view>
+ </view>
+ <view class="content_list_item_content_item">
+ <view class="content_list_item_content_item_label">瀹為檯杞叆鏁伴噺锛�</view>
+ <view class="content_list_item_content_item_nr">
+ {{ item.inActnum + item.unitName }}
+ </view>
</view>
</view>
- <view class="content_list_item_content_item">
- <text class="content_list_item_content_item_label">鍏ュ簱璐т綅锛�</text>
- <text
- class="content_list_item_content_item_nr">{{ item.locationName ? item.locationName : '-' }}</text>
- </view>
</view>
</view>
</view>
- <view v-if="data.status === 0" style="height:94rpx"></view>
- <view v-if="data.status === 0" class="bottom-button">
- <button class="button button-cancel" @click="submit">鍘诲叆搴�</button>
- <!-- <button class="button button-cancel" @click="cancel">鍙栨秷</button> -->
+ <view v-if="(data.status === 0 || data.status === 1) && show" style="background:#F7F7F7; height:94rpx"></view>
+ <view v-if="(data.status === 0 || data.status === 1) && show" class="bottom-button">
+ <button class="button" @click="submit">{{ data.status === 0 ? '鍘诲嚭搴�' : '鍘诲叆搴�' }}</button>
</view>
</view>
</template>
<script>
- import { orderTyepToStr } from '@/util/constData.js'
+ import {
+ wTransferExtDetail
+ } from '@/util/api/materialStorage'
export default {
data() {
return {
- types: [
- { name: '鍏ㄩ儴', id: '', isActive: true },
- { name: '閲囪喘璁㈠崟', id: '0', isActive: false },
- { name: '鐢熶骇宸ュ崟', id: '1', isActive: false },
- { name: '閿�鍞鍗�', id: '2', isActive: false },
- { name: '杞簱鍗�', id: '3', isActive: false },
- { name: '鐩樼偣鍗�', id: '4', isActive: false },
+ types: [{
+ name: '鍏ㄩ儴',
+ id: '',
+ isActive: true
+ },
+ {
+ name: '閲囪喘璁㈠崟',
+ id: '0',
+ isActive: false
+ },
+ {
+ name: '鐢熶骇宸ュ崟',
+ id: '1',
+ isActive: false
+ },
+ {
+ name: '閿�鍞鍗�',
+ id: '2',
+ isActive: false
+ },
+ {
+ name: '杞簱鍗�',
+ id: '3',
+ isActive: false
+ },
+ {
+ name: '鐩樼偣鍗�',
+ id: '4',
+ isActive: false
+ },
],
- data: {}
+ data: {
+ code: "",
+ status: 0,
+ outDepartName: "",
+ inDepartName: "",
+ outWarehouseName: "",
+ inWarehouseName: "",
+ outPlandate: "",
+ inPlandate: "",
+ wtransferDetailList: []
+ },
+ orderType: [{
+ name: '杞﹂棿棰嗘枡',
+ id: 1
+ },
+ {
+ name: '璁″垝棰嗘枡',
+ id: 2
+ },
+ {
+ name: '鏈哄彴澶囨枡',
+ id: 3
+ },
+ {
+ name: '瀹屽伐鍏ュ簱',
+ id: 4
+ },
+ {
+ name: '杞﹂棿杞簱',
+ id: 5
+ },
+ {
+ name: '澶栧崗棰嗘枡杞簱',
+ id: 6
+ },
+ {
+ name: '澶栧崗瀹屽伐杞簱',
+ id: 7
+ },
+ {
+ name: '鎴愬搧鍏ュ簱',
+ id: 8
+ },
+ {
+ name: '鎴愬搧杞簱',
+ id: 9
+ },
+ {
+ name: '璁╂鏀捐鍏ュ簱',
+ id: 10
+ },
+ {
+ name: '璁╂鏀捐杞簱',
+ id: 11
+ },
+ {
+ name: '瀹㈣繑杩斾慨棰嗘枡',
+ id: 12
+ },
+ {
+ name: '瀹㈣繑杩斾慨鍏ュ簱',
+ id: 13
+ },
+ {
+ name: '璺ㄧ粍缁囪浆搴�',
+ id: 14
+ },
+ {
+ name: '宸ュ簭鎶ュ簾',
+ id: 15
+ },
+ {
+ name: '瀹㈤��杩斾慨棰嗘枡',
+ id: 16
+ },
+ {
+ name: '瀹㈤��杩斾慨鍏ュ簱',
+ id: 17
+ }
+ ],
+ show: false
};
},
+ onLoad(option) {
+ wTransferExtDetail(option.id)
+ .then(res => {
+ this.data = res.data
+ if (res.data.inUserId == this.$store.state.userInfo.id) {
+ this.show = true
+ }
+ })
+ },
methods: {
+ // 璺宠浆鍑哄簱鍏ュ簱
+ submit() {
+ if (this.data.status === 0) { // 鍑哄簱
+ console.log('鍑哄簱')
+ // router.push({ name: 'issueOperation', query: { id: route.query.id, type: 7 } })
+ } else if (this.data.status === 1) { // 鍏ュ簱
+ if (this.data.type === 3) { // 澶囨枡纭
+ console.log('澶囨枡纭')
+ // router.push({ name: 'orderStock', query: { id: route.query.id, status: data.value.status, next: 1 } })
+ return
+ }
+ console.log('鍏ュ簱')
+ // router.push({ name: 'warehousing', query: { id: route.query.id, type: 7 } })
+ }
+ },
tyepToStr(type) {
- // <!-- 1銆佽溅闂撮鏂欙紱2銆佽溅闂村鏂欙紱3銆佸叾浠栵紱4銆佸畬宸ュ叆搴� -->
- for (const item of this.types) {
- if (parseInt(item.id) === this.type) {
+ for (const item of this.orderType) {
+ if (item.id == type) {
return item.name
}
}
@@ -136,25 +292,27 @@
</script>
<style lang="scss" scoped>
- .content {
+ .content2 {
background: white;
.order-message {
- padding: 30rpx;
+ padding-top: 30rpx;
+ // padding: 30rpx;
display: flex;
flex-direction: column;
// border-bottom: 1rpx solid #ececec;
.content_list_item_top {
+ padding: 0 30rpx;
display: flex;
align-items: center;
justify-content: space-between;
.content_list_item_top_left {
display: flex;
+ align-items: center;
- // align-items: center;
- text {
+ span {
font-size: 32rpx;
font-weight: 500;
color: #333333;
@@ -183,7 +341,13 @@
}
}
+ .material-title {
+ // background-color: #f7f7f7;
+ margin-top: 10rpx;
+ }
+
.content_list_item_content {
+ margin: 0 30rpx;
padding: 24rpx 30rpx;
background: #f7f7f7;
border-radius: 16rpx;
@@ -192,16 +356,17 @@
justify-content: space-between;
margin-top: 32rpx;
- .content_list_item_content_item:first-child {
- margin-top: 0;
- }
-
.content_list_item_content_item {
width: 100%;
display: flex;
- align-items: center;
margin-top: 24rpx;
+ // &:nth-child(1) {
+ // margin-top: 0 !important;
+ // }
+ // &:nth-child(2) {
+ // margin-top: 0 !important;
+ // }
.content_list_item_content_item_label {
font-size: 24rpx;
font-weight: 400;
@@ -220,11 +385,11 @@
}
.title {
- background-color: #f7f7f7;
- padding: 30rpx;
+ height: 32rpx;
+ margin-left: 30rpx;
+ padding-top: 40rpx;
+ padding-bottom: 24rpx;
font-size: 30rpx;
- display: flex;
- align-items: center;
.title-prefix {
display: inline-block;
@@ -237,43 +402,36 @@
}
.material-content {
- padding: 30rpx;
-
.item-style {
width: initial;
- border-bottom: 1rpx solid #ececec;
- margin-top: 30rpx;
-
- &:first-child {
- margin-top: 0 !important;
- }
+ border-bottom: 1rpx solid #ECECEC;
+ padding-bottom: 30rpx;
&:last-child {
border: none;
}
.item-title-style {
+ padding: 0 30rpx;
+ margin-top: 30rpx;
margin-bottom: 12rpx;
font-size: 30rpx;
}
.item-content-style {
- // padding: 24rpx 30rpx;
- // background-color: #f7f7f7;
- // border-radius: 16rpx;
+ margin: 0 30rpx;
+ background-color: #f7f7f7;
+ border-radius: 16rpx;
display: flex;
flex-wrap: wrap;
- padding-bottom: 30rpx;
justify-content: space-between;
-
- &:last-child {
- padding-bottom: 0;
- }
+ padding: 1rpx 1rpx 30rpx 1rpx;
.content_list_item_content_item {
width: 100%;
display: flex;
margin-top: 24rpx;
+ margin-left: 24rpx;
.content_list_item_content_item_label {
font-size: 24rpx;
@@ -300,30 +458,16 @@
width: 100%;
bottom: 0;
height: 188rpx;
- display: flex;
- justify-content: space-between;
-
- .button-action {
- background: #fff;
- color: $nav-color;
- }
-
- .button-cancel {
- background: $nav-color;
- color: #FFFFFF;
- }
.button {
margin: 32rpx 32rpx 68rpx 32rpx;
height: 88rpx;
- /*width: 668rpx;*/
- // width: 334rpx;
+ font-size: 30rpx;
+ width: calc(100% - 64rpx);
border: none;
border-radius: 8rpx;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- display: flex;
- align-items: center;
- justify-content: center;
+ background-color: $nav-color;
+ color: #fff;
}
}
}
--
Gitblit v1.9.3