Selaa lähdekoodia

修复了同步到财务系统报错
修复了引单列表和详情问题
更换了派单接口

hcf 1 vuosi sitten
vanhempi
säilyke
ee3f6303b0

+ 10 - 1
src/api/order.ts

@@ -157,6 +157,14 @@ function addOutStock(data : any) {
 		params: data
 	})
 }
+// 任务清单派单(运营端)
+function dispatch(data : any) {
+	return request({
+		url: '/supply/supplyTaskOrder/dispatch',
+		method: 'POST',
+		data: data
+	})
+}
 export default {
 	treeList,
 	treeUseList,
@@ -177,5 +185,6 @@ export default {
 	getInventoryByStoridsAndSkuids,
 	addSaleOrder,
 	getFinanceEntryOrder,
-	addOutStock
+	addOutStock,
+	dispatch
 }

+ 2 - 1
src/views/audit/orderTask/index.vue

@@ -1274,6 +1274,7 @@
 			console.log('派单 ==>', query);
 			if (query.length <= 0) return this.$message.warning('请选择派单数据');
 			if (query.length > 1) return this.$message.warning('只能派单一条数据');
+			if (query[0].status == 1) return this.$message.warning('不能重复派单!');
 			let loading = this.$loading({ target: '.main-container' });
 			api.single({ id: query[0].id }, 'supplyTaskOrder').then((res : any) => {
 				loading.close();
@@ -1291,7 +1292,7 @@
 				query.organizationId = e[0].id;
 				console.log(query);
 				let loading = this.$loading({ target: '.main-container' });
-				api.updateList(query, 'supplyTaskOrder').then((res : any) => {
+				api.dispatch(query).then((res : any) => {
 					loading.close();
 					if (res.code === 200) {
 						this.$message.success('派单成功');

+ 5 - 6
src/views/audit/outbound/index.vue

@@ -21,6 +21,8 @@
 	import {getSingleData} from "@/api/omsOrder";
 	@Component({ components: { SettingConfig } })
 	export default class Outbound extends Vue {
+		planDeliveryDate : any = null; //计划交货时间
+		
 		// 左边
 		tabType : any = 'all';
 		isAdd : any = false;
@@ -923,7 +925,7 @@
 					parentData[0].operator = (this as any).$store.getters.userInfo.userName;
 					this.tableData = parentData[0].suborderList;
 					billConfig.tool.tools = { save: true, smt: true };
-					// console.log('this.tableData ==> ', this.tableData);
+					console.log('this.tableData ==> ', this.tableData);
 					this.isAdd = true;
 					(this.$refs.bill as any).showTab = 'bill';
 					loading.close();
@@ -970,10 +972,6 @@
 			if (selectData.length > 0) {
 				if (selectData.length > 1) return this.$message.warning('只能同步一条数据');
 				if (selectData[0].financeOrderId) return this.$message.warning('此数据已同步到财务系统');
-				// if (selectData[0].submitState != 1) return this.$message.warning('只能同步已提交数据');
-				let planData = selectData[0].planDeliveryData.replaceAll(/[-:\s]/g, '');
-				let nowDate = this.getNowDate().replaceAll(/[-:\s]/g, '');
-				if (planData < nowDate) return this.$message.warning('计划交货时间小于当前时间,不能同步到财务系统');
 				this.$confirm('确定同步订单吗', '注意', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
@@ -981,7 +979,7 @@
 					center: true
 				}).then(() => {
 					let loading = this.$loading({ target: '.main-container' });
-					api.addOutStock({ ids: selectData[0].id }).then((res : any) => {
+					api.addOutStock({ ids: selectData[0].id}).then((res : any) => {
 						loading.close();
 						if (res.code === 200) {
 							this.$message.success('同步订单成功');
@@ -1395,6 +1393,7 @@
 		}
 		// 获取引单分页数据
 		getCitationList(query : any) {
+			query.status = 0
 			let loading = this.$loading({ target: '.main-container' });
 			api.pageList(query, 'supplyPurchaseOrder').then((res : any) => {
 				loading.close();

+ 6 - 6
src/views/audit/productManagement/index.vue

@@ -286,12 +286,12 @@
 						},
 					}
 				},
-				{
-					width: '70px',
-					title: '库存',
-					field: 'stock',
-					slot: true,
-				},
+				// {
+				// 	width: '70px',
+				// 	title: '库存',
+				// 	field: 'stock',
+				// 	slot: true,
+				// },
 				{
 					width: '100px',
 					title: '保质期(天)',