Browse Source

出入库test

AlanWong 1 year ago
parent
commit
581bcfcd69

+ 1 - 1
src/components/Assembly/saleOrder.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-tag size='mini' :type="propValue===0?'info':propValue===0?'primary':'danger'"
+		<el-tag size='mini' :type="propValue===0?'info':propValue===1?'primary':'danger'"
 			disable-transitions>{{propValue===0?'未出库':propValue===1?'已出库':'已终止'}}</el-tag>
 	</div>
 </template>

+ 8 - 3
src/views/audit/order/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<by-bill ref="bill" :propConfig="config" @search="search" @resert="resert" @detail="openEdit" @onRefresh="resert"
-			@pagination="pagination" @onOrder="onOrder" @clickTab="clickTab">
+			@pagination="pagination" @onOrder="onOrder" @clickTab="clickTab" @onReturn="onReturn">
 		</by-bill>
 	</div>
 </template>
@@ -25,6 +25,7 @@
 				tool: {
 					tools: {
 						order: true,
+						return: true
 					}
 				},
 				log: {
@@ -364,8 +365,8 @@
 					let parentData = res.data ? res.data : e;
 					let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
 					this.baseInfo = parentData;
-					billConfig.tool.tools = {};
-					if (parentData.status === 0) billConfig.tool.tools = { order: true, };
+					billConfig.tool.tools = {return: true};
+					if (parentData.status === 0) billConfig.tool.tools = { return: true, order: true, };
 					(this.$refs.bill as any).setBillConfig(billConfig);
 					(this.$refs.bill as any).setBillFormValue(parentData); // 设置单据表单数据
 					(this.$refs.bill as any).setBillTableValue(parentData.suborderList, 0);// 设置第1张单据表格数据
@@ -383,6 +384,10 @@
 				(this.$refs.bill as any).setBillConfig(billConfig);
 			}
 		}
+		// 返回
+		onReturn() {
+			this.clickTab('all');
+		}
 		// 搜索
 		search(parames : any) {
 			let query = parames.value

+ 18 - 12
src/views/audit/orderTask/index.vue

@@ -3,7 +3,7 @@
 		<by-bill ref="bill" :propConfig="config" @search="search" @onSmt="onSmt" @onAdd="onAdd" @onDelete="onDelete"
 			@onDispatch="onDispatch" @onRefresh="resert" @detail="openEdit" @onSave="onSave" @clickTab="clickTab"
 			@onChangeRow="onChangeRow" @pagination="pagination" @onReturnSmt="onReturnSmt2"
-			@getSupplierModal="getSupplierModal" @resert="resert">
+			@getSupplierModal="getSupplierModal" @resert="resert" @onReturn="onReturn">
 		</by-bill>
 		<!-- 选择物料 -->
 		<productModal ref="product" :mulit="true" @confirm="confirmProduct" />
@@ -46,6 +46,7 @@
 				tool: {
 					tools: {
 						save: true,
+						return: true
 					}
 				},
 				log: {
@@ -439,7 +440,7 @@
 						smt: true,
 						delete: true,
 						search: true,
-						refresh: true
+						refresh: true,
 					}
 				},
 				table: {
@@ -883,13 +884,13 @@
 			} else {
 				let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
 				billConfig.form.attr.readonly = false; // 设置只读
-				billConfig.tool.tools = { save: true, };
+				billConfig.tool.tools = { return: true, save: true, };
 				if (e === 'all') {
-					billConfig.tool.tools = { save: true, smt: true };
+					billConfig.tool.tools = { return: true, save: true, smt: true };
 					this.tableData = [];
 					(this.$refs.bill as any).setBillTableValue(this.tableData, 0);// 设置第1张单据表格数据
 				};
-				billConfig.tableConfig[0].tool.tools = { add: true };
+				billConfig.tableConfig[0].tool.tools = { return: true, add: true };
 				this.isAdd = true;
 				(this.$refs.bill as any).setBillConfig(billConfig);
 				(this.$refs.bill as any).setBillFormValue({}); // 设置单据表单数据
@@ -899,7 +900,6 @@
 		// 打开编辑
 		openEdit(e : any) {
 			e = e.row ? e.row : e;
-			// console.log('编辑tabType ==>', this.tabType);
 			let loading = this.$loading({ target: '.main-container' });
 			api.single({ id: e.id }, 'supplyTaskOrder').then((res : any) => {
 				if (res.code === 200) {
@@ -917,7 +917,7 @@
 							this.setReadonly(parentData, false);
 							return loading.close();
 						};
-						let data = parentData.suborderList
+						let data = parentData.suborderList;
 						data.map((v : any) => {
 							if (!v.prePrice) v.prePrice = '0';
 						});
@@ -941,8 +941,8 @@
 						};
 						billConfig.form.attr.readonly = false; // 设置只读
 						billConfig.tool.tools = { save: true, };
-						if (parentData.submitState === 0) billConfig.tool.tools = { save: true, smt: true };
-						billConfig.tableConfig[0].tool.tools = { add: true };
+						if (parentData.submitState === 0) billConfig.tool.tools = { return: true, save: true, smt: true };
+						billConfig.tableConfig[0].tool.tools = { return: true, add: true };
 						this.tableData = data;
 						(this.$refs.bill as any).setBillConfig(billConfig);
 						(this.$refs.bill as any).setBillFormValue(parentData);// 设置单据表单数据
@@ -957,13 +957,15 @@
 					};
 				}
 			}).catch(() => loading.close());
+
+
 		}
 		// 设置只读
 		setReadonly(e : any, isReturn : any) {
 			let readonly = (this as any).$lodash.cloneDeep(this.config.bill);
 			readonly.form.attr.readonly = true; // 设置只读
-			readonly.tool.tools = {};
-			if (isReturn) readonly.tool.tools = { returnSmt: true };
+			readonly.tool.tools = { return: true };
+			if (isReturn) readonly.tool.tools = { return: true, returnSmt: true };
 			readonly.tableConfig[0].table.columns = readonly.tableConfig[0].table.columns.filter((v : any) => v.title != '操作');
 			readonly.tableConfig[0].tool.tools = {};
 			let data = e.suborderList;
@@ -1227,6 +1229,10 @@
 				} else this.$message.error(res.msg)
 			}).catch(() => loading.close());
 		}
+		// 返回
+		onReturn() {
+			this.clickTab(this.tabType);
+		}
 		// 搜索
 		search(parames : any) {
 			let query = parames.value;
@@ -1338,7 +1344,7 @@
 				center: true
 			}).then(() => {
 				let loading = this.$loading({ target: '.main-container' });
-				api.deleteList({ids:ids}, 'supplyTaskOrder').then((res : any) => {
+				api.deleteList({ ids: ids }, 'supplyTaskOrder').then((res : any) => {
 					loading.close();
 					if (res.code === 200) {
 						this.$message.success('删除成功');

+ 31 - 22
src/views/audit/outbound/index.vue

@@ -2,7 +2,8 @@
 	<div>
 		<by-bill ref="bill" :propConfig="config" @search="search" @onSmt="onSmt" @onDelete="onDelete" @onRefresh="resert"
 			@resert="resert" @detail="openEdit" @onSave="onSave" @clickTab="clickTab" @onChangeRow="onChangeRow"
-			@pagination="pagination" @onReturnSmt="onReturnSmt2" @getSupplierModal="getSupplierModal" @printBefore="printBefore">
+			@pagination="pagination" @onReturnSmt="onReturnSmt2" @getSupplierModal="getSupplierModal"
+			@printBefore="printBefore" @onReturn="onReturn">
 		</by-bill>
 
 		<SettingConfig ref="setForm" type="setCForm" title="出库单" />
@@ -69,7 +70,7 @@
 						},
 						customTools: [
 							{
-								name: '引单', icon: 'el-icon-bottom', audit: [''], event: {
+								name: '引单出库', icon: 'el-icon-bottom', audit: [''], event: {
 									click: () => {
 										(this as any).citationOrder()
 									}
@@ -130,6 +131,7 @@
 				tool: {
 					tools: {
 						save: true,
+						return: true
 					}
 				},
 				log: {
@@ -595,7 +597,7 @@
 					},
 					customTools: [
 						{
-							name: '出库', icon: 'el-icon-top', audit: [''], event: {
+							name: '引单出库', icon: 'el-icon-bottom', audit: [''], event: {
 								click: () => {
 									(this as any).outbound()
 								}
@@ -799,11 +801,11 @@
 			}, 500)
 		}
 		//打印前数据修改
-		printBefore(params:any){
+		printBefore(params : any) {
 			params.templateId = 12;
 			let value = (this.$refs.bill as any).getBillFormValue();
-			if(value){
-				let data:any={};
+			if (value) {
+				let data : any = {};
 				data.orderNumber = value.orderNumber;
 				data.operator = value.operator;
 				data.businessType = value.businessType;
@@ -815,13 +817,13 @@
 				data.outOrderNo = value.outOrderNo;
 				data.receive = value.receive;
 				data.suborderList = [];
-				if(value.suborderList){
+				if (value.suborderList) {
 					data.totalNumber = 0;//总数量
-					data.totalDeliveryNumber=0; //总应出数量
+					data.totalDeliveryNumber = 0; //总应出数量
 					data.totalPri = 0;//总计金额
 					data.totalOutNumber = 0; //总出库数量
-					for(const item of value.suborderList){
-						let obj:any={};
+					for (const item of value.suborderList) {
+						let obj : any = {};
 						obj.materialName = item.materialName;
 						obj.financeSuborderId = item.financeSuborderId;
 						obj.storehouseName = item.storehouseName;
@@ -833,17 +835,17 @@
 						obj.unitPrice = item.unitPrice;
 						obj.totalPrice = item.totalPrice;
 						data.suborderList.push(obj);
-						if(Number(item.number)){
-							data.totalNumber = add(data.totalNumber,Number(item.number))
+						if (Number(item.number)) {
+							data.totalNumber = add(data.totalNumber, Number(item.number))
 						}
-						if(Number(item.deliveryNumber)){
-							data.totalDeliveryNumber = add(data.totalDeliveryNumber,Number(item.deliveryNumber))
+						if (Number(item.deliveryNumber)) {
+							data.totalDeliveryNumber = add(data.totalDeliveryNumber, Number(item.deliveryNumber))
 						}
-						if(Number(item.totalPrice)){
-							data.totalPri = add(data.totalPri,Number(item.totalPrice));
+						if (Number(item.totalPrice)) {
+							data.totalPri = add(data.totalPri, Number(item.totalPrice));
 						}
-						if(Number(item.outNumber)){
-							data.totalOutNumber = add(data.totalOutNumber,Number(item.outNumber));
+						if (Number(item.outNumber)) {
+							data.totalOutNumber = add(data.totalOutNumber, Number(item.outNumber));
 						}
 					}
 				}
@@ -926,7 +928,7 @@
 			} else this.$message.warning('请选择同步数据');
 		}
 		// 保存
-		onSave(e : any) {
+		onSave() {
 			console.log('保存 ==>', this.tabType);
 			(this as any).$refs.bill.$refs.billForm.validate().then(() => {
 				let query = (this.$refs.bill as any).getBillFormValue(); // 获取单据数据
@@ -939,6 +941,7 @@
 						if (!v.unitPrice || v.unitPrice <= 0) return this.$message.warning('请输入正确物料单价');
 						if (v.deliveryNumber < v.number) return this.$message.warning('数量不能大于应出数量');
 						if (v.number > v.inventory) return this.$message.warning('出库数量不能大于库存数量');
+						if (v.totalPrice <= 0) return this.$message.warning('合计金额不能为负数');
 						v.taskOrderId = query.id;
 						v.purchaseSuborderId = v.id;
 					}
@@ -1035,13 +1038,15 @@
 								}]
 							})
 						};
-						billConfig.tool.tools = { save: true, smt: true };
+						billConfig.tool.tools = { return: true, save: true, smt: true };
 						// 查销售订单数据
 						api.single({ id: e.purchaseOrderId }, 'supplyPurchaseOrder').then((val : any) => {
 							if (val.code === 200) {
 								parentData.suborderList.map((v : any, i : any) => {
 									v.outNumber = val.data.suborderList[i].outNumber;
 									v.prePrice = val.data.suborderList[i].prePrice;
+									// v.realityPrice = val.data.suborderList[i].realityPrice-v.prePrice;
+									console.log(v);
 								});
 								let data : any = parentData.suborderList;
 								let array : any = [];
@@ -1086,9 +1091,9 @@
 			let loading = this.$loading({ target: '.main-container' });
 			let readonly = (this as any).$lodash.cloneDeep(this.config.bill);
 			readonly.form.attr.readonly = true; // 设置只读
-			readonly.tool.tools = {};
+			readonly.tool.tools = { return: true, };
 			if (this.tabType != 'recycleBin') {
-				if (parentData.submitState === 1) readonly.tool.tools = { returnSmt: true,print:true };
+				if (parentData.submitState === 1) readonly.tool.tools = { return: true, returnSmt: true, print: true };
 			}
 			readonly.tableConfig[0].table.columns = readonly.tableConfig[0].table.columns.filter((v : any) => v.title != '操作');
 			api.single({ id: e.purchaseOrderId }, 'supplyPurchaseOrder').then((val : any) => {
@@ -1341,6 +1346,10 @@
 				} else this.$message.error(res.msg)
 			}).catch(() => loading.close());
 		}
+		// 返回
+		onReturn() {
+			this.clickTab(this.tabType);
+		}
 		// 搜索
 		search(parames : any) {
 			console.log('搜索 ==> ', parames);

+ 25 - 8
src/views/audit/saleOrder/components/settingConfig.vue

@@ -133,30 +133,30 @@
 				[
 					{
 						span: 8,
-						label: '结算币别',
-						prop: 'FSettleCurrId',
+						label: '产品类型',
+						prop: 'FRowType',
 						component: 'by-input',
 						rules: [
-							{ required: true, message: '请输入结算币别', trigger: 'blur' }
+							{ required: true, message: '请输入产品类型', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
-								placeholder: '请输入结算币别',
+								placeholder: '请输入产品类型',
 								clearable: true
 							}
 						}
 					},
 					{
 						span: 8,
-						label: '产品类型',
-						prop: 'FRowType',
+						label: '货主',
+						prop: 'FOwnerID',
 						component: 'by-input',
 						rules: [
-							{ required: true, message: '请输入产品类型', trigger: 'blur' }
+							{ required: true, message: '请输入货主', trigger: 'blur' }
 						],
 						compConfig: {
 							attr: {
-								placeholder: '请输入产品类型',
+								placeholder: '请输入货主',
 								clearable: true
 							}
 						}
@@ -223,6 +223,23 @@
 							}
 						}
 					}
+				],
+				[
+					{
+						span: 8,
+						label: '结算币别',
+						prop: 'FSettleCurrId',
+						component: 'by-input',
+						rules: [
+							{ required: true, message: '请输入结算币别', trigger: 'blur' }
+						],
+						compConfig: {
+							attr: {
+								placeholder: '请输入结算币别',
+								clearable: true
+							}
+						}
+					},
 				]
 			]
 		}

+ 13 - 21
src/views/audit/saleOrder/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<by-bill :propConfig="config" @search="search" ref="bill" @resert="resert" @detail="openEdit" @onRefresh="resert"
-			@pagination="pagination" @clickTab="clickTab" @onOrder="onOrder" @onSave="onSave">
+			@pagination="pagination" @clickTab="clickTab" @onOrder="onOrder" @onSave="onSave" @onReturn="onReturn">
 		</by-bill>
 		<!-- 拆单弹窗 -->
 		<vxe-modal v-model="vxeValue" width="90%" height="90%" show-zoom resize transfer show-footer>
@@ -13,8 +13,6 @@
 					<div style="margin-bottom: 20px;">主单销售数据</div>
 					<by-table ref="leftTable" :propConfig="leftTableConfig"></by-table>
 				</div>
-				<!-- <div class="fl" style="font-size: 80px;margin: 10% 6% 0 6%;transform: rotate(90deg);"><i
-						class="el-icon-sort"></i></div> -->
 				<div class="fl" style="width: 45%;">
 					<div style="margin-bottom: 20px;">拆单销售数据</div>
 					<by-table ref="rightTable" :propConfig="rightTableConfig" @onChangeRow="rightChange"></by-table>
@@ -38,6 +36,7 @@
 	import Assembly from "@/components/Assembly/saleOrder.vue";
 	@Component({ components: { SettingConfig } })
 	export default class SaleOrder extends Vue {
+		tabType : any = 'all';
 		vxeValue = false
 		isCitation = false
 		timeNum = 0;
@@ -142,18 +141,6 @@
 										},
 									},
 								},
-								{
-									span: 6,
-									label: '交货时间',
-									prop: 'deliveryData',
-									component: 'by-date-picker',
-									compConfig: {
-										attr: {
-											format: 'yyyy-MM-dd hh:ss:mm',
-											type: 'datetime',
-										},
-									}
-								},
 							],
 						]
 					},
@@ -230,7 +217,8 @@
 			bill: {
 				tool: {
 					tools: {
-						save: true
+						save: true,
+						return:true
 					},
 					customTools: []
 				},
@@ -903,7 +891,6 @@
 			api.single({ id: e.id }, 'supplyPurchaseOrder').then((res : any) => {
 				if (res.code === 200) {
 					let parentData = res.data ? res.data : e;
-					console.log(parentData);
 					let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
 					if (parentData.status === 2) {
 						billConfig.tool.customTools = [];
@@ -944,11 +931,10 @@
 							];
 						}
 					};
-					billConfig.tool.tools = {};
+					billConfig.tool.tools = {return:true};
 					billConfig.form.columns[0].map((v : any) => {
 						v.compConfig.attr.readonly = true;
 					})
-					console.log(billConfig.form.columns[0]);
 					billConfig.form.columns[1][0].compConfig.attr.readonly = true;
 					if (parentData.status === 0) {
 						billConfig.form.columns[0][2].compConfig.attr.readonly = false;
@@ -956,8 +942,9 @@
 						billConfig.form.columns[0][4].compConfig.attr.readonly = false;
 						billConfig.form.columns[0][6].compConfig.attr.readonly = false;
 						billConfig.form.columns[1][0].compConfig.attr.readonly = false;
-						billConfig.tool.tools = { save: true };
+						billConfig.tool.tools = {return:true, save: true };
 					};
+					console.log(parentData.suborderList);
 					(this.$refs.bill as any).setBillConfig(billConfig);
 					(this.$refs.bill as any).setBillFormValue(parentData); // 设置单据表单数据
 					(this.$refs.bill as any).setBillTableValue(parentData.suborderList, 0);// 设置第1张单据表格数据
@@ -969,8 +956,9 @@
 		}
 		// 导航切换
 		clickTab(e : any) {
-			// console.log('导航切换 ==> ', e);
 			// submitState: 提交状态
+			this.tabType = e;
+			(this.$refs.bill as any).showTab = e;
 			if (e === 'source') {
 				this.getCitationList({});
 			}
@@ -1095,6 +1083,10 @@
 				}).catch(() => loading.close());
 			}
 		}
+		// 返回
+		onReturn(){
+			this.clickTab(this.tabType);
+		}
 		// 搜索
 		search(parames : any) {
 			let query = parames.value

+ 24 - 18
src/views/audit/warehousing/index.vue

@@ -3,7 +3,7 @@
 		<by-bill ref="bill" :propConfig="config" @search="search" @onSmt="onSmt" @onAdd="onAdd" @onDelete="onDelete"
 			@onRefresh="resert" @resert="resert" @detail="openEdit" @onSave="onSave" @clickTab="clickTab"
 			@onChangeRow="onChangeRow" @pagination="pagination" @onReturnSmt="onReturnSmt2" @printBefore="printBefore"
-			@getSupplierModal="getSupplierModal">
+			@getSupplierModal="getSupplierModal" @onReturn="onReturn">
 		</by-bill>
 		<!-- 选择物料 -->
 		<productModal ref="product" :mulit="true" @confirm="confirmProduct" />
@@ -72,6 +72,7 @@
 				tool: {
 					tools: {
 						save: true,
+						return: true
 					}
 				},
 				log: {
@@ -705,21 +706,21 @@
 		syncEntry() {
 			this.value = true;
 		}
-		printBefore(param:any){
+		printBefore(param : any) {
 			param.templateId = 11;
-			if(param.templateData && param.templateData.suborderList){
+			if (param.templateData && param.templateData.suborderList) {
 				param.templateData.totalNumber = 0;
 				param.templateData.totalDeliveryNumber = 0;
 				param.templateData.totalPri = 0;
-				for(const item of param.templateData.suborderList){
-					if(Number(item.number)){
-						param.templateData.totalNumber = add(param.templateData.totalNumber,Number(item.number));
+				for (const item of param.templateData.suborderList) {
+					if (Number(item.number)) {
+						param.templateData.totalNumber = add(param.templateData.totalNumber, Number(item.number));
 					}
-					if(Number(item.deliveryNumber)){
-						param.templateData.totalDeliveryNumber = add(param.templateData.totalDeliveryNumber,Number(item.deliveryNumber))
+					if (Number(item.deliveryNumber)) {
+						param.templateData.totalDeliveryNumber = add(param.templateData.totalDeliveryNumber, Number(item.deliveryNumber))
 					}
-					if(Number(item.totalPrice)){
-						param.templateData.totalPri = add(param.templateData.totalPri,Number(item.totalPrice))
+					if (Number(item.totalPrice)) {
+						param.templateData.totalPri = add(param.templateData.totalPri, Number(item.totalPrice))
 					}
 				}
 			}
@@ -820,9 +821,9 @@
 			} else {
 				let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
 				billConfig.form.attr.readonly = false; // 设置只读
-				billConfig.tool.tools = { save: true, };
+				billConfig.tool.tools = { return: true, save: true, };
 				if (e === 'all') {
-					billConfig.tool.tools = { save: true, smt: true };
+					billConfig.tool.tools = { return: true, save: true, smt: true };
 					this.tableData = [];
 					(this.$refs.bill as any).setBillTableValue(this.tableData, 0);// 设置第1张单据表格数据
 				}
@@ -872,8 +873,8 @@
 							})
 						};
 						billConfig.form.attr.readonly = false; // 设置只读
-						billConfig.tool.tools = { save: true, };
-						if (this.tabType === 'draftsBox' || parentData.submitState === 0) billConfig.tool.tools = { save: true, smt: true };
+						billConfig.tool.tools = { return: true, save: true, };
+						if (this.tabType === 'draftsBox' || parentData.submitState === 0) billConfig.tool.tools = { return: true, save: true, smt: true };
 						billConfig.tableConfig[0].tool.tools = { add: true };
 						this.tableData = data;
 						(this.$refs.bill as any).setBillConfig(billConfig);
@@ -895,9 +896,9 @@
 		setReadonly(e : any) {
 			let readonly = (this as any).$lodash.cloneDeep(this.config.bill);
 			readonly.form.attr.readonly = true; // 设置只读
-			readonly.tool.tools = {};
+			readonly.tool.tools = { return: true };
 			if (this.tabType != 'recycleBin') {
-				if (e.submitState === 1) readonly.tool.tools = { returnSmt: true,print:true };
+				if (e.submitState === 1) readonly.tool.tools = { return: true, returnSmt: true, print: true };
 			}
 			readonly.tableConfig[0].table.columns = readonly.tableConfig[0].table.columns.filter((v : any) => v.title != '操作');
 			readonly.tableConfig[0].tool.tools = {};
@@ -1038,6 +1039,7 @@
 		clickTab(e : any) {
 			console.log('切换tab ==> ', e);
 			this.tabType = e;
+			(this.$refs.bill as any).showTab = e;
 			// submitState: 提交状态
 			if (e === 'all') this.getPageList({ pageSize: 10, pageNo: 1 }, 'all'); // 草稿箱数据
 			if (e === 'draftsBox') this.getPageList({ submitState: 0 }, 'draftsBox'); // 草稿箱数据
@@ -1120,13 +1122,17 @@
 				} else this.$message.error(res.msg)
 			}).catch(() => loading.close());
 		}
+		// 返回
+		onReturn() {
+			this.clickTab(this.tabType);
+		}
 		// 搜索
 		search(parames : any) {
+			console.log('搜索 ==> ', parames);
 			let query = parames.value
 			if (parames.type === 'draftsBox') query.submitState = 0 // 草稿箱数据
 			if (parames.type === 'smt') query.submitState = 1 // 已提交数据
-			console.log('搜索 ==> ', query);
-			if (query.type === 'recycleBin') {
+			if (parames.type === 'recycleBin') {
 				this.getSelectDeleteList(query); // 回收站分页数据
 			} else {
 				this.getPageList(query, parames.type) // 获取分页数据