snow 7 months ago
parent
commit
c26d3fafe9

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.fd4b9364.css


BIN
dist/static/css/app.bad1fb49.css.gz → dist/static/css/app.fd4b9364.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b62a3ea9.js


BIN
dist/static/js/app.b62a3ea9.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e9ad049a.js


BIN
dist/static/js/app.e9ad049a.js.gz


+ 16 - 8
src/components/newEarningReport/supplier.vue

@@ -542,6 +542,7 @@ export default {
           {
             ...amountData,
             companyNo: 'selfSupportOrderAmount',
+            order_type: '自营订单',
             companyName: '合计'
           },
           ...(children.length === 0? [] : [{
@@ -578,16 +579,23 @@ export default {
         }
 
                
+        this.selfSupport.companyArr = this.selfSupport.companyArr.map((item) => ({
+          ...item,
+          order_type: undefined
+        }))
 
-      console.log(this.selfSupport.companyArr)
 
-       if(this.selfSupport.companyArr.length === 1){
-        this.selfSupport.companyArr[0].order_type = '自营订单'
-       }else{
-         this.lastSupportCompany = this.selfSupport.companyArr[this.selfSupport.companyArr.length -1].companyName
-        const middle = Math.floor(this.selfSupport.companyArr.length / 2)
-        this.selfSupport.companyArr[middle].order_type = '自营订单'
-       }
+        if(this.selfSupport.companyArr.length === 2 && this.selfSupport.companyArr[0].companyName === '合计'){
+          this.selfSupport.companyArr.splice(0, 1)
+        }
+
+      //  if(this.selfSupport.companyArr.length === 1){
+        // this.selfSupport.companyArr[0].order_type = '自营订单'
+      //  }else{
+          this.lastSupportCompany = this.selfSupport.companyArr[this.selfSupport.companyArr.length -1].companyName
+          const middle = Math.floor(this.selfSupport.companyArr.length / 2)
+          this.selfSupport.companyArr[0].order_type = '自营订单'
+      //  }
 
 
         // this.otherCompanise = sourceData.filter(({is_sup}) => is_sup === 1)

+ 1 - 1
src/pages/newEarningReport.vue

@@ -15,7 +15,7 @@
           :width="200" 
           trigger="hover"
           placement="top-start"
-          content="以下报表每天20:00更新"
+          content="以下报表一小时更新一次"
         >
           <template #reference>
             <i class="el-icon-warning-outline" style="font-size:22px;cursor:pointer" />

Some files were not shown because too many files changed in this diff