zhangdan 3 سال پیش
والد
کامیت
ac4613cb03

+ 4 - 10
src/views/reportData/districtTypeSalesDetails/list.vue

@@ -124,15 +124,9 @@ export default {
   methods: {
     //  创建时间  change
     dateChange (date) {
-      if (date.length) {
-        if (date[0] == '' && date[1] == '') {
-          this.resetSearchForm()
-        } else {
-          this.queryParam.time = date
-        }
-      }
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      this.queryParam.time = date
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
     },
     //  重置
     resetSearchForm () {
@@ -140,7 +134,7 @@ export default {
       this.queryParam.time = [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
-      ],
+      ]
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.targetName = ''

+ 351 - 152
src/views/reportData/nationalCustomerCostStatistics/list.vue

@@ -2,7 +2,8 @@
   <a-card size="small" :bordered="false" class="nationalCustomerCostStatisticsList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
-      <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="queryParam" @keyup.enter.native="$refs.table.refresh(true)">
+      <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="queryParam"
+        @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="创建时间" prop="time">
@@ -11,181 +12,379 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="区域">
-              <a-select id="nationalCustomerCostStatisticsList-allocateTypeSn" v-model="queryParam.allocateTypeSn" placeholder="请选择区域" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+              <a-select id="nationalCustomerCostStatisticsList-allocateTypeSn" v-model="queryParam.allocateTypeSn"
+                placeholder="请选择区域" allowClear>
+                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn"
+                  :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="省份">
-              <a-select id="nationalCustomerCostStatisticsList-state" v-model="queryParam.state" placeholder="请选择省份" allowClear >
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn" :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
+              <a-select id="nationalCustomerCostStatisticsList-state" v-model="queryParam.state" placeholder="请选择省份"
+                allowClear>
+                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn"
+                  :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="nationalCustomerCostStatisticsList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="nationalCustomerCostStatisticsList-reset">重置</a-button>
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled"
+              id="nationalCustomerCostStatisticsList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled"
+              id="nationalCustomerCostStatisticsList-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form-model>
     </div>
     <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :showPagination="false"
-      :data="loadData"
-      :scroll="{ x: 2920 }"
-      bordered>
+    <s-table class="sTable" ref="table" size="small" :rowKey="(record) => record.id" :columns="columns"
+      :showPagination="false" :data="loadData" :scroll="{ x: 2920 }" bordered>
     </s-table>
   </a-card>
 </template>
 
 <script>
-import { STable, VSelect } from '@/components'
-import reportData from '@/libs/reportData'
-import rangeDate from '@/views/common/rangeDate.vue'
-import getDate from '@/libs/getDate.js'
-// import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport } from '@/api/allocateBill'
-// import { allocateTypeAllList } from '@/api/allocateType'
-export default {
-  components: { STable, VSelect, rangeDate },
-  data () {
-    return {
-      advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      queryParam: { //  查询条件
-        time: [
-         getDate.getCurrMonthDays().starttime,
-         getDate.getCurrMonthDays().endtime
-        ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate:  getDate.getCurrMonthDays().endtime,
-        targetName: '', //  调往对象
-        allocateTypeSn: undefined, //  调拨类型
-        state: undefined, //  业务状态
-        allocateNo: '' //  调拨单号
-      },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
-	  rules: {
-	    'time': [{ required: true, message: '请选择创建时间', trigger: 'change' }]
-	  },
-      columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '区域', dataIndex: 'area', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '省份', dataIndex: 'province', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'customerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '费用类型', dataIndex: 'targetName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '1月', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '2月', dataIndex: 'totalQty', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '3月', dataIndex: 'totalCost', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '4月', dataIndex: 'totalPrice', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '5月', dataIndex: 'auditTime', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '6月', dataIndex: 'allocateTypeName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '7月', dataIndex: 'stateDictValue', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '8月', dataIndex: 'printStateDictValue', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '9月', dataIndex: 'printCount', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '10月', dataIndex: 'printCounts', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '11月', dataIndex: 'printCsounts', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '12月', dataIndex: 'printdCounts', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '1-12月费用合计', dataIndex: 'prfintCounts', width: 140, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        {
-          title: '实际销售额合计',
-          dataIndex: 'printCogunts',
-          width: 140,
-          align: 'center',
-          customRender: (value, row, index) => {
-            const obj = {
-              children: value,
-              attrs: {}
-            }
-            if (index === 0) { obj.attrs.rowSpan = 5 }
-            if (index === 1) { obj.attrs.rowSpan = 0 }
-            if (index === 2) { obj.attrs.rowSpan = 0 }
-            if (index === 3) { obj.attrs.rowSpan = 0 }
-            if (index === 4) { obj.attrs.rowSpan = 0 }
-            if (index === 5) { obj.attrs.rowSpan = 5 }
-            if (index === 6) { obj.attrs.rowSpan = 0 }
-            if (index === 7) { obj.attrs.rowSpan = 0 }
-            if (index === 8) { obj.attrs.rowSpan = 0 }
-            if (index === 9) { obj.attrs.rowSpan = 0 }
-            if (index === 10) { obj.attrs.rowSpan = 5 }
-            if (index === 11) { obj.attrs.rowSpan = 0 }
-            if (index === 12) { obj.attrs.rowSpan = 0 }
-            if (index === 13) { obj.attrs.rowSpan = 0 }
-            if (index === 14) { obj.attrs.rowSpan = 0 }
-            return obj
-          }
+  import {
+    STable,
+    VSelect
+  } from '@/components'
+  import reportData from '@/libs/reportData'
+  import rangeDate from '@/views/common/rangeDate.vue'
+  import getDate from '@/libs/getDate.js'
+  // import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport } from '@/api/allocateBill'
+  // import { allocateTypeAllList } from '@/api/allocateType'
+  export default {
+    components: {
+      STable,
+      VSelect,
+      rangeDate
+    },
+    data() {
+      return {
+        advanced: false, // 高级搜索 展开/关闭
+        tableHeight: 0,
+        queryParam: { //  查询条件
+          time: [
+            getDate.getCurrMonthDays().starttime,
+            getDate.getCurrMonthDays().endtime
+          ],
+          beginDate: getDate.getCurrMonthDays().starttime,
+          endDate: getDate.getCurrMonthDays().endtime,
+          targetName: '', //  调往对象
+          allocateTypeSn: undefined, //  调拨类型
+          state: undefined, //  业务状态
+          allocateNo: '' //  调拨单号
         },
-        { title: '费用占比(%)', dataIndex: 'phrintCounts', width: 140, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '正常费用', dataIndex: 'printCsountss', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '特殊申请费用', dataIndex: 'prinftCounts', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.disabled = true
-        // return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
-        //   const data = res.data
-        //   const no = (data.pageNo - 1) * data.pageSize
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = no + i + 1
-        //   }
-        //   this.disabled = false
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: reportData.nationalCustomerCostStatisticsList,
-            count: 10
-          }
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = i + 1
+        disabled: false, //  查询、重置按钮是否可操作
+        exportLoading: false,
+        rules: {
+          'time': [{
+            required: true,
+            message: '请选择创建时间',
+            trigger: 'change'
+          }]
+        },
+        columns: [{
+            title: '序号',
+            dataIndex: 'no',
+            width: 80,
+            align: 'center',
+            fixed: 'left'
+          },
+          {
+            title: '区域',
+            dataIndex: 'area',
+            width: 200,
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            }
+          },
+          {
+            title: '省份',
+            dataIndex: 'province',
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            }
+          },
+          {
+            title: '客户名称',
+            dataIndex: 'customerName',
+            align: 'center',
+            customRender: function(text) {
+              return text || '--'
+            },
+            ellipsis: true
+          },
+          {
+            title: '费用类型',
+            dataIndex: 'targetName',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '1月',
+            dataIndex: 'dealerLevelDictValue',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '2月',
+            dataIndex: 'totalQty',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '3月',
+            dataIndex: 'totalCost',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '4月',
+            dataIndex: 'totalPrice',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '5月',
+            dataIndex: 'auditTime',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '6月',
+            dataIndex: 'allocateTypeName',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '7月',
+            dataIndex: 'stateDictValue',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '8月',
+            dataIndex: 'printStateDictValue',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '9月',
+            dataIndex: 'printCount',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '10月',
+            dataIndex: 'printCounts',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '11月',
+            dataIndex: 'printCsounts',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '12月',
+            dataIndex: 'printdCounts',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '1-12月费用合计',
+            dataIndex: 'prfintCounts',
+            width: 140,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '实际销售额合计',
+            dataIndex: 'printCogunts',
+            width: 140,
+            align: 'center',
+            customRender: (value, row, index) => {
+              const obj = {
+                children: value,
+                attrs: {}
+              }
+              if (index === 0) {
+                obj.attrs.rowSpan = 5
+              }
+              if (index === 1) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 2) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 3) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 4) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 5) {
+                obj.attrs.rowSpan = 5
+              }
+              if (index === 6) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 7) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 8) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 9) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 10) {
+                obj.attrs.rowSpan = 5
+              }
+              if (index === 11) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 12) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 13) {
+                obj.attrs.rowSpan = 0
+              }
+              if (index === 14) {
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+            }
+          },
+          {
+            title: '费用占比(%)',
+            dataIndex: 'phrintCounts',
+            width: 140,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '正常费用',
+            dataIndex: 'printCsountss',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
+          },
+          {
+            title: '特殊申请费用',
+            dataIndex: 'prinftCounts',
+            width: 120,
+            align: 'center',
+            customRender: function(text) {
+              return ((text || text == 0) ? text : '--')
+            }
           }
-          _this.disabled = false
-          resolve(data)
-        })
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          this.disabled = true
+          // return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
+          //   const data = res.data
+          //   const no = (data.pageNo - 1) * data.pageSize
+          //   for (var i = 0; i < data.list.length; i++) {
+          //     data.list[i].no = no + i + 1
+          //   }
+          //   this.disabled = false
+          //   return data
+          // })
+          const _this = this
+          return new Promise(function(resolve, reject) {
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: reportData.nationalCustomerCostStatisticsList,
+              count: 10
+            }
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = i + 1
+            }
+            _this.disabled = false
+            resolve(data)
+          })
+        },
+        allocateTypeList: [], //  调拨类型
+        openModal: false //  新增编辑  弹框
+      }
+    },
+    methods: {
+      //  创建时间  change
+      dateChange(date) {
+        this.queryParam.time = date
+        this.queryParam.beginDate = date[0] || ''
+        this.queryParam.endDate = date[1] || ''
       },
-      allocateTypeList: [], //  调拨类型
-      openModal: false //  新增编辑  弹框
-    }
-  },
-  methods: {
-    //  创建时间  change
-    dateChange (date) {
-      if (date.length) {
-        if (date[0] == '' && date[1] == '') {
-          this.resetSearchForm()
-        } else {
-          this.queryParam.time = date
-        }
+      //  重置
+      resetSearchForm() {
+        this.$refs.rangeDate.resetDate(this.queryParam.time)
+        this.queryParam.time = [getDate.getCurrMonthDays().starttime,
+          getDate.getCurrMonthDays().endtime
+        ]
+        this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
+        this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+        this.queryParam.targetName = ''
+        this.queryParam.allocateTypeSn = undefined
+        this.queryParam.state = undefined
+        this.queryParam.allocateNo = ''
+        this.$refs.table.refresh(true)
       }
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
     },
-    //  重置
-    resetSearchForm () {
-      this.$refs.rangeDate.resetDate(this.queryParam.time)
-      this.queryParam.time=[getDate.getCurrMonthDays().starttime,
-         getDate.getCurrMonthDays().endtime]
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
-      this.queryParam.targetName = ''
-      this.queryParam.allocateTypeSn = undefined
-      this.queryParam.state = undefined
-      this.queryParam.allocateNo = ''
-      this.$refs.table.refresh(true)
+    beforeRouteEnter(to, from, next) {
+      next(vm => {})
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {})
   }
-}
 </script>

+ 4 - 10
src/views/reportData/provinceTypeSalesDetails/list.vue

@@ -144,22 +144,16 @@ export default {
   methods: {
     //  创建时间  change
     dateChange (date) {
-      if (date.length) {
-        if (date[0] == '' && date[1] == '') {
-          this.resetSearchForm()
-        } else {
-          this.queryParam.time = date
-        }
-      }
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      this.queryParam.time = date
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
     },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
-      ],
+      ]
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.targetName = ''

+ 4 - 10
src/views/reportData/regionalPromotionCostStatistics/list.vue

@@ -142,15 +142,9 @@ export default {
   methods: {
     //  创建时间  change
     dateChange (date) {
-      if (date.length) {
-        if (date[0] == '' && date[1] == '') {
-          this.resetSearchForm()
-        } else {
-          this.queryParam.time = date
-        }
-      }
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      this.queryParam.time = date
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
     },
     //  重置
     resetSearchForm () {
@@ -158,7 +152,7 @@ export default {
       this.queryParam.time = [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
-      ],
+      ]
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.targetName = ''