浏览代码

bug修复

chenrui 3 年之前
父节点
当前提交
87aca2a1ab

+ 9 - 4
src/components/custom.less

@@ -8,7 +8,7 @@ body{
 }
 }
 // 查询条件样式
 // 查询条件样式
 .table-page-search-wrapper {
 .table-page-search-wrapper {
-  .ant-form-inline, .ant-form {
+  .ant-form.ant-form-inline{
     .ant-form-item {
     .ant-form-item {
       margin-bottom: 10px;
       margin-bottom: 10px;
       .ant-input,.ant-select-selection{
       .ant-input,.ant-select-selection{
@@ -17,13 +17,10 @@ body{
       }
       }
       .ant-form-item-label{
       .ant-form-item-label{
         line-height: 32px!important;
         line-height: 32px!important;
-        // line-height: 24px!important;  // 小号行距
         padding-right: 8px!important;
         padding-right: 8px!important;
       }
       }
       .ant-form-item-control{
       .ant-form-item-control{
         line-height: 31px!important;
         line-height: 31px!important;
-        // height: 24px!important;  // 小号行距
-        // line-height: 24px!important;  // 小号行距
       }
       }
       .ant-form-item-control-wrapper{
       .ant-form-item-control-wrapper{
         .ant-select-selection__rendered{
         .ant-select-selection__rendered{
@@ -32,6 +29,14 @@ body{
       }
       }
     }
     }
   }
   }
+  .form-model-con{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
+    .ant-form-item {
+      margin-bottom: 16px!important;
+      .ant-form-explain{
+        font-size: 12px;
+      }
+    }
+  }
   .table-page-search-submitButtons {
   .table-page-search-submitButtons {
     margin-bottom: 10px;
     margin-bottom: 10px;
   }
   }

+ 2 - 1
src/views/common/chooseProductsModal.vue

@@ -13,8 +13,9 @@
         <!-- 搜索条件 -->
         <!-- 搜索条件 -->
         <div class="table-page-search-wrapper">
         <div class="table-page-search-wrapper">
           <a-form-model
           <a-form-model
-            layout="inline"
             ref="ruleForm"
             ref="ruleForm"
+            class="form-model-con"
+            layout="inline"
             :model="queryParam"
             :model="queryParam"
             :rules="rules"
             :rules="rules"
             @keyup.enter.native="getProductList(1)"
             @keyup.enter.native="getProductList(1)"

+ 2 - 1
src/views/common/chooseSupplierModal.vue

@@ -13,8 +13,9 @@
         <!-- 搜索条件 -->
         <!-- 搜索条件 -->
         <div class="table-page-search-wrapper">
         <div class="table-page-search-wrapper">
           <a-form-model
           <a-form-model
-            layout="inline"
             ref="ruleForm"
             ref="ruleForm"
+            class="form-model-con"
+            layout="inline"
             :model="queryParam"
             :model="queryParam"
             :rules="rules"
             :rules="rules"
             @keyup.enter.native="getSupplierList(1)"
             @keyup.enter.native="getSupplierList(1)"

+ 2 - 1
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -13,9 +13,10 @@
           <a-form-model
           <a-form-model
             id="permissionSetting-form"
             id="permissionSetting-form"
             ref="ruleForm"
             ref="ruleForm"
+            class="form-model-con"
+            layout="inline"
             :model="queryParam"
             :model="queryParam"
             :rules="rules"
             :rules="rules"
-            layout="inline"
             @keyup.enter.native="handleSearch">
             @keyup.enter.native="handleSearch">
             <a-row :gutter="15">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">

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

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="actualSalesReportList-form"
           id="actualSalesReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

+ 3 - 1
src/views/reportData/allocationDetails/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
         <a-form-model
           id="allocationDetailsList-form"
           id="allocationDetailsList-form"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           :labelCol="labelCol"
           :labelCol="labelCol"
@@ -107,7 +109,7 @@
             </template>
             </template>
             <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
               <a-button
               <a-button
-				style="margin-left: 0px"
+                style="margin-left: 0px"
                 type="primary"
                 type="primary"
                 class="button-warning"
                 class="button-warning"
                 size="small"
                 size="small"

+ 2 - 0
src/views/reportData/allocationOrderTotal/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
         <a-form-model
           id="allocationOrderTotalList-form"
           id="allocationOrderTotalList-form"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           :labelCol="labelCol"
           :labelCol="labelCol"

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

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="returnSlipReportList-form"
           id="returnSlipReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

+ 7 - 1
src/views/reportData/districtTypeSalesDetails/list.vue

@@ -2,7 +2,13 @@
   <a-card size="small" :bordered="false" class="districtTypeSalesDetailsList-wrap">
   <a-card size="small" :bordered="false" class="districtTypeSalesDetailsList-wrap">
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <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
+        ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
+        :rules="rules"
+        :model="queryParam"
+        @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="创建时间" prop="time">
             <a-form-model-item label="创建时间" prop="time">

+ 373 - 344
src/views/reportData/nationalCustomerCostStatistics/list.vue

@@ -2,7 +2,12 @@
   <a-card size="small" :bordered="false" class="nationalCustomerCostStatisticsList-wrap">
   <a-card size="small" :bordered="false" class="nationalCustomerCostStatisticsList-wrap">
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
-      <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="queryParam"
+      <a-form-model
+        ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
+        :rules="rules"
+        :model="queryParam"
         @keyup.enter.native="$refs.table.refresh(true)">
         @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
@@ -12,379 +17,403 @@
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="区域">
             <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"
+              <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>
                   :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
               </a-select>
               </a-select>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="省份">
             <a-form-model-item label="省份">
-              <a-select id="nationalCustomerCostStatisticsList-state" v-model="queryParam.state" placeholder="请选择省份"
+              <a-select
+                id="nationalCustomerCostStatisticsList-state"
+                v-model="queryParam.state"
+                placeholder="请选择省份"
                 allowClear>
                 allowClear>
-                <a-select-option v-for="item in allocateTypeList" :key="item.allocateTypeSn"
+                <a-select-option
+                  v-for="item in allocateTypeList"
+                  :key="item.allocateTypeSn"
                   :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
                   :value="item.allocateTypeSn">{{ item.name }}</a-select-option>
               </a-select>
               </a-select>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled"
+            <a-button
+              type="primary"
+              @click="$refs.table.refresh(true)"
+              :disabled="disabled"
               id="nationalCustomerCostStatisticsList-refresh">查询</a-button>
               id="nationalCustomerCostStatisticsList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled"
+            <a-button
+              style="margin-left: 5px"
+              @click="resetSearchForm"
+              :disabled="disabled"
               id="nationalCustomerCostStatisticsList-reset">重置</a-button>
               id="nationalCustomerCostStatisticsList-reset">重置</a-button>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
       </a-form-model>
       </a-form-model>
     </div>
     </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>
     </s-table>
   </a-card>
   </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
-  import {
+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,
     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
-            }
-          },
-          {
-            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 : '--')
-            }
-          }
+    VSelect,
+    rangeDate
+  },
+  data () {
+    return {
+      advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        time: [
+          getDate.getCurrMonthDays().starttime,
+          getDate.getCurrMonthDays().endtime
         ],
         ],
-        // 加载数据方法 必须为 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)
-          })
+        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 || '--'
         },
         },
-        allocateTypeList: [], //  调拨类型
-        openModal: false //  新增编辑  弹框
-      }
-    },
-    methods: {
-      //  创建时间  change
-      dateChange(date) {
-        this.queryParam.time = date
-        this.queryParam.beginDate = date[0] || ''
-        this.queryParam.endDate = date[1] || ''
+        ellipsis: true
       },
       },
-      //  重置
-      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)
+      {
+        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 : '--')
+        }
       }
       }
+      ],
+      // 加载数据方法 必须为 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] || ''
     },
     },
-    beforeRouteEnter(to, from, next) {
-      next(vm => {})
+    //  重置
+    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 => {})
   }
   }
+}
 </script>
 </script>

+ 2 - 1
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="priceDifferenceDetailList-form"
           id="priceDifferenceDetailList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

+ 2 - 1
src/views/reportData/provinceTypeSalesDetails/list.vue

@@ -3,8 +3,9 @@
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form-model
       <a-form-model
-        layout="inline"
         ref="ruleForm"
         ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
         :model="queryParam"
         :model="queryParam"
         :rules="rules"
         :rules="rules"
         @keyup.enter.native="$refs.table.refresh(true)">
         @keyup.enter.native="$refs.table.refresh(true)">

+ 7 - 1
src/views/reportData/regionalPromotionCostStatistics/list.vue

@@ -2,7 +2,13 @@
   <a-card size="small" :bordered="false" class="regionalPromotionCostStatisticsList-wrap">
   <a-card size="small" :bordered="false" class="regionalPromotionCostStatisticsList-wrap">
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <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
+        ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
+        :rules="rules"
+        :model="queryParam"
+        @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="创建时间" prop="time">
             <a-form-model-item label="创建时间" prop="time">

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

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="returnSlipReportList-form"
           id="returnSlipReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

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

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="salesAmountReportList-form"
           id="salesAmountReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

+ 2 - 1
src/views/reportData/salesDetails/list.vue

@@ -3,8 +3,9 @@
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form-model
       <a-form-model
-        layout="inline"
         ref="ruleForm"
         ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
         :model="queryParam"
         :model="queryParam"
         :rules="rules"
         :rules="rules"
         @keyup.enter.native="$refs.table.refresh(true)">
         @keyup.enter.native="$refs.table.refresh(true)">

+ 2 - 1
src/views/reportData/salesReturnDetailReport/list.vue

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="salesSlipReportList-form"
           id="salesSlipReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

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

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="salesReturnReportList-form"
           id="salesReturnReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

+ 2 - 1
src/views/reportData/salesReturnsReport/list.vue

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="salesReturnsReportList-form"
           id="salesReturnsReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">

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

@@ -5,8 +5,9 @@
       <div class="table-page-search-wrapper">
       <div class="table-page-search-wrapper">
         <a-form-model
         <a-form-model
           id="salesSlipReportList-form"
           id="salesSlipReportList-form"
-          layout="inline"
           ref="ruleForm"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :model="queryParam"
           :rules="rules"
           :rules="rules"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">