lilei 2 年之前
父节点
当前提交
479a5e3f5c

+ 3 - 3
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -194,9 +194,9 @@ export default {
           this.form.citySn = row.citySn
           this.form.provinceName = row.provinceName
           this.form.cityName = row.cityName
-          this.form.subareaArea.subareaName = row.subareaName
-          this.form.subareaArea.subareaAreaName = row.subareaAreaName
-          this.form.subareaAreaSn = row.subareaAreaSn
+          this.form.subareaArea.subareaName = row.subareaArea.subareaName
+          this.form.subareaArea.subareaAreaName = row.subareaArea.subareaAreaName
+          this.subareaList = [row.subareaArea.subareaName,row.subareaArea.subareaAreaName]
         } else {
           this.form.accountNameSn = ''
           this.form.provinceSn = ''

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

@@ -76,13 +76,13 @@
         :scroll="{ x: 2250 }"
         :defaultLoadData="false"
         bordered>
-        <template slot="footer">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
                 <a-col span="4" v-for="item in countLabel" :key="item.key">
-                  {{ item.title }}:{{ totalData?totalData[item.dataIndex]:'--' }}
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
               <a-row>

+ 1 - 1
src/views/reportData/billingOrderReport/list.vue

@@ -65,7 +65,7 @@
         :showPagination="false"
         :scroll="{ x: 1550 }"
         bordered>
-        <template slot="footer" v-if="countLabel.length>0||countBrandLabel.length">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">

+ 3 - 3
src/views/reportData/returnSlipReport/list.vue

@@ -82,13 +82,13 @@
         :scroll="{ x: tableWidth, y: tableHeight }"
         :defaultLoadData="false"
         bordered>
-        <template slot="footer">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
-                <a-col span="4" v-for="item in countLabel||countBrandLabel.length" :key="item.key">
-                  {{ item.title }}:{{ totalData?totalData[item.dataIndex]:'--' }}
+                <a-col span="4" v-for="item in countLabel" :key="item.key">
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
               <a-row>

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

@@ -77,13 +77,13 @@
         :scroll="{ x: 2250, y: tableHeight }"
         :defaultLoadData="false"
         bordered>
-        <template slot="footer">
+        <template slot="footer" v-if="countLabel.length||countBrandLabel.length">
           <a-row>
             <a-col span="2">合计:</a-col>
             <a-col span="22">
               <a-row>
                 <a-col span="4" v-for="item in countLabel" :key="item.key">
-                  {{ item.title }}:{{ totalData?totalData[item.dataIndex]:'--' }}
+                  {{ item.title }}:{{ totalData?(totalData[item.dataIndex]||totalData[item.dataIndex]==0)?toThousands(totalData[item.dataIndex]):'--':'--' }}
                 </a-col>
               </a-row>
               <a-row>

+ 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: {