Explorar el Código

工程收款管理修改

pengyh hace 1 año
padre
commit
767cf555a5

+ 12 - 2
src/views/auxiliaryFittings/projectAttachmentManage/index.vue

@@ -124,13 +124,23 @@ export default {
 				},
 				sellOrderDetail: {
 					click: ({ row, index, column }) => {
-						
+						this.$router.push({
+							name: 'attachmentSalesOrder',
+							query: {
+								orderEnginBaseId: row.orderEnginBaseId,
+							}
+						})
 					}
 				},
 				returnGoodsDetail: {
 					name:"返还单明细",
 					click: ({ row, index, column }) => {
-						
+						this.$router.push({
+							name: 'attachmentNewReturn',
+							query: {
+								orderEnginBaseId: row.orderEnginBaseId,
+							}
+						})
 					}
 				},
 			})

+ 12 - 2
src/views/auxiliaryFittings/projectAuxiliaryManage/index.vue

@@ -124,12 +124,22 @@ export default {
 				},
 				sellOrderDetail: {
 					click: ({ row, index, column }) => {
-						
+						this.$router.push({
+							name: 'auxiliarySalesOrder',
+							query: {
+								orderEnginBaseId: row.orderEnginBaseId,
+							}
+						})
 					}
 				},
 				returnGoodsDetail: {
 					click: ({ row, index, column }) => {
-						
+						this.$router.push({
+							name: 'auxiliarySalesReturnOrder',
+							query: {
+								orderEnginBaseId: row.orderEnginBaseId,
+							}
+						})
 					}
 				},
 			})

+ 8 - 2
src/views/auxiliaryFittings/salesManagement/attachmentNewReturn/index.vue

@@ -52,7 +52,8 @@ export default {
 			formDialog: false,
 			id: '',
 			flag: '',
-			isShowTab: true
+			isShowTab: true,
+			orderEnginBaseId: ''
 		}
 	},
 	computed: {
@@ -74,6 +75,11 @@ export default {
 		},
 		formItems() { }
 	},
+	created(){
+		if(this.$route.query.orderEnginBaseId){
+			this.orderEnginBaseId = this.$route.query.orderEnginBaseId
+		}
+	},
 	watch: {
 		flag(){
 			this.isShowTab = false
@@ -96,7 +102,7 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' }, { "param": "a.type", "compare": "=", "value": 'NEW' }, { 'param': 'a.flag', "compare": "=", "value": this.flag })
+				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' }, { "param": "a.type", "compare": "=", "value": 'NEW' }, { 'param': 'a.flag', "compare": "=", "value": this.flag }, { 'param': 'a.order_engin_base_id', "compare": "=", "value": this.orderEnginBaseId })
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {

+ 6 - 2
src/views/auxiliaryFittings/salesManagement/attachmentSalesOrder/index.vue

@@ -59,7 +59,8 @@ export default {
 			id: '',
 			flag: '',
 			websitList: [],
-			isShowTab: true
+			isShowTab: true,
+			orderEnginBaseId: ''
 		}
 	},
 	computed: {
@@ -100,6 +101,9 @@ export default {
 			this.formDialogType = 2
 			this.openForm()
 		}
+		if(this.$route.query.orderEnginBaseId){
+			this.orderEnginBaseId = this.$route.query.orderEnginBaseId
+		}
 	},
 	watch: {
 		flag(){
@@ -123,7 +127,7 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' }, { 'param': 'a.flag', "compare": "=", "value": this.flag })
+				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'P' }, { 'param': 'a.flag', "compare": "=", "value": this.flag }, { 'param': 'a.order_engin_base_id', "compare": "=", "value": this.orderEnginBaseId })
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {

+ 6 - 2
src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -59,7 +59,8 @@ export default {
 			id: '',
 			flag: '',
 			websitList: [],
-			isShowTab: true
+			isShowTab: true,
+			orderEnginBaseId: ''
 		}
 	},
 	computed: {
@@ -100,6 +101,9 @@ export default {
 			this.formDialogType = 2
 			this.openForm()
 		}
+		if(this.$route.query.orderEnginBaseId){
+			this.orderEnginBaseId = this.$route.query.orderEnginBaseId
+		}
 	},
 	watch: {
 		flag(){
@@ -123,7 +127,7 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' }, { 'param': 'a.flag', "compare": "=", "value": this.flag })
+				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' }, { 'param': 'a.flag', "compare": "=", "value": this.flag }, { 'param': 'a.order_engin_base_id', "compare": "=", "value": this.orderEnginBaseId })
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {

+ 8 - 2
src/views/auxiliaryFittings/salesManagement/auxiliarySalesReturnOrder/index.vue

@@ -52,7 +52,8 @@ export default {
 			formDialog: false,
 			id: '',
 			retState: '',
-			isShowTab: true
+			isShowTab: true,
+			orderEnginBaseId: ''
 		}
 	},
 	computed: {
@@ -74,6 +75,11 @@ export default {
 		},
 		formItems() { }
 	},
+	created(){
+		if(this.$route.query.orderEnginBaseId){
+			this.orderEnginBaseId = this.$route.query.orderEnginBaseId
+		}
+	},
 	watch: {
 		retState(){
 			this.isShowTab = false
@@ -96,7 +102,7 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' }, { 'param': 'a.ret_state', "compare": "=", "value": this.retState })
+				pam.params.push({ "param": "a.goods_type", "compare": "=", "value": 'M' }, { 'param': 'a.ret_state', "compare": "=", "value": this.retState }, { 'param': 'a.order_engin_base_id', "compare": "=", "value": this.orderEnginBaseId })
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {