snow il y a 7 mois
Parent
commit
c42e88f2a9

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/index.html


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.9a2d4ce5.css


BIN
dist/static/css/app.9a2d4ce5.css.gz


BIN
dist/static/css/app.ca9fd137.css.gz


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.4a97752d.js


BIN
dist/static/js/app.4a97752d.js.gz


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


+ 15 - 0
src/components/newEarningReport/supplier.vue

@@ -176,6 +176,7 @@ export default {
   props: ['companies', 'costField', 'isTenThound'],
   data() {
     return {
+      lastSupportCompany: '',
       totalAmount:[],
       selfSupport:{ companyArr: [] },
       otherSupport: { companyArr: [], companyAmount: [] },
@@ -405,9 +406,18 @@ export default {
       return Number(currentTotalTip) > Number(current) ? 'color: red' : '';
     },
     setCellClassName({ column, row }) {
+
       const { label } = column;
       let base = ''
 
+      // console.log(label === '', row.order_type)
+      if(
+        (label === '' && row.order_type === '自营订单' || row.order_type === undefined) &&
+        row.companyName !== this.lastSupportCompany
+      ) {
+         base += 'no-border-bottom '
+      }
+
       if(row.companyName === "北京万宇恒通国际科贸有限公司") {
         base += 'font-bold '
       }
@@ -489,6 +499,11 @@ export default {
           ...this.selfSupport.companyArr
         ]
 
+
+        this.lastSupportCompany = this.selfSupport.companyArr[this.selfSupport.companyArr.length -1].companyName
+
+        console.log(this.selfSupport.companyArr)
+
         this.otherSupport.companyAmount = [
           {
             ...amountData,

+ 0 - 1
src/pages/newEarningReport.vue

@@ -117,7 +117,6 @@ export default {
       const code = getParameterByName('code')
       const result = await userRequest.userinfo({ ...(openid ? { openid } : { code }) })
 
-
       //  const result = {
       //  "code": 0,
       //  "message": "获取成功",

+ 4 - 0
src/styles/index.scss

@@ -67,3 +67,7 @@
   color:#409EFF;
  }
 }
+
+.no-border-bottom {
+  border-bottom: 0px !important;
+}

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff