短驳物流，商品管理修改

src/views/audit/productManagement/index.vue

@@ -111,6 +111,22 @@
 		</div>
 		<!-- 选择物料 -->
 		<productModal ref="product" :mulit="true" @confirm="confirmProduct" />
+		
+		<vxe-modal v-model="vxeValue" width="60%" height="70%" show-zoom resize transfer show-footer>
+			<template #title>
+				<span>选择物料</span>
+			</template>
+			<template #default>
+				<by-table :propConfig="config" ref="form" style="margin-top: 10px;"></by-table>
+			</template>
+			<template #footer>
+				<div class="btn">
+					<el-button size="small" @click="vxeValue=false">取消</el-button>
+					<el-button type="primary" size="small" @click="doConfirm">确定</el-button>
+				</div>
+			</template>
+		</vxe-modal>
+		
 	</div>
 </template>
 <script lang="ts">
@@ -120,12 +136,13 @@
 	import ForTab from "@/components/ForTab/index.vue";
 	import productModal from "../orderTask/components/productModal.vue";
 	import brandType from "./components/brandType.vue";
-	import selectKin from "./components/selectKin.vue";
+	// import selectKin from "./components/selectKin.vue";
 	@Component({ components: { ForTab, productModal, brandType } })
 	export default class productManagement extends Vue {
 		tagsData : any = [] // 标签值
 		isShow = 'home'
 		isEdit = true
+		vxeValue = false
 		editInfo : any = ''
 		isSingle : any = true
 		timeNum = 0;
@@ -215,10 +232,10 @@
 						},
 					}
 				},
-				{
-					width: '55px',
-					component: selectKin
-				},
+				// {
+				// 	width: '55px',
+				// 	component: selectKin
+				// },
 				{
 					width: '140px',
 					title: '财务编号',
@@ -345,6 +362,21 @@
 					title: '体积/cm³',
 					field: 'volume',
 				},
+				{
+					width: '100px',
+					title: '操作',
+					action: true,
+					plugins: [{
+						icon: 'el-icon-edit',
+						name: '选择物料',
+						audit: '',
+						event: {
+							click: () => {
+								(this as any).openVxeData(1)
+							}
+						}
+					}]
+				}
 			]
 		}
 		tableConfig : any = {
@@ -389,10 +421,10 @@
 						},
 					}
 				},
-				{
-					width: '55px',
-					component: selectKin
-				},
+				// {
+				// 	width: '55px',
+				// 	component: selectKin
+				// },
 				{
 					width: '140px',
 					title: '财务编号',
@@ -519,10 +551,19 @@
 					field: 'volume',
 				},
 				{
-					width: '80px',
+					width: '180px',
 					title: '操作',
 					action: true,
 					plugins: [{
+						icon: 'el-icon-edit',
+						name: '选择物料',
+						audit: '',
+						event: {
+							click: () => {
+								(this as any).openVxeData(2)
+							}
+						}
+					},{
 						icon: 'el-icon-delete',
 						name: '删除',
 						audit: '',
@@ -1355,6 +1396,16 @@
 				})
 			}).catch(() => { });
 		}
+		// 打开物料选择
+		openVxeData(){
+			this.vxeValue = true
+		}
+		// 确定仓库仓位
+		doConfirm() {
+			// let data : any = (this as any).$refs.form.getValue();
+			// this.$emit('onChange', data);
+			this.vxeValue = false;
+		}
 		// 切换组合商品
 		openMakeup() {
 			(this.$refs.product as any).setShow(true); // 打开sku弹窗

src/views/audit/shortBargeLogistics/index.vue

@@ -20,6 +20,7 @@
 	import { getShortBargePageData, getShortBargeSingleData } from '@/api/delivery';
 	import Logistics from "@/components/Assembly/logistics.vue";
 	import Logistics2 from "@/components/Assembly/logistics2.vue";
+	import storeHouse from "@/components/Assembly/storeHouse.vue";
 	
 	@Component
 	export default class myShortBarge extends Vue {
@@ -668,11 +669,6 @@
 			},
 			columns:
 				[{
-					width: 250,
-					title: '短驳单ID',
-					field: 'shortBargeId',
-				},
-				{
 					width: 250,
 					title: '商品SKUID',
 					field: 'skuId',
@@ -686,16 +682,18 @@
 					width: 250,
 					title: '短驳出库仓库ID',
 					field: 'wareHouseCode',
+					component: storeHouse,
 				},	
 				{
 					width: 250,
 					title: '短驳入库仓库ID',
 					field: 'entryStoreHouseId',
+					component: storeHouse,
 				},	
 				{
 					width: 180,
 					title: '库存类型',
-					field: 'entryStoreHouseId',
+					field: 'stortType',
 					component: Logistics,
 				},	
 				{