snow il y a 7 mois
Parent
commit
ddbe14fbb5

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.0a1c97a1.css


BIN
dist/static/css/app.cb55dd0e.css.gz → dist/static/css/app.0a1c97a1.css.gz


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


BIN
dist/static/js/app.768871dd.js.gz → dist/static/js/app.06ac9841.js.gz


+ 2 - 1
src/components/newEarningReport/mapCompany.js

@@ -18,6 +18,7 @@ export const mapCompany2 = {
   "北京锦兴弘昌科技有限公司":"锦兴弘昌",
   "北京普润心堂商贸有限公司":"普润心堂",
   "北京知事文化产业发展有限公司": "知事文化",
-  "湖北泽仁文化发展有限公司": "泽仁文化"
+  "湖北泽仁文化发展有限公司": "泽仁文化",
+  "深圳鸿逸科技发展有限公司": "鸿逸科技"
 }
 

+ 4 - 9
src/components/newEarningReport/supplier.vue

@@ -406,8 +406,6 @@ export default {
       return Number(currentTotalTip) > Number(current) ? 'color: red' : '';
     },
     setCellClassName({ column, row, columnIndex }) {
-      console.log(columnIndex)
-
       const { label } = column;
       let base = ''
 
@@ -486,7 +484,7 @@ export default {
         this.selfSupport.companyArr = [
           {
             ...amountData,
-            order_type: '自营订单',
+            // order_type: '自营订单',
             companyNo: 'selfSupportOrderAmount',
             companyName: '合计'
           },
@@ -499,10 +497,9 @@ export default {
           ...this.selfSupport.companyArr
         ]
 
-
-        this.lastSupportCompany = this.selfSupport.companyArr[this.selfSupport.companyArr.length -1].companyName
-
-        console.log(this.selfSupport.companyArr)
+       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 = '自营订单'
 
         this.otherSupport.companyAmount = [
           {
@@ -512,8 +509,6 @@ export default {
             companyNo: 'otherSupportOrderAmount'
           }
         ]
-
-
         this.totalAmount = [{
           ...amountData,
           companyNo: 'totalAmount',

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