Merge branch 'dev1.0.1' of http://192.168.0.200:3000/suf/factoring-trade-c-front-end into dev1.0.1

src/views/login/index.vue

@@ -400,7 +400,7 @@ export default {
     box-shadow: 0px 0px 10px 2px #8b8080;
     position: fixed;
     top: 50%;
-    transform: translateY(-50%) scale(.8);
+    transform: translateY(-50%) scale(.9);
     right: 0px;
     bottom: 0px;
     left: 0px;

src/views/myBusiness/supplementaryInfo/components/BusinessSituation.vue

@@ -189,7 +189,7 @@ export default {
     },
     getParams() {
       const upstreamProcurementDocuments = this.upstreamTableData.map((item, index) => {
-        if(item.name) {
+        if (item?.name) {
           return {
             name: item.name,
             files: this.$refs[`upfileStorage${index}`].getFileLists.map(item => item.id)
@@ -197,7 +197,7 @@ export default {
         }
       })
       const salesDocumentsInfos = this.downstreamTableData.map((item, index) => {
-        if(item.name) {
+        if (item?.name) {
           return {
             name: item.name,
             files: this.$refs[`downfileStorage${index}`].getFileLists.map(item => item.id)
@@ -205,8 +205,8 @@ export default {
         }
       })
       return {
-        upstreamProcurementDocuments: upstreamProcurementDocuments.filter(item => item.name),
-        salesDocumentsInfos: salesDocumentsInfos.filter(item => item.name)
+        upstreamProcurementDocuments: upstreamProcurementDocuments.filter(item => item?.name),
+        salesDocumentsInfos: salesDocumentsInfos.filter(item => item?.name)
       }
     }
   }

src/views/myBusiness/supplementaryInfo/components/RelatedEnterprises.vue

@@ -127,7 +127,7 @@ export default {
     },
     getParams() {
       return new Promise((resolve, reject) => {
-        const list =  this.associatedEnterpriseInfos.filter(item => item.nam)
+        const list =  this.associatedEnterpriseInfos.filter(item => item.name)
         resolve({ associatedEnterpriseInfos: list })
       })
     }

src/views/myFinancing/financingMain.vue

@@ -118,7 +118,7 @@ export default {
                 msg: '查看',
                 icon: 'iconfont icon-a-Group957',
                 power: '',
-                rowPower: ['额度支用', '支用审核', '合同制作', '合同签署', '合同审核', '付款申请', '付款审核'],
+                rowPower: ['额度支用', '支用审核', '合同制作', '合同签署', '合同审核', '付款申请', '付款审核', '已完成'],
                 category: 'see'
               },
               {
@@ -159,7 +159,10 @@ export default {
       return ({ item, tab, row }) => {
         const { tabPower, rowPower } = item
         if (rowPower) {
-          if (rowPower.includes(row.currentStage)) {
+          if (rowPower.includes(row.currentStage) || rowPower.includes(row.financingStatus)) {
+            if(rowPower.includes(null) && row.financingStatus === '已完成' ) {
+              return false
+            }
             return true
           }
         } else {

src/views/myTrade/settlementDocumentManagement/add.vue

@@ -318,7 +318,7 @@ export default {
   },
   components: { chooseGoodsVue },
   mounted() {
-    if(this.$route.params.key) {
+    if(this.$route.query.key) {
       this.getDetail()
     } else {
       // this.getCenterComList()
@@ -330,7 +330,7 @@ export default {
       request({
         url: '/bill/getDetail',
         method: 'get',
-        params: { taskId: this.$route.params.taskId, businessKey: this.$route.params.key,
+        params: { taskId: this.$route.query.taskId, businessKey: this.$route.query.key,
           Loading: true }
       }).then(({ data }) => {
         Object.keys(this.ruleForm).forEach(key => {
@@ -569,12 +569,12 @@ export default {
       }
       // this.isLoading = true
       let data = new FormData()
-      if(this.$route.params.key) {
-        data.append('businessKey', this.$route.params.key)
-        data.append('id', this.$route.params.key)
+      if(this.$route.query.key) {
+        data.append('businessKey', this.$route.query.key)
+        data.append('id', this.$route.query.key)
       }
-      if(this.$route.params.taskId) {
-        data.append('taskId', this.$route.params.taskId)
+      if(this.$route.query.taskId) {
+        data.append('taskId', this.$route.query.taskId)
       }
       data.append('supplierId', this.businessInfo.supplierId)
       data.append('businessNumber', this.ruleForm.businessNumber)
@@ -621,7 +621,7 @@ export default {
       });
       data.append('submit', flag == 2)
       request({
-        url: this.$route.params.key ? '/bill/updateBill' : '/bill/addBillBasicInformation',
+        url: this.$route.query.key ? '/bill/updateBill' : '/bill/addBillBasicInformation',
         method: 'post',
         data
       }).then(() => {
@@ -652,12 +652,12 @@ export default {
       }
       this.loading = true
       let data = new FormData()
-      if(this.$route.params.key) {
-        data.append('businessKey', this.$route.params.key)
-        data.append('id', this.$route.params.key)
+      if(this.$route.query.key) {
+        data.append('businessKey', this.$route.query.key)
+        data.append('id', this.$route.query.key)
       }
-      if(this.$route.params.taskId) {
-        data.append('taskId', this.$route.params.taskId)
+      if(this.$route.query.taskId) {
+        data.append('taskId', this.$route.query.taskId)
       }
       data.append('supplierId', this.businessInfo.supplierId)
       data.append('businessNumber', this.ruleForm.businessNumber)

src/views/myTrade/settlementDocumentManagement/detail.vue

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

src/views/myTrade/settlementDocumentManagement/editPrice.vue

@@ -191,7 +191,7 @@ export default {
       request({
         url: '/bill/getDetail',
         method: 'get',
-        params: { taskId: this.$route.params.taskId, businessKey: this.$route.params.key }
+        params: { taskId: this.$route.query.taskId, businessKey: this.$route.query.key }
       }).then(({ data }) => {
         Object.keys(this.ruleForm).forEach(key => {
           if(data.billBasicInformation[key] && !(this.ruleForm[key] instanceof Array)) {
@@ -245,8 +245,8 @@ export default {
     submit() {
       // this.isLoading = true
       let data = {
-        businessKey: this.$route.params.key,
-        id: this.$route.params.key,
+        businessKey: this.$route.query.key,
+        id: this.$route.query.key,
         settlementGoodsInfos: this.ruleForm.goodsList.map(item => {
           item.acceptanceGoodsInfoId = item.id
           return item

src/views/myTrade/settlementDocumentManagement/index.vue

@@ -109,7 +109,10 @@ export default {
       } else if(type == 'see') {
         this.$router.push({
           name: 'SettlementDetail',
-          params: { id: 'child', taskId: info.taskId, key: info.id }
+          params: { id: 'child', taskId: info.taskId, key: info.id },
+          query: {
+            taskId: info.taskId, key: info.id
+          }
         })
       } else if(type == 'changePrice') {
         this.$router.push({