订单任务

src/benyun/components/byBill/byBill.vue

@@ -442,7 +442,7 @@
 
 <style lang="scss" scoped>
 	.bill {
-		width: 100%;
+		width: calc(100% - 32px);
 		box-sizing: border-box;
 		display: flex;
 		padding: 16px;
@@ -452,7 +452,7 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			min-height: 780px;
+			min-height: 500px;
 
 			.bill-tab {
 				width: 180px;

src/views/audit/agencyGoods/index.vue

@@ -254,6 +254,8 @@
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
 			this.parentIds = e.id;
+			data.pageSize = 20;
+			data.pageNo = 1;
 			let loading = this.$loading({ target: '.main-container' });
 			api.childrenTreeList(data, 'maindataMaterialOrganizationCategory').then((res : any) => {
 				loading.close();
@@ -332,7 +334,10 @@
 			this.popTitle = '新增'
 			this.dialogFormVisible = true;
 			this.radio = 0
-			this.$nextTick(() => (this as any).$refs.addFormId.setValue());
+			setTimeout(() => {
+				(this as any).$refs.addFormId.setValue();
+				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+			}, 0)
 		}
 		// 打开编辑
 		openEdit(e : any) {
@@ -392,7 +397,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;

src/views/audit/attribute/index.vue

@@ -456,7 +456,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 
 			.bill-tab {
 				width: 150px;

src/views/audit/brand/index.vue

@@ -342,7 +342,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;

src/views/audit/distributor/index.vue

@@ -491,7 +491,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;

src/views/audit/manufacturer/index.vue

@@ -491,7 +491,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;

src/views/audit/order/index.vue

@@ -121,42 +121,42 @@
 									field: 'financeSuborderId',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '单位',
 									field: 'unit',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '单位编码',
 									field: 'unitCode',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '数量',
 									field: 'number',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '已交付数量',
 									field: 'deliveryNumber',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '单价',
 									field: 'unitPrice',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '实际金额',
 									field: 'realityPrice',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '优惠金额',
 									field: 'prePrice',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '合计金额',
 									field: 'totalPrice',
 								},
@@ -323,7 +323,7 @@
 		getPageList(query : any, type : any) {
 			let data = (this.$refs.bill as any).getTablePage('all');
 			query.pageNo = data.pageNo;
-			query.pageSize = data.pageSize;
+			query.pageSize = 10;
 			query.submitState = 1; // 已提交状态
 			console.log('分页数据 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });

src/views/audit/orderTask/index.vue

@@ -39,7 +39,7 @@
 		config : any = {
 			attr: {
 				activeName: 'all',
-				calculateH:true
+				calculateH: true
 			},
 			// 单据
 			bill: {
@@ -371,7 +371,7 @@
 								name: '反提交',
 								event: {
 									show: (item : any) => {
-										return item.sourceType == '手工输入'
+										return item.status === 0
 									},
 									click: (item : any) => (this as any).onReturnSmt(item)
 								}
@@ -592,7 +592,8 @@
 						seq: true,
 						align: 'left',
 						checkbox: true,
-						triggerRowCheck: 'row'
+						triggerRowCheck: 'row',
+						maxHeight: "620"
 					},
 					columns: [
 						{
@@ -1169,7 +1170,7 @@
 		getPageList(query : any, type : any) {
 			let data = (this.$refs.bill as any).getTablePage(this.tabType);
 			query.pageNo = data.pageNo;
-			query.pageSize = data.pageSize;
+			query.pageSize = 10;
 			console.log('分页数据 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'supplyTaskOrder').then((res : any) => {
@@ -1337,7 +1338,7 @@
 				center: true
 			}).then(() => {
 				let loading = this.$loading({ target: '.main-container' });
-				api.deleteList(ids, 'supplyTaskOrder').then((res : any) => {
+				api.deleteList({ids:ids}, 'supplyTaskOrder').then((res : any) => {
 					loading.close();
 					if (res.code === 200) {
 						this.$message.success('删除成功');

src/views/audit/organClassify/index.vue

@@ -363,7 +363,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;

src/views/audit/outbound/index.vue

@@ -629,7 +629,8 @@
 						seq: true,
 						align: 'left',
 						checkbox: true,
-						triggerRowCheck: 'row'
+						triggerRowCheck: 'row',
+						maxHeight: "620"
 					},
 					columns: [
 						{
@@ -1224,7 +1225,7 @@
 		getPageList(query : any, type : any) {
 			let data = (this.$refs.bill as any).getTablePage(this.tabType);
 			query.pageNo = data.pageNo;
-			query.pageSize = data.pageSize;
+			query.pageSize = 10;
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'supplyOutOrder').then((res : any) => {
 				loading.close();

src/views/audit/productClassification/index.vue

@@ -398,7 +398,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 
 			.bill-tab {
 				width: 150px;

src/views/audit/productManagement/index.vue

@@ -1684,7 +1684,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 
 			.bill-tab {
 				width: 150px;

src/views/audit/saleOrder/components/settingConfig.vue

@@ -42,8 +42,8 @@
 						label: '单据类型',
 						prop: 'FBillTypeID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入单据类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入单据类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -57,8 +57,8 @@
 						label: '客户',
 						prop: 'FCustId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入客户', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入客户', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -72,8 +72,8 @@
 						label: '收货方',
 						prop: 'FReceiveId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入收货方', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入收货方', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -89,8 +89,8 @@
 						label: '结算方',
 						prop: 'FSettleId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入结算方', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入结算方', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -104,8 +104,8 @@
 						label: '付款方',
 						prop: 'FNAME',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入付款方', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入付款方', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -119,8 +119,8 @@
 						label: '汇率类型',
 						prop: 'FExchangeTypeId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入汇率类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入汇率类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -136,8 +136,8 @@
 						label: '结算币别',
 						prop: 'FSettleCurrId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入结算币别', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入结算币别', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -151,8 +151,8 @@
 						label: '产品类型',
 						prop: 'FRowType',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入产品类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入产品类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -166,8 +166,8 @@
 						label: '货主类型',
 						prop: 'FOwnerTypeId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入货主类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入货主类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -183,8 +183,8 @@
 						label: 'BOM版本',
 						prop: 'FBomId',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入BOM版本', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入BOM版本', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -198,8 +198,8 @@
 						label: '预留类型',
 						prop: 'FReserveType',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入预留类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入预留类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -213,8 +213,8 @@
 						label: '超发控制',
 						prop: 'FOUTLMTUNIT',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入超发控制', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入超发控制', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -237,8 +237,8 @@
 						label: '单据类型',
 						prop: 'FBillTypeID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入单据类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入单据类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -252,8 +252,8 @@
 						label: '客户',
 						prop: 'FCustomerID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入客户', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入客户', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -267,8 +267,8 @@
 						label: '收货方',
 						prop: 'FReceiverID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入收货方', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入收货方', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -284,8 +284,8 @@
 						label: '结算方',
 						prop: 'FSettleID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入结算方', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入结算方', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -299,8 +299,8 @@
 						label: '付款方',
 						prop: 'FPayerID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入付款方', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入付款方', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -314,8 +314,8 @@
 						label: '汇率类型',
 						prop: 'FExchangeTypeID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入汇率类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入汇率类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -331,8 +331,8 @@
 						label: '汇率',
 						prop: 'FExchangeRate',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入汇率', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入汇率', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -346,8 +346,8 @@
 						label: '结算币别',
 						prop: 'FSettleCurrID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入结算币别', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入结算币别', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -361,8 +361,8 @@
 						label: '产品类型',
 						prop: 'FRowType',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入产品类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入产品类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -378,8 +378,8 @@
 						label: '货主类型',
 						prop: 'FOwnerTypeIdHead',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入货主类型', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入货主类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -393,8 +393,8 @@
 						label: '本位币',
 						prop: 'FLocalCurrID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入本位币', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入本位币', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -408,8 +408,8 @@
 						label: '货主',
 						prop: 'FOwnerID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入货主', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入货主', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -425,8 +425,8 @@
 						label: '库存状态',
 						prop: 'FStockStatusID',
 						component: 'by-input',
-						rules:[
-						  { required: true, message: '请输入库存状态', trigger: 'blur' }
+						rules: [
+							{ required: true, message: '请输入库存状态', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
@@ -473,46 +473,61 @@
 			let value : any = "";
 			let data : any = {}
 			if (this.type == "setXForm") {
-				value = (this as any).$refs.setXForm.getValue();
-				if (this.baseInfo.saleorderSetting) {
-					let obj : any = JSON.parse(this.baseInfo.saleorderSetting);
-					if (obj[this.getDepId]) {
-						obj[this.getDepId] = value
+				(this as any).$refs.setXForm.validate().then(() => {
+					value = (this as any).$refs.setXForm.getValue();
+					if (this.baseInfo.saleorderSetting) {
+						let obj : any = JSON.parse(this.baseInfo.saleorderSetting);
+						if (obj[this.getDepId]) {
+							obj[this.getDepId] = value
+						} else {
+							if (this.getDepId == "kingdee") {
+								obj.kingdee = value
+							} else obj.yonbip = value
+						}
+						data.saleorderSetting = JSON.stringify(obj);
 					} else {
-						if (this.getDepId == "kingdee") {
-							obj.kingdee = value
-						} else obj.yonbip = value
+						data.saleorderSetting = JSON.stringify({ [this.getDepId]: value })
 					}
-					data.outorderSetting = JSON.stringify(obj);
-				} else {
-					data.saleorderSetting = JSON.stringify({ [this.getDepId]: value })
-				}
-			} else if (this.type == "setCForm") {
-				value = (this as any).$refs.setCForm.getValue();
-				if (this.baseInfo.outorderSetting) {
-					let obj : any = JSON.parse(this.baseInfo.outorderSetting);
-					if (obj[this.getDepId]) {
-						obj[this.getDepId] = value
+					if (this.baseInfo) data.id = this.baseInfo.id;
+					let loading = this.$loading({ target: '.main-container' });
+					api.updateList(data, 'supplyFinanceSetting').then((res : any) => {
+						if (res.code === 200) {
+							this.setValue = false;
+							loading.close();
+							this.$message.success("保存成功");
+						} else loading.close();
+					}).catch(() => loading.close());
+					
+				})
+			}
+			if (this.type == "setCForm") {
+				(this as any).$refs.setCForm.validate().then(() => {
+					value = (this as any).$refs.setCForm.getValue();
+					if (this.baseInfo.outorderSetting) {
+						let obj : any = JSON.parse(this.baseInfo.outorderSetting);
+						if (obj[this.getDepId]) {
+							obj[this.getDepId] = value
+						} else {
+							if (this.getDepId == "kingdee") {
+								obj.kingdee = value
+							} else obj.yonbip = value
+						}
+						data.outorderSetting = JSON.stringify(obj);
 					} else {
-						if (this.getDepId == "kingdee") {
-							obj.kingdee = value
-						} else obj.yonbip = value
+						data.outorderSetting = JSON.stringify({ [this.getDepId]: value })
 					}
-					data.outorderSetting = JSON.stringify(obj);
-				} else {
-					data.outorderSetting = JSON.stringify({ [this.getDepId]: value })
-				}
+					if (this.baseInfo) data.id = this.baseInfo.id;
+					let loading = this.$loading({ target: '.main-container' });
+					api.updateList(data, 'supplyFinanceSetting').then((res : any) => {
+						if (res.code === 200) {
+							this.setValue = false;
+							loading.close();
+							this.$message.success("保存成功");
+						} else loading.close();
+					}).catch(() => loading.close());
+					
+				})
 			}
-			if (this.baseInfo) data.id = this.baseInfo.id;
-			console.log(data);
-			let loading = this.$loading({ target: '.main-container' });
-			api.updateList(data, 'supplyFinanceSetting').then((res : any) => {
-				if (res.code === 200) {
-					this.setValue = false;
-					loading.close();
-					this.$message.success("保存成功");
-				} else loading.close();
-			}).catch(() => loading.close());
 		}
 	}
 </script>

src/views/audit/saleOrder/index.vue

@@ -370,42 +370,42 @@
 									field: 'financeSuborderId',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '单位',
 									field: 'unit',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '单位编码',
 									field: 'unitCode',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '数量',
 									field: 'number',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '已交付数量',
 									field: 'outNumber',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '单价',
 									field: 'unitPrice',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '实际金额',
 									field: 'realityPrice',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '优惠金额',
 									field: 'prePrice',
 								},
 								{
-									width: 120,
+									width: 110,
 									title: '合计金额',
 									field: 'totalPrice',
 								},
@@ -483,7 +483,8 @@
 						size: 'mini',
 						triggerRowCheck: 'row',
 						align: 'left',
-						radio: true
+						radio: true,
+						maxHeight: "620"
 					},
 					columns: [
 						{
@@ -514,7 +515,7 @@
 							field: 'consignee',
 						},
 						{
-							width: 120,
+							width: 100,
 							title: '联系方式',
 							field: 'phone',
 						},
@@ -534,7 +535,7 @@
 							field: 'address',
 						},
 						{
-							width: 90,
+							width: 80,
 							title: '状态',
 							field: 'status',
 							component: Assembly,
@@ -845,7 +846,7 @@
 		getPageList(query : any, type : any) {
 			let data = (this.$refs.bill as any).getTablePage('all');
 			query.pageNo = data.pageNo;
-			query.pageSize = data.pageSize;
+			query.pageSize = 10;
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'supplyPurchaseOrder').then((res : any) => {
 				loading.close();

src/views/audit/sku/index.vue

@@ -182,9 +182,9 @@
 			]
 		}
 		config : any = {
-			attr: {
-				calculateH: true
-			},
+			// attr:{
+			// 	calculateH:true
+			// },
 			search: {
 				attr: {
 					size: 'mini'
@@ -199,20 +199,19 @@
 							labelWidth: '70px',
 							compConfig: {
 								attr: {
-									placeholder: '请输入简称',
+									placeholder: '请输入物料编码',
 									clearable: true
 								}
 							}
 						},
 						{
 							span: 6,
-							label: '货号',
-							prop: 'itemNumber',
+							label: '财务编号',
+							prop: 'financialCode',
 							component: 'by-input',
-							labelWidth: '70px',
 							compConfig: {
 								attr: {
-									placeholder: '请输入货号',
+									placeholder: '请输入财务编号',
 									clearable: true
 								}
 							}
@@ -239,7 +238,7 @@
 				attr: {
 					size: 'mini',
 					align: 'left',
-					checkbox: true,
+					height:'620'
 				},
 				columns: [
 					{
@@ -399,42 +398,32 @@
 		width: 100%;
 		box-sizing: border-box;
 		display: flex;
-		padding: 16px;
 		height: 100%;
-
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
-
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-
 			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
 		}
-
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;
 			margin-left: 16px;
 			position: relative;
-			height: 100%;
-			overflow-y: hidden;
 		}
-
 		.detil {
 			width: 100%;
-
 			.box-shadow {
 				box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
 				padding: 20px;
@@ -448,7 +437,6 @@
 				margin-top: 20px;
 			}
 		}
-
 		@media screen and (min-width: 1700px) {
 			.bill-main {
 				min-width: 1450px;

src/views/audit/supplier/index.vue

@@ -491,7 +491,6 @@
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
 			.bill-tab {
 				width: 150px;
 				height: 100%;

src/views/audit/virtually/index.vue

@@ -55,8 +55,8 @@
 			}
 		}
 		config : any = {
-			attr:{
-				calculateH:true
+			attr: {
+				calculateH: true
 			},
 			search: {
 				attr: {
@@ -251,6 +251,8 @@
 			let data : any = {};
 			e.isContain ? data.ids = e.id : data.parentId = e.id;
 			this.parentIds = e.id;
+			data.pageSize = 20;
+			data.pageNo = 1;
 			let loading = this.$loading({ target: '.main-container' });
 			api.childrenTreeList(data, 'maindataMaterialVmcategory').then((res : any) => {
 				loading.close();
@@ -330,7 +332,10 @@
 			this.popTitle = '新增'
 			this.dialogFormVisible = true;
 			this.radio = 0
-			this.$nextTick(() => (this as any).$refs.addFormId.setValue());
+			setTimeout(() => {
+				(this as any).$refs.addFormId.setValue();
+				(this as any).$refs.addFormId.$refs['parentName--comp'][0].request();
+			}, 0)
 		}
 		// 打开编辑
 		openEdit(e : any) {
@@ -346,7 +351,7 @@
 						if (res.code === 200) {
 							data.parentName = res.data.name;
 							this.dialogFormVisible = true;
-							console.log(data,'data');
+							console.log(data, 'data');
 							setTimeout(() => { (this as any).$refs.addFormId.setValue(data) }, 0);
 						}
 					})
@@ -386,28 +391,27 @@
 		display: flex;
 		padding: 16px;
 		height: 100%;
-	
+
 		.bill-left {
 			position: relative;
 			border-right: solid #EEE 1px;
 			padding-right: 16px;
 			flex-shrink: 0;
-			height: 740px;
-	
+
 			.bill-tab {
 				width: 150px;
 				height: 100%;
 				transition: all .5s;
 				overflow: hidden;
 			}
-	
+
 			.tab-title {
 				font-size: 16px;
 				padding-bottom: 16px;
 				width: 200px;
 			}
 		}
-	
+
 		.bill-main {
 			width: calc(100% - 16px);
 			box-sizing: border-box;

src/views/audit/warehousing/index.vue

@@ -528,7 +528,8 @@
 						seq: true,
 						align: 'left',
 						checkbox: true,
-						triggerRowCheck: 'row'
+						triggerRowCheck: 'row',
+						maxHeight: "620"
 					},
 					columns: [
 						{
@@ -1062,10 +1063,10 @@
 		}
 		// 分页
 		pagination(e : any) {
-			console.log('分页 ==> ', e);
 			let query : any = (this as any).$refs.bill.getSearchValue(e.type);
 			query.pageNo = e.page.pageNum;
-			query.pageSize = e.page.pageSize;
+			query.pageSize = 10;
+			console.log('分页 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			if (e.type === 'recycleBin') {
 				api.selectDeleteList(query, 'supplyEntryOrder').then((res : any) => {