预订明细完善

ghs/src/cool/request/index.js

@@ -66,12 +66,14 @@ import bookCgChange from '@/service/book-cg-change/index';
 import bookChange from '@/service/book-change/index';
 import bookOnChange from '@/service/book-on-change/index';
 import bookRoadChange from '@/service/book-road-change/index';
+import bookItemGhs from '@/service/book-item-ghs/index';
 
 export function SET_SERVICE({ store }) {
 	// const files = require.context('@/service/', true, /\.js$/);
 	// const ignore = ['./request.js'];
 
 	let modules = {
+		bookItemGhs,
 		bookCgChange,
 		bookChange,
 		bookOnChange,

ghs/src/service/book-item-ghs/index.js

@@ -0,0 +1,6 @@
+import { BaseService, Service } from '@/cool';
+@Service('book-item-ghs')
+export class BookItemGhs extends BaseService {
+
+}
+export default new BookItemGhs();

ghs/src/views/book/components/book-cg-record.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-drawer :visible.sync="showArea" size="55vw" :before-close="closeFn" custom-class="drawer-class" direction="ltr">
 			<div>
-				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】待采变动记录</div>
+				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】{{ currentData.itemName?currentData.itemName:'' }} 待采变动记录</div>
                 <x-crud @load="onLoad">
 					<template #table-column-changeNum="{scope}">
 						{{ scope.row.io == 1 ? '+' : '-' }}<span>{{ scope.row.changeNum }}</span>

ghs/src/views/book/components/book-item-ghs.vue

@@ -0,0 +1,95 @@
+<template>
+	<div>
+		<el-drawer :visible.sync="showArea" size="55vw" :before-close="closeFn" custom-class="drawer-class" direction="ltr">
+			<div>
+				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】{{ currentData.itemName?currentData.itemName:'' }} 供货明细</div>
+                <x-crud @load="onLoad">
+					<template #table-column-status="{scope}">
+						{{scope.row.status==0?'在路上':item.status==1?'已送达':'已取消'}}
+					</template>
+                </x-crud>
+			</div>
+		</el-drawer>
+	</div>
+</template>
+<script>
+export default {
+	name: 'book-record',
+	props: {
+		currentData: {
+			type: Object,
+			default: () => {}
+		}
+	},
+	data() {
+		return {
+			showArea: false
+		};
+	},
+	methods: {
+		init() {
+			this.showArea = true
+			if(this.app){
+				this.app.refresh({parentId:this.currentData.id})
+			}
+		},
+		closeFn() {
+			this.showArea = false;
+		},
+		onLoad({ ctx, app }) {
+			this.app = app;
+			ctx.service(this.$service.bookItemGhs)
+			.set('table', {
+				columns: [
+					{
+						label: '日期',
+						prop: 'addTime',
+						align: 'center',
+					},
+					{
+						label: '花材',
+						prop: 'name',
+						align: 'center',
+					},
+					{
+						label: '供货商',
+						prop: 'ghsName',
+						align: 'center',
+					},
+					{
+						label: '数量',
+						prop: 'num',
+						align: 'center',
+					},
+					{
+						label: '状态',
+						prop: 'status',
+						align: 'center',
+					}
+				],
+				op: {
+					visible: true,
+					props: {
+						width: 160,
+						align: 'center',
+						fixed: 'right',
+						label: '操作'
+					},
+					layout: []
+				}
+			})
+			.set('layout', [
+				[ 'data-table' ],
+				['flex1']
+			])
+			.done()
+			app.refresh({parentId:this.currentData.id})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.drawer-class{
+	height:100vh;
+}
+</style>

ghs/src/views/book/components/book-on-record.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-drawer :visible.sync="showArea" size="55vw" :before-close="closeFn" custom-class="drawer-class" direction="ltr">
 			<div>
-				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】上下架记录</div>
+				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】{{ currentData.itemName?currentData.itemName:'' }} 上下架记录</div>
                 <x-crud @load="onLoad">
 					<template #table-column-changeNum="{scope}">
 						{{ scope.row.io == 1 ? '+' : '-' }}<span>{{ scope.row.changeNum }}</span>

ghs/src/views/book/components/book-record.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-drawer :visible.sync="showArea" size="55vw" :before-close="closeFn" custom-class="drawer-class" direction="ltr">
 			<div>
-				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】预订记录</div>
+				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】{{ currentData.itemName?currentData.itemName:'' }} 预订记录</div>
                 <x-crud @load="onLoad">
 					<template #table-column-changeNum="{scope}">
 						{{ scope.row.io == 1 ? '+' : '-' }}<span>{{ scope.row.changeNum }}</span>

ghs/src/views/book/components/book-road-record.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-drawer :visible.sync="showArea" size="55vw" :before-close="closeFn" custom-class="drawer-class" direction="ltr">
 			<div>
-				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】路上记录</div>
+				<div style="margin-left:2px;font-weight:bold;">【{{ currentData.customName?currentData.customName:'' }}】{{ currentData.itemName?currentData.itemName:'' }} 路上记录</div>
                 <x-crud @load="onLoad">
 					<template #table-column-changeNum="{scope}">
 						{{ scope.row.io == 1 ? '+' : '-' }}<span>{{ scope.row.changeNum }}</span>

ghs/src/views/book/itemCustom.vue

@@ -9,7 +9,7 @@
 			</template>
 
 			<template #slot-column-option="{scope}">
-				<el-button @click.stop="goGhDetail(scope.row)" size="medium" type="primary">供货明细</el-button>
+				<el-button @click.stop="goItemGh(scope.row)" size="medium" type="primary">供货明细</el-button>
 				<el-button @click.stop="getBookRecord(scope.row)" size="medium" type="primary">预订记录</el-button>
 				<el-button @click.stop="getOnRecord(scope.row)" size="medium" type="primary">上下架记录</el-button>
 				<el-button @click.stop="getRoadRecord(scope.row)" size="medium" type="primary">路上记录</el-button>
@@ -35,6 +35,7 @@
 		<book-on-record ref="bookOnRecord" :currentData="bookOnRecordData" />
 		<book-road-record ref="bookRoadRecord" :currentData="bookRoadRecordData" />
 		<book-cg-record ref="bookCgRecord" :currentData="bookCgRecordData" />
+		<book-item-ghs ref="bookItemGhs" :currentData="bookItemGhsData" />
 
 	</div>
 </template>
@@ -44,12 +45,14 @@ import bookRecord from './components/book-record';
 import bookOnRecord from './components/book-on-record';
 import bookCgRecord from './components/book-cg-record';
 import bookRoadRecord from './components/book-road-record';
+import bookItemGhs from './components/book-item-ghs';
 export default {
 	components: {
 		bookRecord,
 		bookOnRecord,
 		bookCgRecord,
-		bookRoadRecord
+		bookRoadRecord,
+		bookItemGhs
 	},
 	data() {
 		return {
@@ -75,12 +78,16 @@ export default {
 			bookCgRecordData:{},
 			bookRoadRecordData:{},
 			bookOnRecordData:{},
-			bookRecordData:{}
+			bookRecordData:{},
+			bookItemGhsData:{}
 		};
 	},
 	methods: {
-		goGhDetail(info){
-
+		goItemGh(info){
+			this.bookItemGhsData = {customId:info.customId,customName:info.customName,id:info.id,itemName:info.name,itemId:info.itemId}
+			setTimeout(() => {
+				this.$refs.bookItemGhs.init()
+			})
 		},
 		getCgRecord(info){
 			this.bookCgRecordData = {customId:info.customId,customName:info.customName,id:info.id,itemName:info.name,itemId:info.itemId}
@@ -147,12 +154,7 @@ export default {
 					},
 					{
 						prop: 'hasRemark',
-						label: '是否备注',
-						align: 'center',
-					},
-					{
-						prop: 'box',
-						label: '是否装箱',
+						label: '备注',
 						align: 'center',
 					},
 					{

ghsApp/src/api/book/index.js

@@ -67,7 +67,7 @@ export const getBookRoadChangeList = data => {
 }
 
 export const getBookItemCustomDetail = data => {
-	return https.get('/book-item-ghs/get-list', data)
+	return https.get('/book-item-ghs/list', data)
 }
 
 export const getBookItemCustomList = data => {