shish 2 жил өмнө
parent
commit
bbe07184d2

+ 3 - 3
ghsApp/src/admin/book/itemCustom.vue

@@ -83,9 +83,9 @@ export default {
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),
-        goDetail(){
-
-        },
+		goDetail(item){
+			this.$util.pageTo({ url: "/admin/book/itemCustomDetail?parentId="+item.id})
+		},
 		async init() {
 			if(this.option.itemId){
 				this.itemId = this.option.itemId

+ 152 - 0
ghsApp/src/admin/book/itemCustomDetail.vue

@@ -0,0 +1,152 @@
+<template>
+	<view class="app-content">
+		<view class="ex-page">
+            <scroll-view scroll-y scroll-with-animation class="main-view">
+                <view class="space-view ex-table">
+                    <t-table :headerBackgroundColor="'#F0F2F6'">
+                        <t-tr header>
+                            <t-th><view style="width:170upx;">花材</view></t-th>
+                            <t-th>供货商</t-th>
+                            <t-th>数量</t-th>
+                            <t-th>状态</t-th>
+                        </t-tr>
+                        <template v-if="!$util.isEmpty(ghsData)">
+                            <view v-for="(item, index) in ghsData" :key="index">
+                                <t-tr>
+                                    <t-td><view style="width:170upx;">{{item.name}}</view></t-td>
+									<t-td><view>{{item.ghsName}}</view></t-td>
+									<t-td><view>{{item.num}}</view></t-td>
+									<t-td><view>{{item.status==0?'待送货':item.status==1?'已上架':'已取消'}}</view></t-td>
+                                </t-tr>
+                            </view>
+                        </template>
+                    </t-table>
+                </view>
+            </scroll-view>
+		</view>
+	</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import SelectList from "@/components/plugin/selectList";
+import { getBookItemCustomDetail } from "@/api/book"
+import { list } from "@/mixins";
+import ShopSelect from "@/components/module/shopSelect";
+import DateSelect from "@/components/module/dateSelect";
+import {mapActions, mapGetters} from "vuex";
+import AppSearchModule from "@/components/module/app-search";
+export default {
+	components: {
+		SelectList,
+		AppWrapperEmpty,
+		ShopSelect,
+		DateSelect,
+		AppSearchModule
+	},
+	mixins: [list],
+	computed: {
+	},
+	data() {
+		return {
+			ghsData:[],
+			parentId:0
+		};
+	},
+	onPullDownRefresh() {
+		this.getStatList().then(res => {
+			uni.stopPullDownRefresh();
+		});
+	},
+	onLoad() {
+
+	},
+	methods: {
+		...mapActions(['setUserShopAll']),
+		async init() {
+			if(this.option.parentId){
+				this.parentId = this.option.parentId
+			}
+			this.getStatList();
+		},
+		getStatList() {
+			let that = this
+			uni.showLoading()
+			getBookItemCustomDetail({parentId:this.parentId}).then(res => {
+				uni.hideLoading()
+				if (!this.$util.isEmpty(res.data.list)) {
+					that.ghsData = res.data.list
+				}else{
+					that.ghsData = []
+				}
+			})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.ex-page {
+	background: white;
+	padding-top:20upx;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.top-bar {
+	}
+	.main-view {
+		flex: 1;
+		background-color: #f9fbfc;
+		.space-view {
+			background-color: #fff;
+		}
+		.ex-info {
+			padding: 30upx;
+			.info-cell {
+				display: flex;
+				align-items: center;
+				font-size: 28upx;
+				&:not(:first-child) {
+					margin-top: 20upx;
+				}
+				.cell-label {
+					width: 110upx;
+					color: #666666;
+				}
+				.cell-value {
+					margin-left: 40upx;
+					color: #333;
+					&.warning {
+						color: #ffaf1d;
+					}
+					&.success {
+						color: #27c325;
+					}
+				}
+			}
+		}
+		.ex-table {
+			::v-deep.icon-info {
+				color: #333333;
+			}
+		}
+	}
+	.bar-view {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			font-size: 26upx;
+		}
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				margin: 0 10upx;
+			}
+		}
+	}
+}
+</style>

+ 4 - 0
ghsApp/src/api/book/index.js

@@ -1,5 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const getBookItemCustomDetail = data => {
+	return https.get('/book-item-ghs/get-list', data)
+}
+
 export const getBookItemCustomList = data => {
 	return https.get('/book-item-custom/list', data)
 }

+ 1 - 0
ghsApp/src/pages.json

@@ -481,6 +481,7 @@
 				{"path": "jdIndex","style": {"navigationBarTitleText": "基地和昆明批发教程"}},
 				{"path": "detail","style": {"navigationBarTitleText": ""}},
 				{"path": "itemCustom","style": {"navigationBarTitleText": "明细"}},
+				{"path": "itemCustomDetail","style": {"navigationBarTitleText": "送货信息"}},
 				{"path": "custom","style": {"navigationBarTitleText": "预订客户"}}
 			]
 		},

+ 5 - 3
ghsApp/src/pagesPurchase/info.vue

@@ -87,8 +87,7 @@
 			</view>
 			<view style="text-align: right;">
 				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="">获取货位</button>
-				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="margin-left:20upx;">锁定货位</button>
-				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="margin-left:20upx;">隐藏货位</button>
+				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="margin-left:50upx;">隐藏货位</button>
 			</view>
 			<view class="module-com content-box">
 				<view class="commodity-view">
@@ -122,8 +121,11 @@
 									</view>
 								</view>
 							</view>
+							<view v-if="Number(s.noSeatNum)>0" style="margin-bottom:7upx;">
+								无货位 {{ s.noSeatNum }}
+							</view>
 							<view v-if="!$util.isEmpty(s.sendList)" style="margin-bottom:10upx;">
-								<view v-for="(send, sendIndex) in s.sendList">
+								<view v-for="(send, sendIndex) in s.sendList" style="margin-bottom:7upx;">
 									{{ send.customName }} 货位:{{ send.seatSn }} 数量:{{ send.num }}
 								</view>
 							</view>