订单任务完成

src/api/order.ts

@@ -92,11 +92,11 @@ function splitOrder(data : any, url : any) {
 	})
 }
 // 退单
-function backOrder(data : any, url : any) {
+function backOrder(data : any, url : any, mid : any) {
 	return request({
-		url: '/supply/' + url + '/backOrder',
+		url: '/supply/' + url + '/backOrder?mid=' + mid,
 		method: 'POST',
-		params: data
+		data: data
 	})
 }
 export default {

src/views/audit/order/index.vue

@@ -212,7 +212,7 @@
 				},
 				tool: {
 					tools: {
-						order: true,
+						// order: true,
 						search: true,
 						refresh: true
 					}

src/views/audit/orderTask/index.vue

@@ -6,6 +6,8 @@
 		</by-bill>
 		<!-- 选择物料 -->
 		<productModal ref="product" :mulit="true" @confirm="confirmProduct" />
+		<!-- 选择机构名称 -->
+		<supplier-modal ref="supplierModal" @confirm="confirmSupplier" />
 	</div>
 </template>
 
@@ -21,6 +23,7 @@
 		tabType : any = 'all';
 		isAdd : any = false
 		pageSize : any = 15
+		supplierSelectData : any = {}
 		// 右边
 		supplierInfo : any = {} // 机构信息
 		tableData : any = []
@@ -1061,6 +1064,27 @@
 		// 派单
 		onDispatch(e : any) {
 			console.log('派单 ==>', e);
+			this.supplierSelectData = (this.$refs.bill as any).getTableSelectData(this.tabType); // 获取表格选中数据
+			if (this.supplierSelectData.length <= 0) return this.$message.warning('请选择派单数据');
+			if (this.supplierSelectData.length >1) return this.$message.warning('只能派单一条数据');
+			(this.$refs.supplierModal as any).setShow(true);
+		}
+		// 派单确认
+		confirmSupplier(e : any) {
+			if (e.length > 0) {
+				console.log(e);
+				console.log(this.supplierSelectData);
+				let query : any = (this as any).$lodash.cloneDeep(this.supplierSelectData)[0];
+				query.organizationName = e[0].name;
+				query.organizationId = e[0].id;
+				api.updateList(query, 'supplyTaskOrder').then((res : any) => {
+					if (res.code === 200) {
+						this.$message.success('派单成功');
+						this.getDataList();
+						(this.$refs.bill as any).showTab = 'all';
+					} else this.$message.error(res.msg);
+				})
+			}
 		}
 		// 切换tab栏
 		clickTab(e : any) {
@@ -1142,14 +1166,17 @@
 		}
 		// 搜索
 		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);
 			if (this.tabType === 'recycleBin') {
 				this.getSelectDeleteList(query); // 回收站分页数据
+				loading.close()
 			} else {
 				this.getPageList(query, parames.type) // 获取分页数据
+				loading.close()
 			}
 		}
 		// 刷新

src/views/audit/saleOrder/index.vue

@@ -312,7 +312,6 @@
 							width: 144,
 							title: '单据编号',
 							field: 'orderNumber',
-							// component: OrderType,
 							isDetail: true,
 						},
 						{
@@ -516,31 +515,6 @@
 				this.getDataList()
 			}, 500)
 		}
-		// 工具栏退单
-		doBackOrder() {
-			// console.log((this as any).$refs.bill.getTableSelectData('all'));
-			let selectData = (this as any).$refs.bill.getTableSelectData('all');
-			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.backOrder({ mid: ids }, 'supplyPurchaseOrder').then((res : any) => {
-					if (res.code === 200) {
-						this.$message.success('退单成功!');
-						this.getDataList();
-					} else this.$message.error(res.msg)
-				})
-			}).catch(() => this.$message.info('已取消退单'));
-		}
 		// 右拆单数据变化
 		rightChange(e : any) {
 			console.log(e.number);
@@ -658,20 +632,13 @@
 							}
 						}
 					},
-					{
-						name: '退单', icon: 'el-icon-bottom', audit: [''], event: {
-							click: () => {
-								// (this as any)
-							}
-						}
-					}
 				];
 			} else {
 				billConfig.tool.customTools = [
 					{
 						name: '退单', icon: 'el-icon-bottom', audit: [''], event: {
 							click: () => {
-								// (this as any)
+								(this as any).doBackOrder2(e)
 							}
 						}
 					}
@@ -682,6 +649,53 @@
 			(this.$refs.bill as any).setBillTableValue(e.suborderList, 0);// 设置第1张单据表格数据
 			(this.$refs.bill as any).showTab = 'bill';
 		}
+		// 单据操作退单
+		doBackOrder2(e : any) {
+			console.log(e);
+			this.$confirm('确定退单吗！', '注意', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+				center: true
+			}).then(() => {
+				api.backOrder({ mid: e.id }, 'supplyPurchaseOrder', e.id).then((res : any) => {
+					if (res.code === 200) {
+						this.$message.success('退单成功!');
+						this.getDataList();
+						(this.$refs.bill as any).showTab = 'all';
+					} else this.$message.error(res.msg)
+				})
+			}).catch(() => this.$message.info('已取消退单'));
+		}
+		// 工具栏退单
+		doBackOrder() {
+			let selectData = (this as any).$refs.bill.getTableSelectData('all');
+			if (selectData.length > 1) return this.$message.warning('只能选择一条退单数据')
+			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);
+			selectData[0].suborderList.map((v : any) => {
+				delete v.id;
+			})
+			this.$confirm('确定退单吗！', '注意', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+				center: true
+			}).then(() => {
+				api.backOrder(selectData[0].suborderList, 'supplyPurchaseOrder', ids).then((res : any) => {
+					if (res.code === 200) {
+						this.$message.success('退单成功!');
+						this.getDataList();
+						(this.$refs.bill as any).showTab = 'all';
+					} else this.$message.error(res.msg)
+				})
+			}).catch(() => this.$message.info('已取消退单'));
+		}
 		// 导航切换
 		clickTab(e : any) {
 			console.log('导航切换 ==> ', e);