2 次代码提交 86bffc0648 ... 7be7be5c63

作者 SHA1 备注 提交日期
  changjiaming 7be7be5c63 Merge branch 'dev1.0.1' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into chang1 7 月之前
  changjiaming 382b75b092 bug 7 月之前

+ 1 - 1
src/views/purchaseContractManagement/changeContractReview.vue

@@ -78,7 +78,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

+ 1 - 1
src/views/purchaseContractManagement/detail.vue

@@ -60,7 +60,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

+ 14 - 4
src/views/purchaseContractManagement/index.vue

@@ -133,7 +133,10 @@ export default {
       if(type == 'see') {
         this.$router.push({
           name: 'PurchaseContractDetail',
-          params: { id: 'children', infoId: row.id, taskId: row.taskId }
+          params: { id: 'children', infoId: row.id, taskId: row.taskId },
+          query: {
+            infoId: row.id, taskId: row.taskId
+          }
         })
         // this.$router.push({
         //   name: 'PurchaseContractReview',
@@ -161,20 +164,27 @@ export default {
       if (row.taskName === '采购合同审核') {
         this.$router.push({
           name: 'PurchaseContractReview',
-          params: { id: 'children', infoId: row.id, taskId: row.taskId }
+          params: { id: 'children', infoId: row.id, taskId: row.taskId },
+          query: {
+            infoId: row.id, taskId: row.taskId
+          }
         })
       } else if (row.taskName === '采购合同终审' || row.taskName == '采购合同变更终审') {
         this.$router.push({
           name: 'PurchaseContractSignReview',
           params: { id: 'children', infoId: row.id, taskId: row.taskId, isChange: row.taskName == '采购合同变更终审' },
           query: { 
-            isChange: row.taskName == '采购合同变更终审'
+            isChange: row.taskName == '采购合同变更终审',
+            infoId: row.id, taskId: row.taskId
           }
         })
       } else if (row.taskName.includes('合同变更审核')) {
         this.$router.push({
           name: 'PurchaseContractChangeReview',
-          params: { id: 'children', infoId: row.id, taskId: row.taskId }
+          params: { id: 'children', infoId: row.id, taskId: row.taskId },
+          query: {
+            infoId: row.id, taskId: row.taskId
+          }
         })
       }
     },

+ 1 - 1
src/views/purchaseContractManagement/prequalification.vue

@@ -77,7 +77,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

+ 2 - 2
src/views/purchaseContractManagement/purchaseContractReview.vue

@@ -79,7 +79,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {
@@ -109,7 +109,7 @@ export default {
       })
     },
     getParamas() {
-      let data = { taskId: this.$route.params.taskId, businessKey: this.$route.params.infoId, ...this.$refs.auditInfo.ruleForm }
+      let data = { taskId: this.$route.query.taskId, businessKey: this.$route.query.infoId, ...this.$refs.auditInfo.ruleForm }
       return data
     },
     submit(type) {

+ 4 - 4
src/views/purchaseContractManagement/signReview.vue

@@ -78,7 +78,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'PurchContract', Loading: true }
+        params: { businessKey: this.$route.query.infoId, businessType: 'PurchContract', Loading: true }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {
@@ -93,11 +93,11 @@ export default {
     },
     submit(data) {
       // this.isLoading = true
-      data.businessKey = this.$route.params.infoId
-      data.taskId = this.$route.params.taskId
+      data.businessKey = this.$route.query.infoId
+      data.taskId = this.$route.query.taskId
       data.Loading = true
       request({
-        url: this.$route.params.isChange || this.$route.query.isChange ? '/purchContract/change/final/sign/audit' : '/purchContract/final/approval/doAudit',
+        url: this.$route.query.isChange || this.$route.query.isChange ? '/purchContract/change/final/sign/audit' : '/purchContract/final/approval/doAudit',
         method: 'post',
         data
       }).then(() => {

+ 1 - 1
src/views/settlementManagement/detail.vue

@@ -52,7 +52,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'BillBasicInformation' }
+        params: { businessKey: this.$route.query.infoId, businessType: 'BillBasicInformation' }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

+ 6 - 6
src/views/settlementManagement/edit.vue

@@ -27,7 +27,7 @@
       </div>
       <div slot="bar">
         <div>
-          {{ $route.params.type.includes('单价变更') ? '单价调整审核' : '结算单审核' }}
+          {{ $route.query.type.includes('单价变更') ? '单价调整审核' : '结算单审核' }}
         </div>
       </div>
       <div slot="bottom">
@@ -112,7 +112,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.params.infoId, businessType: 'BillBasicInformation' }
+        params: { businessKey: this.$route.query.infoId, businessType: 'BillBasicInformation' }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {
@@ -130,8 +130,8 @@ export default {
         url: '/bill/approval',
         method: 'get',
         params: {
-          taskId: this.$route.params.taskId,
-          businessKey: this.$route.params.infoId
+          taskId: this.$route.query.taskId,
+          businessKey: this.$route.query.infoId
         }
       }).then(({ data: { file } }) => {
         this.file = file ? [...file] : []
@@ -140,8 +140,8 @@ export default {
     submit() {
       this.isLoading = true
       let data = new FormData()
-      data.append('taskId', this.$route.params.taskId)
-      data.append('settlementBasicInfoId', this.$route.params.infoId)
+      data.append('taskId', this.$route.query.taskId)
+      data.append('settlementBasicInfoId', this.$route.query.infoId)
       data.append('approvalComment', this.ruleForm.approvalComment)
       data.append('approvalConclusion', this.ruleForm.approvalConclusion)
       request({

+ 8 - 2
src/views/settlementManagement/index.vue

@@ -140,7 +140,10 @@ export default {
       if(type == 'edit') {
         this.$router.push({
           name: 'SettlementEdit',
-          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName }
+          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName },
+          query: {
+            infoId: row.id, taskId: row.taskId, type: row.taskName
+          }
         })
       } else if(type == 'timeAxis') {
         this.timeAxisClick(row)
@@ -169,7 +172,10 @@ export default {
       } else {
         this.$router.push({
           name: 'SettlementView',
-          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName }
+          params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName },
+          query: {
+            infoId: row.id, taskId: row.taskId, type: row.taskName
+          }
         })
       }
     },