操作日志

src/views/audit/order/index.vue

@@ -23,6 +23,12 @@
 			},
 			// 单据
 			bill: {
+				log:{
+				  request:{
+				    url:'/supply/supplyTaskOrderOperateLog/page',
+				    method:'GET'
+				  }
+				},
 				form: {
 					attr: {
 						size: 'medium',

src/views/audit/orderTask/index.vue

@@ -45,6 +45,12 @@
 						save: true,
 					}
 				},
+				log:{
+				  request:{
+				    url:'/supply/supplyTaskOrderOperateLog/page',
+				    method:'GET'
+				  }
+				},
 				form: {
 					attr: {
 						size: 'medium',
@@ -1223,23 +1229,22 @@
 			let query : any = (this as any).$refs.bill.getSearchValue(e.type);
 			query.pageNo = e.page.pageNum;
 			query.pageSize = e.page.pageSize;
-			console.log('分页 ==> ', query);
 			let loading = this.$loading({ target: '.main-container' });
 			if (e.type === 'recycleBin') {
 				api.selectDeleteList(query, 'supplyTaskOrder').then((res : any) => {
 					if (res.code === 200) {
 						(this.$refs.bill as any).setTabTableValue('recycleBin', res.data.records);
-						loading.close()
+						loading.close();
 					} else this.$message.error(res.msg)
 				});
 			} else {
-				console.log(this.tabType);
-				if (this.tabType == 'draftsBox') query.submitState = 0;
-				if (this.tabType == 'smt') query.submitState = 1;
+				console.log(e.type);
+				if (e.type == 'draftsBox') query.submitState = 0; // 草稿箱数据
+				if (e.type == 'smt') query.submitState = 1; // 已提交数据
 				api.pageList(query, 'supplyTaskOrder').then((res : any) => {
 					if (res.code === 200) {
 						(this.$refs.bill as any).setTabTableValue(e.type, res.data.records);
-						loading.close()
+						loading.close();
 					} else this.$message.error(res.msg)
 				})
 			}

src/views/audit/outbound/index.vue

@@ -88,7 +88,7 @@
 								field: 'orderNumber',
 							},
 							{
-								width: 90,
+								width: 120,
 								title: '收货人',
 								field: 'consignee',
 							},
@@ -123,6 +123,12 @@
 						save: true,
 					}
 				},
+				log:{
+				  request:{
+				    url:'/supply/supplyOutOrderOperateLog/page',
+				    method:'GET'
+				  }
+				},
 				form: {
 					attr: {
 						size: 'medium',
@@ -786,7 +792,7 @@
 			let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
 			// billConfig.tool.tools = { save: true, smt: true };
 			// this.isAdd = true;
-			billConfig.tool.tools = { save: true};
+			billConfig.tool.tools = { save: true };
 			(this.$refs.bill as any).showTab = 'bill';
 			setTimeout(() => {
 				(this.$refs.bill as any).setBillConfig(billConfig);
@@ -1124,7 +1130,7 @@
 			if (e === 'recycleBin') this.getSelectDeleteList({}); // 回收站数据
 			if (e === 'bill') {
 				let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
-				billConfig.tool.tools={};
+				billConfig.tool.tools = {};
 				billConfig.tool.customTools = [];
 				(this.$refs.bill as any).setBillConfig(billConfig);
 			}
@@ -1141,29 +1147,6 @@
 			clearInterval(this.timer)
 			this.getPageList({}, 'all'); // 综合数据
 		}
-		// 分页
-		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;
-			let loading = this.$loading({ target: '.main-container' });
-			if (e.type === 'recycleBin') {
-				api.selectDeleteList(query, 'supplyOutOrder').then((res : any) => {
-					if (res.code === 200) {
-						(this.$refs.bill as any).setTabTableValue('recycleBin', res.data.records);
-						loading.close()
-					} else this.failHandle(res)
-				});
-			} else {
-				api.pageList(query, 'supplyOutOrder').then((res : any) => {
-					if (res.code === 200) {
-						(this.$refs.bill as any).setTabTableValue(e.type, res.data.records);
-						loading.close()
-					} else this.failHandle(res)
-				})
-			}
-		}
 		// 获取引单分页数据
 		getCitationList(query : any) {
 			let loading = this.$loading({ target: '.main-container' });
@@ -1208,16 +1191,47 @@
 				} else this.failHandle(res)
 			});
 		}
+		// 分页
+		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;
+			let loading = this.$loading({ target: '.main-container' });
+			if (e.type === 'recycleBin') {
+				api.selectDeleteList(query, 'supplyOutOrder').then((res : any) => {
+					if (res.code === 200) {
+						(this.$refs.bill as any).setTabTableValue('recycleBin', res.data.records);
+						loading.close()
+					} else this.failHandle(res)
+				});
+			} else {
+				api.pageList(query, 'supplyOutOrder').then((res : any) => {
+					if (res.code === 200) {
+						(this.$refs.bill as any).setTabTableValue(e.type, res.data.records);
+						loading.close()
+					} else this.failHandle(res)
+				})
+			}
+		}
 		// 搜索
 		search(parames : any) {
+			let loading = this.$loading({ target: '.main-container' });
 			console.log('搜索 ==> ', parames);
 			let query = parames.value;
 			if (parames.type === 'source_0') {
 				this.getCitationList(query);
+				loading.close();
 			} else {
-				if (parames.type === 'draftsBox') query.submitState = 0;// 草稿箱数据
-				if (parames.type === 'smt') query.submitState = 1; // 已提交数据
-				this.getPageList(query, parames.type) // 获取分页数据
+				if (parames.type === 'recycleBin') {
+					this.getSelectDeleteList(query); // 回收站分页数据
+					loading.close();
+				} else {
+					if (parames.type === 'draftsBox') query.submitState = 0;// 草稿箱数据
+					if (parames.type === 'smt') query.submitState = 1; // 已提交数据
+					this.getPageList(query, parames.type) // 获取分页数据
+					loading.close();
+				}
 			}
 		}
 		// 刷新/重置

src/views/audit/saleOrder/index.vue

@@ -225,6 +225,12 @@
 				tool: {
 					customTools: []
 				},
+				log:{
+				  request:{
+				    url:'/supply/supplyPurchaseOrderOperateLog/page',
+				    method:'GET'
+				  }
+				},
 				form: {
 					attr: {
 						size: 'medium',
@@ -404,7 +410,7 @@
 						size: 'mini',
 						seq: true,
 						align: 'left',
-						checkbox: true
+						radio: true
 					},
 					columns: [
 						{
@@ -803,19 +809,32 @@
 			});
 
 		}
+		// 导航切换
+		clickTab(e : any) {
+			console.log('导航切换 ==> ', e);
+			// submitState: 提交状态
+			if (e === 'source') {
+				this.getCitationList({});
+			}
+			if (e === 'all') this.getDataList();
+			if (e === 'returnOrder') this.getPageList({ status: 2 }, 'returnOrder');
+			if (e === 'bill') {
+				let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
+				billConfig.tool.tools = {};
+				billConfig.tool.customTools = [];
+				(this.$refs.bill as any).setBillConfig(billConfig);
+			}
+		}
 		// 工具栏终止订单
 		doBackOrder() {
 			let selectData = (this as any).$refs.bill.getTableSelectData('all');
-			if (selectData.length > 1) return this.$message.warning('只能选择一条终止订单数据')
+			// 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: '请选择终止订单数据' })
-			selectData[0].suborderList.map((v : any) => {
-				delete v.id;
-			})
 			this.$confirm('确定终止订单吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -830,29 +849,9 @@
 					} else this.$message.error(res.msg)
 				})
 			}).catch(() => this.$message.info('已取消终止订单'));
-		}
-		// 导航切换
-		clickTab(e : any) {
-			console.log('导航切换 ==> ', e);
-			// submitState: 提交状态
-			if (e === 'source') {
-				this.getCitationList({});
-			}
-			if (e === 'all') this.getDataList();
-			if (e === 'returnOrder') this.getPageList({ status: 2 }, 'returnOrder');
-			if (e === 'bill') {
-				let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
-				billConfig.tool.tools = {};
-				billConfig.tool.customTools = [];
-				(this.$refs.bill as any).setBillConfig(billConfig);
-			}
-		}
+		}	
 		// 单据操作终止订单
 		doBackOrder2(e : any) {
-			console.log(e);
-			e.suborderList.map((v : any) => {
-				delete v.id;
-			})
 			this.$confirm('确定终止订单吗！', '注意', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',

src/views/audit/warehousing/index.vue

@@ -44,6 +44,12 @@
 						save: true,
 					}
 				},
+				log:{
+				  request:{
+				    url:'/supply/supplyEntryOrderOperateLog/page',
+				    method:'GET'
+				  }
+				},
 				form: {
 					attr: {
 						size: 'medium',
@@ -997,7 +1003,7 @@
 			if (e === 'recycleBin') this.getSelectDeleteList({ pageNo: 1, pageSize: 10 }); // 回收站数据
 			if (e === 'bill') {
 				let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
-				billConfig.tool.tools={};
+				billConfig.tool.tools = {};
 				billConfig.tool.customTools = [];
 				(this.$refs.bill as any).setBillConfig(billConfig);
 			}
@@ -1068,11 +1074,18 @@
 		}
 		// 搜索
 		search(parames : any) {
+			let loading = this.$loading({ target: '.main-container' });
 			let query = parames.value
 			if (parames.type === 'draftsBox') query.submitState = 0 // 草稿箱数据
 			if (parames.type === 'smt') query.submitState = 1 // 已提交数据
 			console.log('搜索 ==> ', query);
-			this.getPageList(query, parames.type) // 获取分页数据
+			if (query.type === 'recycleBin') {
+				this.getSelectDeleteList(query); // 回收站分页数据
+				loading.close()
+			} else {
+				this.getPageList(query, parames.type) // 获取分页数据
+				loading.close()
+			}
 		}
 		// 刷新/重置
 		resert(e : any) {