lilei 2 éve
szülő
commit
0627c1a659

+ 12 - 2
src/views/reportData/actualSalesReport/list.vue

@@ -85,6 +85,14 @@
                   {{ item.title }}:{{ totalData?totalData[item.dataIndex]:'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -166,7 +174,8 @@ export default {
       },
       totalData: null,
       columns: [],
-      countLabel: []
+      countLabel: [],
+      countBrandLabel:[]
     }
   },
   methods: {
@@ -267,7 +276,8 @@ export default {
       const _this = this
       const tableTitle = await salesBillRealReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/billingBackReport/list.vue

@@ -60,7 +60,7 @@
         :showPagination="false"
         :scroll="{ x: 1550 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -69,6 +69,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -114,6 +122,7 @@ export default {
         }
       },
       countLabel: [],
+      countBrandLabel:[],
       columns: [],
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -236,7 +245,8 @@ export default {
       const _this = this
       const tableTitle = await querySupplierTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/billingOrderReport/list.vue

@@ -65,7 +65,7 @@
         :showPagination="false"
         :scroll="{ x: 1550 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length>0||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -74,6 +74,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -120,6 +128,7 @@ export default {
         }
       },
       countLabel: [],
+      countBrandLabel:[],
       columns: [],
       totalData: null,
       disabled: false, //  查询、重置按钮是否可操作
@@ -242,7 +251,8 @@ export default {
       const _this = this
       const tableTitle = await queryBillNoTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/billingReturnReport/list.vue

@@ -77,7 +77,7 @@
         :scroll="{ x: 2250, y: tableHeight }"
         :defaultLoadData="false"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -86,6 +86,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -166,6 +174,7 @@ export default {
       productType: [],
       columns: [],
       countLabel: [],
+      countBrandLabel:[],
       totalData: null
     }
   },
@@ -263,7 +272,8 @@ export default {
       const _this = this
       const tableTitle = await salesReturnReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/returnGoodsPresentation/list.vue

@@ -82,7 +82,7 @@
         :data="loadData"
         :scroll="{ x: 2370 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -91,6 +91,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -138,6 +146,7 @@ export default {
       },
       columns: [],
       countLabel: [],
+      countBrandLabel:[],
       rules: {
         'time': [{ required: true, message: '请选择调拨日期', trigger: 'change' }]
       },
@@ -259,7 +268,8 @@ export default {
       const _this = this
       const tableTitle = await returnDocReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/returnSlipReport/list.vue

@@ -87,10 +87,18 @@
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4" v-for="item in countLabel" :key="item.key">
+                <a-col span="4" v-for="item in countLabel||countBrandLabel.length" :key="item.key">
                   {{ item.title }}:{{ totalData?totalData[item.dataIndex]:'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -175,6 +183,7 @@ export default {
       totalData: null,
       columns: [],
       countLabel:[],
+      countBrandLabel:[],
       tableWidth: 0
     }
   },
@@ -274,7 +283,8 @@ export default {
       const _this = this
       const tableTitle = await salesReportReturnTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if(item.customRender == 'amount'){

+ 12 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -77,7 +77,7 @@
         :data="loadData"
         :scroll="{ x: 2250 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -86,6 +86,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -137,6 +145,7 @@ export default {
       },
       columns: [],
       countLabel: [],
+      countBrandLabel:[],
       rules: {
         'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
       },
@@ -262,7 +271,8 @@ export default {
       const _this = this
       const tableTitle = await salesKdxxReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/salesPresentation/list.vue

@@ -82,7 +82,7 @@
         :data="loadData"
         :scroll="{ x: 2370 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -91,6 +91,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -139,6 +147,7 @@ export default {
       },
       columns: [],
       countLabel: [],
+      countBrandLabel:[],
       rules: {
         'time': [{ required: true, message: '请选择备货销售日期', trigger: 'change' }]
       },
@@ -264,7 +273,8 @@ export default {
       const _this = this
       const tableTitle = await salesXsjdReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/salesReturnReport/list.vue

@@ -86,6 +86,14 @@
                   {{ item.title }}:{{ totalData?totalData[item.dataIndex]:'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -170,7 +178,8 @@ export default {
       productType: [],
       totalData: null,
       columns: [],
-      countLabel: []
+      countLabel: [],
+      countBrandLabel:[]
     }
   },
   methods: {
@@ -267,7 +276,8 @@ export default {
       const _this = this
       const tableTitle = await salesReportReturnRebateTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 12 - 2
src/views/reportData/salesSlipReport/list.vue

@@ -82,7 +82,7 @@
         :data="loadData"
         :scroll="{ x: 2410 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
@@ -91,6 +91,14 @@
                   {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
+              <a-row>
+                <a-col span="24" style="padding:8px;"></a-col>
+              </a-row>
+              <a-row>
+                <a-col span="4" v-for="item in countBrandLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex] ||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
+                </a-col>
+              </a-row>
             </a-col>
           </a-row>
         </template>
@@ -143,6 +151,7 @@ export default {
       },
       columns: [],
       countLabel: [],
+      countBrandLabel:[],
       rules: {
         'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
       },
@@ -269,7 +278,8 @@ export default {
       const _this = this
       const tableTitle = await salesKdxxdReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.113:8660/ocs-admin',
+        // target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {