fix(BusinessSituation.vue):冲突

src/views/login/index.vue

@@ -385,11 +385,12 @@ export default {
     display: flex;
     box-shadow: 0px 0px 10px 2px #8b8080;
     position: fixed;
-    top: 240px;
+    top: 50%;
+    transform: translateY(-50%) scale(.9);
     right: 0px;
     bottom: 0px;
     left: 0px;
-    z-index: 20;
+    z-index: 100;
     margin: 0 auto;
     .left {
       width: 440px;

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,
-        salesDocumentsInfos: salesDocumentsInfos
+        upstreamProcurementDocuments: upstreamProcurementDocuments.filter(item => item?.name),
+        salesDocumentsInfos: salesDocumentsInfos.filter(item => item?.name)
       }
     }
   }

src/views/myTrade/acceptanceManagement/components/historyViewContent/add.vue

@@ -86,9 +86,7 @@
           <span class="statistics">数量合计： <span>{{ countTotal }}</span></span>
           <span class="statistics">销售总价合计： <span>{{ priceTotal }}</span></span>
         </span>
-        <div slot="right">
-
-        </div>
+        <div slot="right" />
       </cy-info-title>
       <div style="width: 100%;margin: 0 -15px;">
         <cy-comm-table
@@ -289,7 +287,8 @@ export default {
             supplier,
             acceptancePersonInfoHistories,
             supplementFiles,
-            fileStorage
+            fileStorage,
+            approval
           } = JSON.parse(JSON.stringify(newV))
 
           this.ruleForm = {
@@ -304,7 +303,8 @@ export default {
             checkOperatorEnterpriseContact,
             steelWaiter,
             sellBillNumber,
-            additionalRemarks
+            additionalRemarks,
+            approval
           }
           const { projectName } = businessBasicInfo
           const { corporateName } = customer
@@ -316,7 +316,7 @@ export default {
           this.ruleForm.coreEnterpriseName = corporateName
           this.ruleForm.platformName = platformName
           this.ruleForm.projectName = projectName
-          this.ruleForm.approval = 1
+          // this.ruleForm.approval = 1
 
           this.goodsInfoList = acceptanceBusinessGoods
           acceptancePersonInfoHistories.map(item => {

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({