销售订单同步财务系统编号

src/api/order.ts

@@ -133,6 +133,30 @@ function single(data : any, url : any) {
 		params: data
 	})
 }
+// 同步销售订单到财务系统
+function addSaleOrder(data : any) {
+	return request({
+		url: '/supply/financeApi/addSaleOrder',
+		method: 'GET',
+		params: data
+	})
+}
+// 同步入库单到财务系统
+function addInStock(data : any) {
+	return request({
+		url: '/supply/financeApi/addInStock',
+		method: 'GET',
+		params: data
+	})
+}
+// 同步出库单到财务系统
+function addOutStock(data : any) {
+	return request({
+		url: '/supply/financeApi/addOutStock',
+		method: 'GET',
+		params: data
+	})
+}
 export default {
 	treeList,
 	treeUseList,
@@ -150,5 +174,8 @@ export default {
 	getbusinessType,
 	getInventoryByStoridAndSkuid,
 	single,
-	getInventoryByStoridsAndSkuids
+	getInventoryByStoridsAndSkuids,
+	addSaleOrder,
+	addInStock,
+	addOutStock
 }

src/views/audit/agencyGoods/index.vue

@@ -65,8 +65,7 @@
 			},
 			search: {
 				attr: {
-					size: 'mini',
-					calculateH: true
+					size: 'mini'
 				},
 				columns: [
 					[{
@@ -388,101 +387,31 @@
 		display: flex;
 		padding: 16px;
 		height: 100%;
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
 			height: 740px;
-
-			// box-sizing: border-box;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
 			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
 			height: 100%;
-			// overflow-y: auto;
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			overflow-y: hidden;
 		}
 	}
 </style>

src/views/audit/attribute/index.vue

@@ -72,9 +72,12 @@
 		dialogFormVisible : boolean = false
 		tableConfig : any = []
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
-					size: 'mini'
+					size: 'mini',
 				},
 				columns: [
 					[{
@@ -146,7 +149,6 @@
 					size: 'mini',
 					align: 'left',
 					checkbox: true,
-					calculateH: '100%',
 				},
 				columns: [{
 					width: 500,
@@ -437,36 +439,15 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.item-tab {
-			margin-right: 16px;
-			margin-top: 3px;
-		}
-
-		.input-new-tag {
-			width: 130px;
-		}
-
-
-		.flex-item {
-			margin-right: 20px;
-		}
-
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
+		height: 100%;
 
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
+			height: 740px;
 
-			// box-sizing: border-box;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
@@ -474,46 +455,11 @@
 				overflow: hidden;
 			}
 
-			.title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
 
 		.bill-main {
@@ -521,31 +467,8 @@
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
 	}
 </style>

src/views/audit/binTable/index.vue

@@ -1,484 +0,0 @@
-<template>
-	<div class="my-container">
-		<div class="bill-main">
-			<module-view :propConfig="config" ref="moduleView" @pagination="getDataList" @search="getDataList"
-				@resert="getDataList" @clickHandle="clickHandle" @detail="openEdit">
-			</module-view>
-		</div>
-		<!-- 新增/编辑弹窗 -->
-		<el-dialog :title="popTitle+'仓位'" :visible.sync="dialogFormVisible" width="30%">
-			<by-form :propConfig="addConfig" ref="addFormId">
-				<template v-slot:status class="clearfix">
-					<el-radio class="fl" style="margin-top: 8px;" v-model="radio" :label="0">显示</el-radio>
-					<el-radio class="fl" style="margin-top: 8px;" v-model="radio" :label="1">禁用</el-radio>
-				</template>
-			</by-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click="dialogFormVisible = false">取 消</el-button>
-				<el-button type="primary" @click="confirm">确 定</el-button>
-			</div>
-		</el-dialog>
-	</div>
-</template>
-<script lang="ts">
-	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-	import api from "@/api/currency";
-	@Component
-	export default class Brand extends Vue {
-		baseURL : any = process.env.VUE_APP_BASE_API
-		timeNum = 0;
-		timer : any = null
-		popTitle : any = ''
-		radio : any = 0
-		dialogFormVisible : boolean = false
-		config : any = {
-			search: {
-				attr: {
-					size: 'mini'
-				},
-				columns: [
-					[
-						{
-							span: 6,
-							label: '名称',
-							prop: 'name',
-							component: 'by-input',
-							compConfig: {
-								attr: {
-									placeholder: '请输入名称',
-									clearable: true
-								},
-							},
-						},
-						{
-							span: 6,
-							label: '所属机构名称',
-							prop: 'organizationName',
-							component: 'by-input',
-							compConfig: {
-								attr: {
-									placeholder: '请输入所属机构名称',
-									clearable: true
-								}
-							}
-						},
-						{
-							span: 6,
-							label: '库存',
-							prop: 'stock',
-							component: 'by-input',
-							compConfig: {
-								attr: {
-									placeholder: '请输入库存',
-									clearable: true
-								}
-							}
-						},
-						{
-							span: 6,
-							label: '库存体积',
-							prop: 'stockVolume',
-							component: 'by-input',
-							compConfig: {
-								attr: {
-									placeholder: '请输入库存体积',
-									clearable: true
-								},
-							},
-						},
-					],
-					[
-						{
-							span: 6,
-							label: '库存上限数量',
-							prop: 'maxStockNumber',
-							component: 'by-input',
-							compConfig: {
-								attr: {
-									placeholder: '请输入库存上限数量',
-									clearable: true
-								}
-							}
-						},
-						{
-							span: 6,
-							label: '库存体积上限',
-							prop: 'maxStockVolume',
-							component: 'by-input',
-							compConfig: {
-								attr: {
-									placeholder: '请输入库存体积上限',
-									clearable: true
-								}
-							}
-						},
-					]
-				]
-			},
-			tool: {
-				tools: {
-					add: true,
-					export: true,
-					delete: true,
-					search: true,
-					refresh: true
-				}
-			},
-			table: {
-				attr: {
-					size: 'mini',
-					seq: true,
-					align: 'center',
-					checkbox: true,
-					calculateH: '100%',
-				},
-				columns: [{
-					width: 300,
-					title: '名称',
-					field: 'name',
-					isDetail: true,
-				}, {
-					title: '所属机构名称',
-					field: 'organizationName',
-				},
-				{
-					title: '库存',
-					field: 'stock'
-				},
-				{
-					title: '库存体积',
-					field: 'stockVolume'
-				},
-				{
-					title: '库存数量上限',
-					field: 'maxStockNumber'
-				},
-				{
-					title: '库存体积上限',
-					field: 'maxStockVolume'
-				},{
-					title: '操作',
-					action: true,
-					plugins: [{
-						icon: 'el-icon-edit',
-						name: '编辑',
-						audit: '',
-						event: {
-							click: (item : any) => {
-								(this as any).openEdit(item)
-							}
-						}
-					}, {
-						name: '删除',
-						event: {
-							click: (item : any) => (this as any).doDelete2(item)
-						}
-					}]
-				}]
-			},
-		}
-		addConfig = {
-			attr: {
-				size: 'small',
-				rules: {
-					name: [{
-						required: true, message: '请输入名称', trigger: 'blur'
-					}]
-				}
-			},
-			columns: [
-				[
-					{
-						span: 23,
-						label: '名称',
-						prop: 'name',
-						component: 'by-input',
-					},
-					{
-						span: 23,
-						label: '所属机构名称',
-						prop: 'organizationName',
-						component: 'by-input',
-					},
-					{
-						span: 23,
-						label: '库存',
-						prop: 'stock',
-						component: 'by-input',
-					},
-					{
-						span: 23,
-						label: '库存体积',
-						prop: 'stockVolume',
-						component: 'by-input',
-					},
-					{
-						span: 23,
-						label: '库存数量上限',
-						prop: 'maxStockNumber',
-						component: 'by-input',
-					},
-					{
-						span: 23,
-						label: '库存体积上限',
-						prop: 'maxStockVolume',
-						component: 'by-input',
-					},
-				]
-			]
-		}
-		mounted() {
-			this.timer = setInterval(() => {
-				this.getDataList()
-			}, 300)
-		}
-		// 确认新增/编辑
-		confirm() {
-			(this as any).$refs.addFormId.validate().then(() => {
-				let query = (this as any).$refs.addFormId.getValue();
-				query.status = this.radio;
-				this.dialogFormVisible = false;
-				if (this.popTitle === '新增') {
-					api.saveList(query, 'maindataStoringLocation').then((res : any) => {
-						if (res.code === 200) {
-							this.$message({
-								type: 'success',
-								message: this.popTitle + '成功!'
-							});
-							this.getDataList();
-						} else this.failHandle(res)
-					})
-				} else if (this.popTitle === '编辑') {
-					api.updateList(query, 'maindataStoringLocation').then((res : any) => {
-						if (res.code === 200) {
-							this.$message({
-								type: 'success',
-								message: this.popTitle + '成功!'
-							});
-							this.getDataList();
-						} else this.failHandle(res)
-					})
-				}
-			})
-		}
-		// 获取列表数据
-		getDataList() {
-			if (!this.$refs.moduleView) {
-				if (this.timeNum > 5) {
-					clearInterval(this.timer)
-				}
-				this.timeNum++;
-				return
-			}
-			clearInterval(this.timer)
-			let query = (this.$refs.moduleView as any).getQuery();
-			api.pageList(query, 'maindataStoringLocation').then((res : any) => {
-				if (res.code === 200) {
-					(this.$refs.moduleView as any).setTableValue(res.data.records);
-					let page = {
-						pageNo: res.data.current, //当前页
-						pageSize: res.data.size, //每页条数
-						total: res.data.total //总条数
-					};
-					(this.$refs.moduleView as any).setPage(page)
-				} else this.failHandle(res)
-			})
-		}
-		// 工具栏方法
-		clickHandle(e : any) {
-			if (e === 'onRefresh') (this.$refs.moduleView as any).resert();
-			if (e === 'onAdd') this.onAdd();
-			if (e === 'onDelete') this.onDelete();
-			if (e === 'onExport') this.onExport();
-		}
-		// 打开新增
-		onAdd() {
-			this.popTitle = '新增'
-			this.dialogFormVisible = true;
-			setTimeout(() => {
-				if ((this as any).$refs.addFormId) (this as any).$refs.addFormId.setValue({});
-			}, 0)
-		}
-		// 打开编辑
-		openEdit(e : any) {
-			this.popTitle = '编辑'
-			this.dialogFormVisible = true;
-			setTimeout(() => {
-				if ((this as any).$refs.addFormId) (this as any).$refs.addFormId.setValue(e);
-			}, 0)
-		}
-		// 工具栏删除
-		onDelete() {
-			let selectData = (this.$refs.moduleView as any).getSelectData()
-			let ids = '';
-			if (selectData.length > 0) {
-				selectData.map((v : any) => {
-					ids += v.id + ','
-				})
-			} else return this.$message({ type: 'warning', message: '请选择删除数据' })
-			ids = ids.slice(0, ids.length - 1);
-			this.$confirm('确定删除吗,此操作不能撤销！', '注意', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-				center: true
-			}).then(() => {
-				api.deleteList({ ids: ids }, 'maindataStoringLocation').then((res : any) => {
-					if (res.code === 200) {
-						this.getDataList();
-						this.$message({
-							type: 'success',
-							message: '删除成功!'
-						});
-					} else this.failHandle(res)
-				})
-			}).catch(() => {
-				this.$message({
-					type: 'info',
-					message: '已取消删除'
-				});
-			});
-		}
-		// 操作删除
-		doDelete2(item : any) {
-			this.$confirm('确定删除吗,此操作不能撤销！', '注意', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-				center: true
-			}).then(() => {
-				api.deleteList({ ids: item.id }, 'maindataStoringLocation').then((res : any) => {
-					if (res.code === 200) {
-						this.getDataList();
-						this.$message({
-							type: 'success',
-							message: '删除成功!'
-						});
-					} else this.failHandle(res)
-				})
-			}).catch(() => {
-				this.$message({
-					type: 'info',
-					message: '已取消删除'
-				});
-			});
-		}
-		//导出
-		onExport() {
-			let urlArr = '/maindata/maindataMaterial';
-			let query = (this.$refs.moduleView as any).getQuery();
-			(this as any).$download(urlArr + '/export', {
-				...query
-			}, urlArr[urlArr.length - 1] + `_${new Date().getTime()}.xlsx`)
-		}
-		// 运行错误
-		failHandle(err : any) {
-			let msg = err.msg ? err.msg : '运行错误！';
-			this.$message.error(msg)
-		}
-
-	}
-</script>
-<style lang="scss" scoped>
-	.my-container {
-		width: 100%;
-		box-sizing: border-box;
-		display: flex;
-		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
-		.bill-left {
-			position: relative;
-			border-right: solid #EEE 1px;
-			padding-right: 16px;
-			flex-shrink: 0;
-
-			// box-sizing: border-box;
-			.bill-tab {
-				width: 150px;
-				height: 100%;
-				transition: all .5s;
-				overflow: hidden;
-			}
-
-			.title {
-				font-size: 16px;
-				padding-bottom: 16px;
-				width: 200px;
-			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
-		}
-
-		.bill-main {
-			width: calc(100% - 16px);
-			box-sizing: border-box;
-			margin-left: 16px;
-			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
-		}
-	}
-</style>

src/views/audit/brand/index.vue

@@ -33,9 +33,12 @@
 		radio : any = 0
 		dialogFormVisible : boolean = false
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
-					size: 'mini'
+					size: 'mini',
 				},
 				columns: [
 					[{
@@ -99,7 +102,6 @@
 					size: 'mini',
 					align: 'left',
 					checkbox: true,
-					calculateH: '100%'
 				},
 				columns: [{
 					title: '名称',
@@ -334,100 +336,32 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
+		height: 100%;
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-
-			// box-sizing: border-box;
+			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
-			.title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
 	}
 </style>

src/views/audit/depots/index.vue

@@ -58,6 +58,9 @@
 		dialogFormVisible2 : boolean = false
 		isAdd : any = false
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -110,16 +113,29 @@
 				attr: {
 					size: 'mini',
 					align: 'left',
-					calculateH: '100%'
 				},
 				columns: [{
 					title: '名称',
 					field: 'name',
 					isDetail: true,
-				}, {
+				}, 
+				{
+					title: '第三方系统名称',
+					field: 'financeType',
+				},
+				{
+					title: '第三方仓库编码',
+					field: 'financeStorehouseNo',
+				},
+				{
+					title: '第三方仓库名称',
+					field: 'financeStorehouseName',
+				},
+				{
 					title: '地址',
 					field: 'address',
-				}, {
+				}, 
+				{
 					width: 100,
 					title: '仓位',
 					action: true,
@@ -156,6 +172,9 @@
 			},
 		}
 		config2 : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -266,9 +285,8 @@
 				attr: {
 					size: 'mini',
 					seq: true,
-					align: 'center',
+					align: 'left',
 					checkbox: true,
-					calculateH: '100%',
 				},
 				columns: [{
 					width: 300,
@@ -343,14 +361,35 @@
 				[
 					{
 						span: 23,
-						labelWidth: '70px',
+						labelWidth: '110px',
 						label: '名称',
 						prop: 'name',
 						component: 'by-input',
 					},
 					{
 						span: 23,
-						labelWidth: '70px',
+						labelWidth: '110px',
+						label: '第三方系统名称',
+						prop: 'financeType',
+						component: 'by-input',
+					},
+					{
+						span: 23,
+						labelWidth: '110px',
+						label: '第三方仓库编码',
+						prop: 'financeStorehouseNo',
+						component: 'by-input',
+					},
+					{
+						span: 23,
+						labelWidth: '110px',
+						label: '第三方仓库名称',
+						prop: 'financeStorehouseName',
+						component: 'by-input',
+					},
+					{
+						span: 23,
+						labelWidth: '110px',
 						label: '地址',
 						prop: 'address',
 						component: 'by-input',
@@ -707,7 +746,7 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 0 16px;
-
+		height: 100%;
 		.search-btn {
 			width: 100%;
 			display: flex;
@@ -719,6 +758,7 @@
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
+			height: 100%;
 		}
 
 		@media screen and (min-width: 1500px) {

src/views/audit/distributor/index.vue

@@ -65,6 +65,9 @@
 			}
 		}
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -129,7 +132,6 @@
 				attr: {
 					size: 'mini',
 					align: 'left',
-					calculateH: '100%',
 				},
 				columns: [{
 					title: '名称',
@@ -483,105 +485,35 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
+		height: 100%;
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-
-			// box-sizing: border-box;
+			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
-			.title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
-
 		.detil {
 			width: 100%;
-
 			.box-shadow {
 				box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
 				padding: 20px;
@@ -595,7 +527,6 @@
 				margin-top: 20px;
 			}
 		}
-
 		@media screen and (min-width: 1700px) {
 			.bill-main {
 				min-width: 1450px;

src/views/audit/manufacturer/index.vue

@@ -65,6 +65,9 @@
 			}
 		}
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -129,7 +132,6 @@
 				attr: {
 					size: 'mini',
 					align: 'left',
-					calculateH: '100%',
 				},
 				columns: [{
 					title: '名称',
@@ -483,105 +485,35 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
+		height: 100%;
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-
-			// box-sizing: border-box;
+			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
-			.title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
-
 		.detil {
 			width: 100%;
-
 			.box-shadow {
 				box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
 				padding: 20px;
@@ -595,7 +527,6 @@
 				margin-top: 20px;
 			}
 		}
-
 		@media screen and (min-width: 1700px) {
 			.bill-main {
 				min-width: 1450px;

src/views/audit/order/index.vue

@@ -17,7 +17,8 @@
 		baseInfo : any = {}
 		config : any = {
 			attr: {
-				activeName: 'all'
+				activeName: 'all',
+				calculateH: true
 			},
 			// 单据
 			bill: {
@@ -105,48 +106,57 @@
 						table: {
 							attr: {
 								size: 'mini',
-								calculateH: '100%',
-								align: 'center',
+								align: 'left',
 								readonly: true
 							},
 							columns:
 								[{
-									width: 300,
+									width: 250,
 									title: '物料名称',
 									field: 'materialName',
 								},
 								{
-									width: 150,
+									width: 180,
+									title: '财务编号',
+									field: 'financeSuborderId',
+								},
+								{
+									width: 120,
 									title: '单位',
 									field: 'unit',
 								},
 								{
-									width: 150,
+									width: 120,
+									title: '单位编码',
+									field: 'unitCode',
+								},
+								{
+									width: 120,
 									title: '数量',
 									field: 'number',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '已交付数量',
 									field: 'deliveryNumber',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '单价',
 									field: 'unitPrice',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '实际金额',
 									field: 'realityPrice',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '优惠金额',
 									field: 'prePrice',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '合计金额',
 									field: 'totalPrice',
 								},
@@ -230,7 +240,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',

src/views/audit/orderTask/components/productModal.vue

@@ -70,27 +70,32 @@
 						{
 							title: '标题',
 							field: 'skuTitle',
-							width: 300
+							width: 250
 						},
 						{
 							title: '副标题',
 							field: 'skuSubtitle',
-							width: 300
+							width: 250
+						},
+						{
+							width: 250,
+							title: '财务编号',
+							field: 'financialCode',
 						},
 						{
 							title: '规格',
 							field: 'materialSpec',
-							width: 300
+							width: 250
 						},
 						{
 							title: '单位',
 							field: 'unit',
-							width: 300
+							width: 250
 						},
 						{
 							title: '单价',
 							field: 'price',
-							width: 300
+							width: 250
 						},
 					]
 			},

src/views/audit/orderTask/index.vue

@@ -38,7 +38,8 @@
 		timer : any = null
 		config : any = {
 			attr: {
-				activeName: 'all'
+				activeName: 'all',
+				calculateH:true
 			},
 			// 单据
 			bill: {
@@ -57,6 +58,11 @@
 					attr: {
 						size: 'medium',
 						readonly: false,
+						rules: {
+							deliveryData: [{
+								required: true, message: '请选择交货时间', trigger: 'change'
+							}],
+						}
 					},
 					columns: [
 						[
@@ -142,23 +148,32 @@
 						table: {
 							attr: {
 								size: 'mini',
-								calculateH: '100%',
-								align: 'center',
+								align: 'left',
 								readonly: true
 							},
 							columns:
 								[{
-									width: 300,
+									width: 270,
 									title: '物料名称',
 									field: 'materialName',
 								},
 								{
-									width: 140,
+									width: 180,
+									title: '财务编号',
+									field: 'financeSuborderId',
+								},
+								{
+									width: 120,
 									title: '单位',
 									field: 'unit',
 								},
 								{
-									width: 140,
+									width: 120,
+									title: '单位编码',
+									field: 'unitCode',
+								},
+								{
+									width: 120,
 									title: '数量',
 									field: 'number',
 									component: 'by-input',
@@ -171,7 +186,7 @@
 									}
 								},
 								{
-									width: 140,
+									width: 120,
 									title: '单价',
 									field: 'unitPrice',
 									component: 'by-input',
@@ -183,12 +198,12 @@
 									}
 								},
 								{
-									width: 140,
+									width: 120,
 									title: '实际金额',
 									field: 'realityPrice',
 								},
 								{
-									width: 140,
+									width: 120,
 									title: '优惠金额',
 									field: 'prePrice',
 									component: 'by-input',
@@ -201,7 +216,7 @@
 									}
 								},
 								{
-									width: 140,
+									width: 120,
 									title: '合计金额',
 									field: 'totalPrice',
 								},
@@ -299,7 +314,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -456,7 +470,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -612,7 +625,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -631,6 +643,7 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
+
 						{
 							width: 80,
 							title: '来源类型',
@@ -779,7 +792,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -1287,6 +1299,7 @@
 		// 确定商品新增
 		confirmProduct(e : any) {
 			let nowData = (this.$refs.bill as any).getBillTableData(0);
+			console.log(e);
 			let names = '';
 			if (e.length > 0) {
 				for (const item of e) {
@@ -1310,8 +1323,11 @@
 						obj.unitPrice = item.price
 						obj.materialSku = item.id
 						obj.unit = item.unit
+						obj.unitCode = item.unitCode
+						obj.financeSuborderId = item.financialCode
 						obj.prePrice = "0"
 						obj.isDeleted = 0
+						console.log(obj);
 						this.tableData.push(obj);
 						nowData.push(obj);
 					}

src/views/audit/organClassify/index.vue

@@ -53,6 +53,9 @@
 			}
 		}
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -105,7 +108,6 @@
 				attr: {
 					size: 'mini',
 					align: 'left',
-					calculateH: '100%',
 				},
 				columns: [{
 					title: '名称',
@@ -355,100 +357,32 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
+		height: 100%;
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-
-			// box-sizing: border-box;
+			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
-			.title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
 	}
 </style>

src/views/audit/outbound/components/businessType.vue

@@ -0,0 +1,34 @@
+<template>
+	<div>
+		<el-select v-model="value" placeholder="请选择业务类型" style="width: 100%;" @change="change">
+			<el-option v-for="(item,index) in options" :key="index" :value="item">
+			</el-option>
+		</el-select>
+	</div>
+</template>
+
+<script lang="ts">
+	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+	import api from "@/api/order";
+	@Component
+	export default class Focus extends Vue {
+		@Prop()
+		propValue : any;
+		value : any = '';
+		options : any = []
+		@Watch('propValue')
+		propValueChange(v : any) {
+			this.value = v;
+		};
+		created() {
+			api.getbusinessType('supplyOutOrder').then((res : any) => {
+				if (res.code === 200) {
+					this.options = res.data;
+				}
+			});
+		}
+		change(e : any) {
+			this.$emit('onChange', e)
+		}
+	}
+</script>

src/views/audit/outbound/index.vue

@@ -13,7 +13,7 @@
 	import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 	import api from "@/api/order";
 	import productModal from "../orderTask/components/productModal.vue";
-	import BusinessType from "../warehousing/components/businessType.vue";
+	import BusinessType from "./components/businessType.vue";
 	import towInOne from "../warehousing/components/towInOne.vue";
 	@Component({ components: { productModal } })
 	export default class OrderTask extends Vue {
@@ -32,7 +32,8 @@
 		timer : any = null
 		config : any = {
 			attr: {
-				activeName: 'all'
+				activeName: 'all',
+				calculateH: true
 			},
 			// 引单
 			source: [
@@ -76,7 +77,6 @@
 					},
 					table: {
 						attr: {
-							calculateH: '100%',
 							size: 'mini',
 							seq: true,
 							align: 'left',
@@ -171,7 +171,7 @@
 							},
 							{
 								span: 8,
-								label: '收获地址',
+								label: '收货地址',
 								prop: 'receiveAddress',
 								component: 'by-input',
 							},
@@ -186,6 +186,11 @@
 								label: 'WMS编号',
 								prop: 'wmsId',
 								component: 'by-input',
+								compConfig: {
+									attr: {
+										readonly: true,
+									},
+								}
 							},
 							{
 								span: 8,
@@ -216,7 +221,6 @@
 						table: {
 							attr: {
 								size: 'mini',
-								calculateH: '100%',
 								align: 'left',
 								readonly: true,
 							},
@@ -226,6 +230,11 @@
 									title: '物料名称',
 									field: 'materialName',
 								},
+								{
+									width: 200,
+									title: '财务编号',
+									field: 'financeSuborderId',
+								},
 								{
 									width: 200,
 									title: '仓库，仓位',
@@ -240,6 +249,11 @@
 									title: '单位',
 									field: 'unit',
 								},
+								{
+									width: 120,
+									title: '单位编码',
+									field: 'unitCode',
+								},
 								{
 									width: 100,
 									title: '库存',
@@ -330,18 +344,6 @@
 									}
 								}
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -353,7 +355,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -367,11 +368,6 @@
 							isDetail: true,
 							fixed: 'left'
 						},
-						{
-							width: 150,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 150,
 							title: 'WMS编号',
@@ -445,18 +441,6 @@
 									}
 								}
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -470,7 +454,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -484,11 +467,6 @@
 							isDetail: true,
 							fixed: 'left'
 						},
-						{
-							width: 150,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 150,
 							title: 'WMS编号',
@@ -562,18 +540,6 @@
 									}
 								}
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -601,7 +567,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -615,11 +580,6 @@
 							isDetail: true,
 							fixed: 'left'
 						},
-						{
-							width: 150,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 150,
 							title: 'WMS编号',
@@ -692,18 +652,6 @@
 									}
 								}
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -715,7 +663,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -729,11 +676,6 @@
 							isDetail: true,
 							fixed: 'left'
 						},
-						{
-							width: 150,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 150,
 							title: 'WMS编号',
@@ -1195,14 +1137,14 @@
 		// 分页
 		pagination(e : any) {
 			console.log('分页 ==> ', e);
-			if(e.type==='source_0'){
-				
+			if (e.type === 'source_0') {
+
 				let query : any = (this as any).$refs.bill.$refs.source_0[0].getSearchValue();
 				query.pageNo = e.page.pageNum;
 				query.pageSize = e.page.pageSize;
 				this.getCitationList(query);
-			}else{
-				
+			} else {
+
 				let query : any = (this as any).$refs.bill.getSearchValue(e.type);
 				query.pageNo = e.page.pageNum;
 				query.pageSize = e.page.pageSize;
@@ -1223,7 +1165,7 @@
 					}).catch(() => loading.close());
 				}
 			}
-			
+
 		}
 		// 回收站数据
 		getSelectDeleteList(query : any) {
@@ -1298,6 +1240,8 @@
 						obj.unitPrice = item.price
 						obj.materialSku = item.id
 						obj.unit = item.unit
+						obj.unitCode = item.unitCode
+						obj.financeSuborderId = item.financialCode
 						obj.prePrice = "0"
 						obj.isDeleted = 0
 						this.tableData.push(obj);

src/views/audit/productClassification/index.vue

@@ -55,9 +55,12 @@
 			}
 		}
 		config : any = {
+			attr: {
+				calculateH: true
+			},
 			search: {
 				attr: {
-					size: 'mini'
+					size: 'mini',
 				},
 				columns: [
 					[{
@@ -121,7 +124,6 @@
 					size: 'mini',
 					align: 'left',
 					checkbox: false,
-					calculateH: '100%',
 				},
 				columns: [{
 					width: 300,
@@ -381,13 +383,7 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
+		height: 100%;
 
 		.bill-left {
 			position: relative;
@@ -396,7 +392,6 @@
 			flex-shrink: 0;
 			height: 740px;
 
-			// box-sizing: border-box;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
@@ -409,41 +404,6 @@
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
 
 		.bill-main {
@@ -451,31 +411,8 @@
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
 	}
 </style>

src/views/audit/productManagement/index.vue

@@ -184,7 +184,7 @@
 			},
 			columns: [
 				{
-					width: '160px',
+					width: '150px',
 					title: '标题',
 					field: 'skuTitle',
 					component: 'by-input',
@@ -196,7 +196,7 @@
 					}
 				},
 				{
-					width: '150px',
+					width: '120px',
 					title: '副标题',
 					field: 'skuSubtitle',
 					component: 'by-input',
@@ -208,7 +208,7 @@
 					}
 				},
 				{
-					width: '150px',
+					width: '140px',
 					title: '物料编码',
 					field: 'skuCode',
 					component: 'by-input',
@@ -220,7 +220,19 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '140px',
+					title: '财务编号',
+					field: 'accountingCode',
+					component: 'by-input',
+					compConfig: {
+						attr: {
+							size: 'mini',
+							placeholder: ' '
+						},
+					}
+				},
+				{
+					width: '90px',
 					title: '价格',
 					field: 'price',
 					component: 'by-input',
@@ -234,7 +246,7 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
 					title: '单位',
 					field: 'unit',
 					component: 'by-input',
@@ -246,13 +258,25 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
+					title: '单位编码',
+					field: 'unitCode',
+					component: 'by-input',
+					compConfig: {
+						attr: {
+							size: 'mini',
+							placeholder: ' ',
+						},
+					}
+				},
+				{
+					width: '90px',
 					title: '库存',
 					field: 'stock',
 					slot: true,
 				},
 				{
-					width: '120px',
+					width: '110px',
 					title: '保质期（天）',
 					field: 'shelfLife',
 					component: 'by-input',
@@ -265,7 +289,7 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
 					title: '重量/g',
 					field: 'weight',
 					component: 'by-input',
@@ -278,7 +302,7 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
 					title: '长/cm',
 					field: 'length',
 					component: 'by-input',
@@ -291,7 +315,7 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
 					title: '宽/cm',
 					field: 'width',
 					component: 'by-input',
@@ -304,7 +328,7 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
 					title: '高/cm',
 					field: 'height',
 					component: 'by-input',
@@ -317,7 +341,7 @@
 					}
 				},
 				{
-					width: '110px',
+					width: '90px',
 					title: '体积/cm³',
 					field: 'volume',
 				},
@@ -330,7 +354,7 @@
 			},
 			columns: [
 				{
-					width: '170px',
+					width: '160px',
 					title: '标题',
 					field: 'skuTitle',
 					component: 'by-input',
@@ -365,6 +389,18 @@
 						},
 					}
 				},
+				{
+					width: '140px',
+					title: '财务编号',
+					field: 'accountingCode',
+					component: 'by-input',
+					compConfig: {
+						attr: {
+							size: 'mini',
+							placeholder: ' '
+						},
+					}
+				},
 				{
 					width: '80px',
 					title: '价格',
@@ -390,6 +426,18 @@
 						},
 					}
 				},
+				{
+					width: '80px',
+					title: '单位编码',
+					field: 'unitCode',
+					component: 'by-input',
+					compConfig: {
+						attr: {
+							size: 'mini',
+							placeholder: ' ',
+						},
+					}
+				},
 				{
 					width: '80px',
 					title: '库存',
@@ -492,12 +540,12 @@
 				{
 					width: '170px',
 					title: '标题',
-					field: 'skuTitle',
+					field: 'title',
 				},
 				{
 					width: '170px',
 					title: '副标题',
-					field: 'skuSubtitle',
+					field: 'subtitle',
 				},
 				{
 					width: '170px',
@@ -618,18 +666,6 @@
 							}
 						}
 					},
-					{
-						span: 6,
-						label: '财务编号',
-						prop: 'accountingCode',
-						component: 'by-input',
-						compConfig: {
-							attr: {
-								placeholder: '请输入财务编号',
-								clearable: true
-							}
-						}
-					},
 					{
 						span: 6,
 						label: '国际码',
@@ -780,6 +816,9 @@
 
 		}
 		config : any = {
+			attr: {
+				calculateH: true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -824,19 +863,6 @@
 								}
 							}
 						},
-						{
-							span: 6,
-							label: '财务编号',
-							prop: 'accountingCode',
-							component: 'by-input',
-							labelWidth: '70px',
-							compConfig: {
-								attr: {
-									placeholder: '请输入财务编号',
-									clearable: true
-								}
-							}
-						},
 					],
 				]
 			},
@@ -862,7 +888,6 @@
 					size: 'mini',
 					align: 'left',
 					checkbox: true,
-					calculateH: '100%',
 				},
 				columns: [{
 					width: 250,
@@ -877,10 +902,6 @@
 					width: 200,
 					title: '货号',
 					field: 'itemNumber'
-				}, {
-					width: 200,
-					title: '财务编号',
-					field: 'accountingCode'
 				}, {
 					width: 200,
 					title: '国际码',
@@ -924,6 +945,7 @@
 		}
 		// 确定商品新增
 		confirmProduct(e : any) {
+			console.log(e);
 			this.$nextTick(() => {
 				let nowData = (this.$refs.makeupTable as any).getValue();
 				let names = '';
@@ -943,8 +965,8 @@
 						}
 						if (t) {
 							let obj : any = {};
-							obj.skuTitle = item.skuTitle
-							obj.skuSubtitle = item.skuSubtitle
+							obj.title = item.skuTitle
+							obj.subtitle = item.skuSubtitle
 							obj.materialSkuId = item.id
 							obj.isDeleted = 0
 							this.makeupList.push(obj);
@@ -1057,7 +1079,8 @@
 					data.maindataMaterialReceiveParam.attributeList = ""
 				}
 				if (this.ismakeup === 0) {
-					if (this.makeupList.length < 0) return this.$message.warning('请选择组合商品');
+					console.log('this.makeupList ==> ', this.makeupList);
+					if (this.makeupList.length <= 0) return this.$message.warning('请选择组合商品');
 					data.maindataMaterialLinks = this.makeupList;
 					// 表格删除
 					data.maindataMaterialLinks.map((v : any, i : any) => {
@@ -1644,32 +1667,6 @@
 		display: flex;
 		padding: 16px;
 
-		.by-tab {
-			.tab-title {
-				padding: 10px 0 0;
-			}
-
-			.item-tab {
-				margin-right: 16px;
-			}
-
-			.input-new-tag {
-				width: 130px;
-			}
-
-
-			.flex-item {
-				margin-right: 20px;
-			}
-		}
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
@@ -1677,7 +1674,6 @@
 			flex-shrink: 0;
 			height: 740px;
 
-			// box-sizing: border-box;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
@@ -1685,46 +1681,11 @@
 				overflow: hidden;
 			}
 
-			.bill-title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
 
 		.bill-main {
@@ -1732,31 +1693,8 @@
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
 
 		.detil {

src/views/audit/saleOrder/index.vue

@@ -101,7 +101,8 @@
 		}
 		config : any = {
 			attr: {
-				activeName: 'all'
+				activeName: 'all',
+				calculateH: true
 			},
 			// 引单
 			source: [
@@ -169,7 +170,6 @@
 					},
 					table: {
 						attr: {
-							calculateH: '100%',
 							size: 'mini',
 							seq: true,
 							align: 'left',
@@ -239,6 +239,11 @@
 				form: {
 					attr: {
 						size: 'medium',
+						rules: {
+							planDeliveryData: [{
+								required: true, message: '请选择交货时间', trigger: 'change'
+							}],
+						}
 					},
 					columns: [
 						[
@@ -288,7 +293,7 @@
 							},
 							{
 								span: 8,
-								label: '计划交货时间',
+								label: '交货时间',
 								prop: 'planDeliveryData',
 								component: 'by-date-picker',
 								compConfig: {
@@ -301,7 +306,7 @@
 							},
 							{
 								span: 8,
-								label: '确定交货时间',
+								label: '确定时间',
 								prop: 'affirmDeliveryData',
 								component: 'by-input',
 								compConfig: {
@@ -346,48 +351,57 @@
 						table: {
 							attr: {
 								size: 'mini',
-								calculateH: '100%',
-								align: 'center',
+								align: 'left',
 								readonly: true
 							},
 							columns:
 								[{
-									width: 300,
+									width: 250,
 									title: '物料名称',
 									field: 'materialName',
 								},
 								{
-									width: 150,
+									width: 180,
+									title: '财务编号',
+									field: 'financeSuborderId',
+								},
+								{
+									width: 120,
 									title: '单位',
 									field: 'unit',
 								},
 								{
-									width: 150,
+									width: 120,
+									title: '单位编码',
+									field: 'unitCode',
+								},
+								{
+									width: 120,
 									title: '数量',
 									field: 'number',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '已交付数量',
 									field: 'outNumber',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '单价',
 									field: 'unitPrice',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '实际金额',
 									field: 'realityPrice',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '优惠金额',
 									field: 'prePrice',
 								},
 								{
-									width: 150,
+									width: 120,
 									title: '合计金额',
 									field: 'totalPrice',
 								},
@@ -443,14 +457,20 @@
 									(this as any).doBackOrder()
 								}
 							}
-						}
+						},
+						{
+							name: '同步到财务系统', icon: 'el-icon-top', audit: [''], event: {
+								click: () => {
+									(this as any).syncSystem()
+								}
+							}
+						},
 					]
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
-						seq: true,
+					triggerRowCheck: 'row',
 						align: 'left',
 						radio: true
 					},
@@ -470,6 +490,11 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
+						{
+							width: 150,
+							title: '财务编号',
+							field: 'financeOrderId',
+						},
 						{
 							width: 90,
 							title: '收货人',
@@ -481,12 +506,12 @@
 							field: 'phone',
 						},
 						{
-							width: 150,
+							width: 130,
 							title: '计划交货时间',
 							field: 'planDeliveryData',
 						},
 						{
-							width: 150,
+							width: 130,
 							title: '确定交货时间',
 							field: 'affirmDeliveryData',
 						},
@@ -496,21 +521,33 @@
 							field: 'address',
 						},
 						{
-							width: 150,
+							width: 90,
 							title: '状态',
 							field: 'status',
 							component: Assembly,
 						},
 						{
-							width: 110,
+							width: 90,
 							title: '操作',
 							action: true,
 							plugins: [
 								{
-									icon: 'el-icon-edit',
 									name: '查看',
-									audit: '',
 									event: {
+										show: (item : any) => {
+											return item.status != 0
+										},
+										click: (item : any) => {
+											(this as any).openEdit(item)
+										}
+									}
+								},
+								{
+									name: '编辑',
+									event: {
+										show: (item : any) => {
+											return item.status === 0
+										},
 										click: (item : any) => {
 											(this as any).openEdit(item)
 										}
@@ -520,7 +557,7 @@
 									name: '拆单',
 									event: {
 										show: (item : any) => {
-											return item.isMaster === 1
+											return item.isMaster === 1 && item.status === 0
 										},
 										click: (item : any) => (this as any).orderTaking(item)
 									}
@@ -573,11 +610,8 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
-						seq: true,
 						align: 'left',
-						checkbox: true
 					},
 					columns: [
 						{
@@ -592,6 +626,11 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
+						{
+							width: 150,
+							title: '财务编号',
+							field: 'financeOrderId',
+						},
 						{
 							width: 90,
 							title: '收货人',
@@ -603,12 +642,12 @@
 							field: 'phone',
 						},
 						{
-							width: 150,
+							width: 130,
 							title: '计划交货时间',
 							field: 'planDeliveryData',
 						},
 						{
-							width: 150,
+							width: 130,
 							title: '确定交货时间',
 							field: 'affirmDeliveryData',
 						},
@@ -618,13 +657,13 @@
 							field: 'address',
 						},
 						{
-							width: 150,
+							width: 100,
 							title: '状态',
 							field: 'status',
 							component: Assembly,
 						},
 						{
-							width: 110,
+							width: 90,
 							title: '操作',
 							action: true,
 							plugins: [{
@@ -827,7 +866,7 @@
 			}).catch(() => loading.close());
 		}
 		// 保存
-		onSave(){
+		onSave() {
 			let query = (this.$refs.bill as any).getBillFormValue(); // 获取单据数据
 			console.log('保存参数query ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
@@ -877,12 +916,19 @@
 											(this as any).doBackOrder2(parentData)
 										}
 									}
-								}
+								},
+								{
+									name: '同步到财务系统', icon: 'el-icon-top', audit: [''], event: {
+										click: () => {
+											(this as any).syncSystem2(parentData)
+										}
+									}
+								},
 							];
 						}
 					};
 					billConfig.tool.tools = {};
-					billConfig.form.columns[0].map((v:any) => {
+					billConfig.form.columns[0].map((v : any) => {
 						v.compConfig.attr.readonly = true;
 					})
 					console.log(billConfig.form.columns[0]);
@@ -906,7 +952,7 @@
 		}
 		// 导航切换
 		clickTab(e : any) {
-			console.log('导航切换 ==> ', e);
+			// console.log('导航切换 ==> ', e);
 			// submitState: 提交状态
 			if (e === 'source') {
 				this.getCitationList({});
@@ -920,16 +966,59 @@
 				(this.$refs.bill as any).setBillConfig(billConfig);
 			}
 		}
+		// 同步销售订单到财务系统
+		syncSystem() {
+			let selectData = (this as any).$refs.bill.getTableSelectData('all');
+			if (selectData.length > 0) {
+				if (selectData[0].isMaster !== 1 || selectData[0].status !== 0) return this.$message.warning('只能同步未出库的主单');
+				this.$confirm('确定同步订单吗', '注意', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+					center: true
+				}).then(() => {
+					let loading = this.$loading({ target: '.main-container' });
+					api.addSaleOrder({ ids: selectData[0].id }).then((res : any) => {
+						loading.close();
+						if (res.code === 200) {
+							this.$message.success('同步订单成功');
+							this.getDataList();
+							(this.$refs.bill as any).showTab = 'all';
+						} else this.$message.error(res.msg)
+					}).catch(() => loading.close());
+				}).catch(() => this.$message.info('已取消同步订单'));
+			} else this.$message.warning('请选择同步数据');
+		}
+		// 单据操作同步
+		syncSystem2(e : any) {
+			this.$confirm('确定同步订单吗', '注意', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+				center: true
+			}).then(() => {
+				let loading = this.$loading({ target: '.main-container' });
+				api.addSaleOrder({ ids: e.id }).then((res : any) => {
+					loading.close();
+					if (res.code === 200) {
+						this.$message.success('同步订单成功');
+						this.getDataList();
+						(this.$refs.bill as any).showTab = 'all';
+					} else this.$message.error(res.msg)
+				}).catch(() => loading.close());
+			}).catch(() => this.$message.info('已取消同步订单'));
+		}
 		// 工具栏终止订单
 		doBackOrder() {
 			let selectData = (this as any).$refs.bill.getTableSelectData('all');
+			console.log(selectData);
 			// if (selectData.length > 1) return this.$message.warning('只能选择一条终止订单数据');
 			let ids : any = [];
 			if (selectData.length > 0) {
 				selectData.map((v : any) => {
 					ids.push(v.id);
 				})
-			} else return this.$message({ type: 'warning', message: '请选择终止订单数据' })
+			} else return this.$message.warning('请选择终止订单数据');
 			// console.log(ids);
 			this.$confirm('确定终止订单吗！', '注意', {
 				confirmButtonText: '确定',
@@ -970,12 +1059,12 @@
 		// 分页
 		pagination(e : any) {
 			console.log('分页 ==> ', e);
-			if(e.type==='source_0'){
+			if (e.type === 'source_0') {
 				let query : any = (this as any).$refs.bill.$refs.source_0[0].getSearchValue();
 				query.pageNo = e.page.pageNum;
 				query.pageSize = e.page.pageSize;
 				this.getCitationList(query);
-			}else{
+			} else {
 				let query : any = (this as any).$refs.bill.getSearchValue(e.type);
 				query.pageNo = e.page.pageNum;
 				query.pageSize = e.page.pageSize;

src/views/audit/supplier/index.vue

@@ -65,6 +65,9 @@
 			}
 		}
 		config : any = {
+			attr: {
+				calculateH: true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -129,7 +132,6 @@
 				attr: {
 					size: 'mini',
 					align: 'left',
-					calculateH: '100%',
 				},
 				columns: [{
 					title: '名称',
@@ -408,8 +410,8 @@
 				loading.close();
 				if (res.code === 200) {
 					res.data.records.map((v : any) => {
-						if(v.financeType==='kingdee')v.financeType2 = '金蝶K3';
-						if(v.financeType==='yonbip')v.financeType2 = '用友U8';
+						if (v.financeType === 'kingdee') v.financeType2 = '金蝶K3';
+						if (v.financeType === 'yonbip') v.financeType2 = '用友U8';
 					});
 					(this.$refs.moduleView as any).setTableValue(res.data.records);
 					let page = {
@@ -483,105 +485,35 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
+		height: 100%;
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-
-			// box-sizing: border-box;
+			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
-			.title {
+			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
-
 		.detil {
 			width: 100%;
-
 			.box-shadow {
 				box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
 				padding: 20px;
@@ -595,7 +527,6 @@
 				margin-top: 20px;
 			}
 		}
-
 		@media screen and (min-width: 1700px) {
 			.bill-main {
 				min-width: 1450px;

src/views/audit/virtually/index.vue

@@ -55,6 +55,9 @@
 			}
 		}
 		config : any = {
+			attr:{
+				calculateH:true
+			},
 			search: {
 				attr: {
 					size: 'mini'
@@ -121,7 +124,6 @@
 					size: 'mini',
 					align: 'left',
 					checkbox: false,
-					calculateH: '100%',
 				},
 				columns: [{
 					width: 300,
@@ -382,101 +384,36 @@
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
-
-		.search-btn {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			margin-bottom: 20px;
-		}
-
+		height: 100%;
+	
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
 			height: 740px;
-
-			// box-sizing: border-box;
+	
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
+	
 			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
-
-			.bill-nav {
-				font-size: 14px;
-				height: 30px;
-				line-height: 30px;
-				width: 200px;
-				box-sizing: border-box;
-				padding: 0 8px;
-				cursor: pointer;
-				margin-bottom: 2px;
-				border-radius: 5px;
-			}
-
-			.onBill {
-				background-color: #bde3f7;
-			}
-
-			.bill-nav:hover {
-				background-color: #bde3f7;
-			}
-
-			.close {
-				height: 22px;
-				width: 22px;
-				border-radius: 50%;
-				border: solid #EEE 1px;
-				position: absolute;
-				top: 30px;
-				right: -11px;
-				background-color: #FFF;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				cursor: pointer;
-			}
 		}
-
+	
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-
-			.bill-box {
-				width: 100%;
-				position: absolute;
-				left: 0;
-				top: 0;
-				opacity: 0;
-				z-index: -1;
-				transition: all .5s;
-
-				.bill-tool,
-				.table-tool {
-					width: 100%;
-					padding-bottom: 16px;
-				}
-
-				.form {
-					margin-bottom: 8px;
-				}
-			}
-
-			.on-show {
-				opacity: 1;
-				z-index: 1;
-			}
+			height: 100%;
+			overflow-y: hidden;
 		}
 	}
 </style>

src/views/audit/warehousing/index.vue

@@ -36,7 +36,8 @@
 		timer : any = null
 		config : any = {
 			attr: {
-				activeName: 'all'
+				activeName: 'all',
+				calculateH: true
 			},
 			// 单据
 			bill: {
@@ -92,18 +93,16 @@
 								prop: 'businessType',
 								component: BusinessType,
 							},
-							{
-
-								span: 8,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-							},
 							{
 								span: 8,
 								label: 'WMS编码',
 								prop: 'wmsId',
 								component: 'by-input',
+								compConfig: {
+									attr: {
+										readonly: true,
+									},
+								}
 							},
 						],
 						[
@@ -134,17 +133,21 @@
 						table: {
 							attr: {
 								size: 'mini',
-								calculateH: '100%',
-								align: 'center',
+								align: 'left',
 								readonly: true
 							},
 							columns:
 								[
 									{
-										width: 300,
+										width: 250,
 										title: '物料名称',
 										field: 'materialName',
 									},
+									{
+										width: 200,
+										title: '财务编号',
+										field: 'financeSuborderId',
+									},
 									{
 										width: 200,
 										title: '仓库，仓位',
@@ -156,6 +159,11 @@
 										title: '单位',
 										field: 'unit',
 									},
+									{
+										width: 120,
+										title: '单位编码',
+										field: 'unitCode',
+									},
 									{
 										width: 110,
 										title: '数量',
@@ -243,18 +251,6 @@
 									},
 								},
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -266,7 +262,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -285,11 +280,6 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
-						{
-							width: 200,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 200,
 							title: 'WMS编号',
@@ -359,18 +349,6 @@
 									},
 								},
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -384,7 +362,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -403,15 +380,15 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
-						{
-							width: 200,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 200,
 							title: 'WMS编号',
 							field: 'wmsId',
+							compConfig: {
+								attr: {
+									readonly: true,
+								},
+							}
 						},
 						{
 							width: 120,
@@ -478,18 +455,6 @@
 									},
 								},
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -500,19 +465,18 @@
 						search: true,
 						refresh: true
 					},
-					customTools: [
-						{
-							name: '同步入库单', icon: 'el-icon-top', audit: [''], event: {
-								click: () => {
-									(this as any).syncEntry()
-								}
-							}
-						},
-					]
+					// customTools: [
+					// 	{
+					// 		name: '同步入库单', icon: 'el-icon-top', audit: [''], event: {
+					// 			click: () => {
+					// 				(this as any).syncEntry()
+					// 			}
+					// 		}
+					// 	},
+					// ]
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -531,11 +495,6 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
-						{
-							width: 200,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 200,
 							title: 'WMS编号',
@@ -606,18 +565,6 @@
 									},
 								},
 							},
-							{
-								span: 6,
-								label: '财务系统单据',
-								prop: 'financeOrderId',
-								component: 'by-input',
-								compConfig: {
-									attr: {
-										placeholder: '请输入财务系统单据',
-										clearable: true
-									},
-								},
-							},
 						],
 					]
 				},
@@ -629,7 +576,6 @@
 				},
 				table: {
 					attr: {
-						calculateH: '100%',
 						size: 'mini',
 						seq: true,
 						align: 'left',
@@ -648,11 +594,6 @@
 							title: '机构名称',
 							field: 'organizationName',
 						},
-						{
-							width: 200,
-							title: '财务系统单据',
-							field: 'financeOrderId',
-						},
 						{
 							width: 200,
 							title: 'WMS编号',
@@ -673,7 +614,6 @@
 							title: '操作',
 							action: true,
 							plugins: [{
-								// icon: 'el-icon-edit',
 								name: '查看',
 								audit: '',
 								event: {
@@ -1115,6 +1055,8 @@
 						obj.unitPrice = item.price
 						obj.materialSku = item.id
 						obj.unit = item.unit
+						obj.unitCode = item.unitCode
+						obj.financeSuborderId = item.financialCode
 						obj.prePrice = "0"
 						obj.isDeleted = 0
 						this.tableData.push(obj);

vue.config.js

@@ -32,7 +32,7 @@ module.exports = defineConfig({
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         ws:false,
-        // target: `http://192.168.1.78:8080`,
+        // target: `http://192.168.1.251:8080`,
         target: `http://192.168.2.202:8080`,
         // target: `http://192.168.1.134:8080`,
         changeOrigin: true,