Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd into demo_

src/api/report/check-job.js

@@ -17,6 +17,16 @@ export function getMonthReport (parameter) {
   })
 }
 
+export function getStoreMonthReport (parameter) {
+  return axios({
+    url: '/report/stores?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * export file
  * parameter: { }
@@ -34,6 +44,17 @@ export function exportMonthReport (parameter) {
   })
 }
 
+export function exportMonthReport1 (parameter) {
+  return axios({
+    url: '/report/stores/export?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}
+
 /**
  * export file
  * parameter: { }
@@ -51,6 +72,17 @@ export function exportMonthReportMonth (parameter) {
   })
 }
 
+export function exportMonthReportMonth1 (parameter) {
+  return axios({
+    url: '/report/stores/export/in/month?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}
+
 /**
  * page func
  * parameter: { }

src/api/sb/stopDetail.js

@@ -0,0 +1,127 @@
+import { axios } from '@/utils/request'
+import { stringify } from 'qs'
+
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getSbInfoStopDetailPage (parameter) {
+  return axios({
+    url: '/sb/stop-details/page?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * add func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function addSbInfoStopDetail (parameter) {
+  return axios({
+    url: '/sb/stop-details',
+    method: 'POST',
+    headers: {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    data: parameter
+  })
+}
+
+/**
+ * update func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function updateSbInfoStopDetail (parameter) {
+  return axios({
+    url: '/sb/stop-details/' + parameter.id,
+    method: 'PUT',
+    data: parameter
+  })
+}
+
+/**
+ * fetch single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function fetchSbInfoStopDetail (parameter) {
+  return axios({
+    url: '/sb/stop-details/' + parameter.id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * query list func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function querySbInfoStopDetail (parameter) {
+  return axios({
+    url: '/sb/stop-details?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * delete batch func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function deleteSbInfoStopDetails (parameter) {
+  return axios({
+    url: '/sb/stop-details',
+    method: 'DELETE',
+    data: parameter
+  })
+}
+
+/**
+ * delete single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function deleteSbInfoStopDetail (parameter) {
+  return axios({
+    url: '/sb/stop-details/' + parameter.id,
+    method: 'DELETE',
+    data: parameter
+  })
+}
+
+/**
+ * export file
+ * parameter: { }
+ * @param parameter :
+ * @returns {*}
+ */
+export function exportSbInfoStopDetail (parameter) {
+  return axios({
+    url: '/sb/stop-details/export?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}

src/api/sb/type.js

@@ -142,6 +142,16 @@ export function fetchSbTypeTree (parameter) {
   })
 }
 
+export function fetchStoreTypeTree (parameter) {
+  return axios({
+    url: '/report/stores/tree?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * page func
  * parameter: { }

src/router/generator-platform-routers.js

@@ -87,6 +87,7 @@ const constantRouterComponents = {
   'SpareStoreTotalMinStock': () => import('@/views/sqarepartmanage/sparepartinfo/SpareStoreTotalMinStock'),
   // 备件使用信息
   'SparePartUsed': () => import('@/views/sqarepartmanage/sparepartused/SparePartUsed'),
+  'SbInfoStopDetail': () => import('@/views/sb/stop-detail/SbInfoStopDetail'),
   // 点检
   'SpotCheckStandard': () => import('@/views/check/checkstandard/SpotCheckStandard'),
   'SpotCheckProject': () => import('@/views/check/checkproject/SpotCheckProject'),
@@ -286,6 +287,7 @@ const constantRouterComponents = {
   'RepairReportSbInfoFee': () => import('@/views/dashboard/RepairReportSbInfoFee'), // 设备维修费用报表
   'RepairReportMttr': () => import('@/views/dashboard/RepairReportMttr'), // MTTR月统计报表
   'RepairReportFee': () => import('@/views/dashboard/RepairReportFee'), // 费用按月统计
+  'StoreReport1': () => import('@/views/dashboard/StoreReport1'), // 仓库报表
 
   // 自定义管理
   'CustomizeReport': () => import('@/views/customize/report/CustomizeReport') // 自定义报表

src/utils/dict.js

@@ -76,6 +76,8 @@ DictCache.TYPE = {
   FILE_DOWNLOAD_TEMPLATE: 'FILE_DOWNLOAD_TEMPLATE', // 模板文件
   DELFLAG: 'DELFLAG', // 删除标志
   SBTYPE_TYPE: 'SBTYPE_TYPE', // 设备类型
+  SB_INFO_STOP_DETAIL_TYPE: 'SB_INFO_STOP_DETAIL_TYPE', // 设备停机类型表：1停机、2启用
+  SB_INFO_STOP_DETAIL_STATUS: 'SB_INFO_STOP_DETAIL_STATUS', // 设备停机状态表：1未审核，2已审核（变更设备状态）
   FIRM_PRODUCER_LEVEL: 'FIRM_PRODUCER_LEVEL', // 供应商等级
   FIRM_PRODUCER_TYPE: 'FIRM_PRODUCER_TYPE', // 供应商类型
   SBPOSITION_TYPE: 'SBPOSITION_TYPE', // 位置类型,

src/views/activiti/flow/Flow.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('act-flow-del')">
         <a-menu slot="overlay">
           <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">

src/views/activiti/model/Model.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('act-model-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button v-if="$auth('act-model-sync')" type="primary" @click="sync">同步</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('act-model-del')">

src/views/big-screen/RepairScreen.vue

@@ -1,17 +1,23 @@
 <template>
-  <iframe
+<!--  <iframe
     :src="url"
     id="mobsf"
     scrolling="no"
     frameborder="0"
     allowtransparency="true"
     width="100%"
-    :height="clientHeight"></iframe>
+    :height="clientHeight"></iframe>-->
 </template>
 
 <script>
 
 export default {
+  created () {
+    const a = document.createElement('a')
+    a.target = '_blank'
+    a.href = '/hitch-screen/index.html'
+    a.click()
+  },
   data () {
     return {
       url: '/hitch-screen/index.html',

src/views/check/checkjob/CheckJob.vue

@@ -113,15 +113,15 @@
         <div class="table-operator" style="margin-bottom: 16px;">
           <a-row>
             <a-col :md="16">
-              <a-button v-if="$auth('check-polling-jobs-add')" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
-              <a-button style="margin-left: 8px" v-if="($auth('check-spot-jobs-export') || $auth('check-polling-jobs-export'))" icon="download" @click="doExport">导出</a-button>
-              <a-button style="margin-left:8px;" @click="doImportForUpdate">
+              <a-button v-if="$auth('check-polling-jobs-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
+              <a-button style="margin-left: 8px" type="primary" v-if="($auth('check-spot-jobs-export') || $auth('check-polling-jobs-export'))" icon="download" @click="doExport">导出</a-button>
+              <a-button style="margin-left:8px;" type="primary" @click="doImportForUpdate">
                 <a-icon type="upload"/>
                 修改导入
               </a-button>
-              <a-button style="margin-left: 8px" @click="handleSeven">本周</a-button>
-              <a-button style="margin-left: 8px" @click="handleMonth">本月</a-button>
-              <a-button style="margin-left: 8px" @click="handleTuiCalendar">日历图</a-button>
+              <a-button style="margin-left: 8px" type="primary" @click="handleSeven">本周</a-button>
+              <a-button style="margin-left: 8px" type="primary" @click="handleMonth">本月</a-button>
+              <a-button style="margin-left: 8px" type="primary" @click="handleTuiCalendar">日历图</a-button>
               <a-button style="margin-left: 8px" type="primary" @click="handleExecuteBatch" v-if="selectedRowKeys.length > 0">
                 <a-icon style="margin-left: 8px" type="plus"/>
                 批量接收

src/views/check/checkjob/modules/CheckJobSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/check/checkjob/modules/CheckJobTable.vue

@@ -37,7 +37,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <!--      <a-button v-if="$auth('check-jobs-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>-->
       <a-button style="margin-left: 8px" v-if="($auth('check-spot-jobs-export') || $auth('check-polling-jobs-export'))" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && ($auth('check-spot-jobs-finish') || $auth('check-polling-jobs-finish'))">

src/views/check/checkjob/modules/CheckJobTableWaitDo.vue

@@ -45,7 +45,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <!--      <a-button v-if="$auth('check-jobs-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="($auth('check-spot-jobs-export') || $auth('check-polling-jobs-export'))" type="primary" icon="download" @click="doExport">导出</a-button>-->
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && ($auth('check-spot-jobs-finish') || $auth('check-polling-jobs-finish'))">

src/views/check/checkplan/CheckPlan.vue

@@ -43,7 +43,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="($auth('check-spot-plans-add') || $auth('check-polling-plans-add'))" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="($auth('check-spot-plans-export') || $auth('check-polling-plans-export'))" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('check-plans-del')">

src/views/check/checkplan/modules/BaseForm.vue

@@ -223,7 +223,7 @@
     </a-form>
     <a-tabs type="card" default-active-key="1">
       <a-tab-pane key="1" tab="计划设备">
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
           <a-button size="small" type="primary" @click="handleProjectSelect">
             <a-icon type="plus"/>
             添加

src/views/check/checkplan/modules/CheckPlanSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/check/checkproject/CheckProject.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="($auth('check-spot-projects-add') || $auth('check-polling-projects-add'))" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="($auth('check-spot-projects-export') || $auth('check-polling-projects-export'))" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && ($auth('check-spot-projects-del') || $auth('check-polling-projects-del'))">

src/views/check/checkproject/modules/AddForm.vue

@@ -185,7 +185,7 @@
     </a-form>
     <a-tabs type="card" default-active-key="1">
       <a-tab-pane key="1" tab="检查标准">
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
           <a-button size="small" type="primary" @click="handleStandardSelect">
             <a-icon type="plus"/>
             添加

src/views/check/checkproject/modules/BaseForm.vue

@@ -184,7 +184,7 @@
     </a-form>
     <a-tabs type="card" default-active-key="1">
       <a-tab-pane key="1" tab="检查标准">
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
           <a-button size="small" type="primary" @click="handleStandardSelect">
             <a-icon type="plus"/>
             添加

src/views/check/checkproject/modules/CheckProjectSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/check/checkstandard/CheckStandard.vue

@@ -79,7 +79,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button
           v-if="($auth('check-spot-standards-add') || $auth('check-polling-standards-add'))"
           type="primary"

src/views/check/checkstandard/modules/BaseForm.vue

@@ -299,8 +299,8 @@
         </row-item>
       </row-list>
     </a-form>
-    <title-divider title="关联备件" width="100px"></title-divider>
-    <div class="table-operator">
+<!--    <title-divider title="关联备件" width="100px"></title-divider>
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button style="margin-left:8px;" type="primary" @click="handleSpareSelect">
         <a-icon type="plus"/>
         添加
@@ -325,14 +325,14 @@
       </template>
       <span slot="action" slot-scope="record">
         <template>
-          <!--          <a @click="handleDetailSelect(record)">修改</a>
-          <a-divider type="vertical" />-->
+          &lt;!&ndash;          <a @click="handleDetailSelect(record)">修改</a>
+          <a-divider type="vertical" />&ndash;&gt;
           <a-popconfirm title="是否要删除该条数据？" @confirm="handleDelOne(record)">
             <a>删除</a>
           </a-popconfirm>
         </template>
       </span>
-    </a-table>
+    </a-table>-->
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
     </template>

src/views/check/checkstandard/modules/CheckStandardSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/check/checkstandard/modules/Detail.vue

@@ -61,14 +61,14 @@
         </a-table>
       </a-tab-pane>
     </a-tabs>-->
-    <title-divider title="关联备件" width="90px"></title-divider>
+<!--    <title-divider title="关联备件" width="90px"></title-divider>
     <a-table
       :data-source="data"
       :columns="columns"
       bordered
       tableLayout="auto"
       rowKey="bomId">
-    </a-table>
+    </a-table>-->
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
     </template>

src/views/customize/report/CustomizeReport.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('customize-reports-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增
       </a-button>
       <a-button

src/views/customize/report/modules/CustomizeReportSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/dashboard/StoreReport1.vue

@@ -0,0 +1,379 @@
+<template>
+  <div class="page-header-index-wide">
+    <a-card title="仓库出库入库数据月统计报表" :loading="loading" v-show="visible" :bordered="false" :body-style="{padding: '0'}">
+      <div class="salesCard">
+        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
+          <div class="extra-wrapper" slot="tabBarExtraContent">
+            <a-row>
+              <a-col :md="3" :sm="24">
+                <a-month-picker
+                  style="margin-left: 8px"
+                  :default-value="moment(defaultStartMonth, monthFormat)"
+                  :format="monthFormat"
+                  v-model="queryParam.startMonth"
+                  placeholder="开始月份"
+                  @change="onStartChange" /></a-col>
+              <a-col :md="3" :sm="24">
+                <a-month-picker
+                  style="margin-left: 8px"
+                  :default-value="moment(defaultEndMonth, monthFormat)"
+                  :format="monthFormat"
+                  v-model="queryParam.endMonth"
+                  placeholder="结束月份"
+                  @change="onEndChange" /></a-col>
+
+              <a-col :md="6" :sm="24">
+                <a-tree-select
+                  style="width: 100%"
+                  :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                  :treeData="storeTreeData"
+                  :treeNodeFilterProp="'name'"
+                  :showSearch="true"
+                  v-decorator="['storeId']"
+                  v-model="queryParam.storeId"
+                  placeholder="仓库类型"
+                >
+                </a-tree-select>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="primary" @click="handlePrint()">打印</a-button>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
+              </a-col>
+            </a-row>
+          </div>
+          <a-tab-pane loading="true" tab="图形统计" key="1">
+            <a-row>
+              <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+                <div style="padding: 10px">
+                  <div id="container"></div>
+                </div>
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+          <a-tab-pane loading="true" tab="表格统计" key="2">
+            <a-row>
+              <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+                <div style="padding: 10px">
+                  <a-table
+                    bordered
+                    :data-source="chartsData"
+                    :columns="columns"
+                    tableLayout="auto"
+                    :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+                    rowKey="month">
+                    <span slot="action" slot-scope="record">
+                      <template>
+                        <a @click="handleView(record,1)">入库明细</a>
+                        <a-divider type="vertical" />
+                        <a @click="handleView(record,2)">出库明细</a>
+
+                        <a-divider type="vertical" />
+                        <a @click="doExportDetail(record,1)">导出入库明细</a>
+                        <a-divider type="vertical" />
+                        <a @click="doExportDetail(record,2)">导出出库明细</a>
+
+                      </template>
+                    </span>
+                  </a-table>
+                </div>
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+        </a-tabs>
+      </div>
+    </a-card>
+    <print-in-store ref="basePrintModal" @ok="handleOk"/>
+    <detail-in-store-report ref="inStoreModal" @ok="handleOk"/>
+    <detail-out-store-report ref="outStoreModal" @ok="handleOk"/>
+  </div>
+</template>
+
+<script>
+import { getStoreMonthReport, exportMonthReport1, exportMonthReportMonth1 } from '@/api/report/check-job'
+import { Chart } from '@antv/g2'
+import PrintInStore from '@/views/dashboard/modules/PrintInStoreInAndOutReport'
+import DetailCheckJobReport from '@/views/dashboard/modules/DetailCheckJobReport'
+import DetailInStoreReport from '@/views/dashboard/modules/DetailInStoreReport'
+import DetailOutStoreReport from '@/views/dashboard/modules/DetailOutStoreReport'
+
+import moment from 'moment'
+import { fetchStoreTree } from '@/api/store/store'
+
+export default {
+  name: 'Analysis',
+  components: {
+    DetailOutStoreReport,
+    DetailInStoreReport,
+    PrintInStore,
+    Chart,
+    DetailCheckJobReport
+  },
+  props: {
+    title: {
+      type: String,
+      default: '仓库出库入库数据月统计报表'
+    }
+  },
+  data () {
+    return {
+      storeTreeData: [],
+      queryParam: {
+        startMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-01-01',
+        endMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-12-01',
+        storeId: null,
+        searchStartTime: null,
+        searchEndTime: null,
+        filter: this.filter
+      },
+      loading: false,
+      serverData: [],
+      sbLevelMap: {},
+      treeData: [],
+      monthFormat: 'YYYY-MM',
+      defaultStartMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-01',
+      defaultEndMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-12',
+      years: [],
+      levelMap: {},
+      visible: true,
+      chart: null, // 创建一个chart变量
+      chartsData: [],
+      // 表头
+      columns: [
+        {
+          title: '月份',
+          width: 180,
+          dataIndex: 'month'
+        },
+        {
+          title: '入库数量',
+          width: 120,
+          dataIndex: 'inStoreNum'
+        },
+        {
+          title: '出库数量',
+          width: 120,
+          dataIndex: 'outStoreNum'
+        },
+        {
+          title: '入库金额',
+          width: 120,
+          dataIndex: 'inStorePrice',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '出库金额',
+          width: 120,
+          dataIndex: 'outStorePrice',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: '200px',
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }
+      ]
+    }
+  },
+  created () {
+    this.tableOption()
+    this.setTree()
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getData()
+    })
+  },
+  methods: {
+    tableOption () {
+      if (!this.optionAlertShow) {
+        this.options = {
+          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+          rowSelection: {
+            selectedRowKeys: this.selectedRowKeys,
+            onChange: this.onSelectChange,
+            getCheckboxProps: record => ({
+              props: {
+                disabled: true,
+                name: record.id
+              }
+            })
+          }
+        }
+        this.optionAlertShow = true
+      } else {
+        this.options = {
+          alert: false,
+          rowSelection: null
+        }
+        this.optionAlertShow = false
+      }
+    },
+    setTree () {
+      fetchStoreTree().then(res => {
+        this.storeTreeData = res.data
+      })
+    },
+    moment,
+    changeLevel (value) {
+      this.queryParam.standardLevel = value
+      this.getData()
+    },
+    onStartChange (date, dateString) {
+      this.$nextTick(() => {
+        this.queryParam.startMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      })
+    },
+    onEndChange (date, dateString) {
+      this.queryParam.endMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+    },
+    getData () {
+      if (this.queryParam.startMonth == null) {
+        this.$message.error('请选择起始月份')
+        return
+      }
+      if (this.queryParam.endMonth == null) {
+        this.$message.error('请选择结束月份')
+        return
+      }
+      for (var i = 0; i < this.storeTreeData.length; i++) {
+        if (this.queryParam.storeId === this.storeTreeData[i].id) {
+          alert('立体仓和货架没有数据')
+          return
+        }
+      }
+      getStoreMonthReport(this.queryParam)
+        .then(res => {
+          this.chartsData = res.data
+
+          // 需要将数据分组：总数，完成数
+          const groupData = []
+          this.chartsData.forEach(function (data) {
+            groupData.push({ name: '入库数量', month: data.month + '', num: data.inStoreNum })
+            groupData.push({ name: '出库数量', month: data.month + '', num: data.outStoreNum })
+          })
+          this.getCharts('container', groupData)// 调用统计图
+        })
+    },
+    getCharts (id, data) {
+      this.chart && this.chart.destroy()// 防止点击搜索按钮新增一个
+      this.chart = new Chart({
+        container: 'container',
+        autoFit: true,
+        height: 400
+      })
+      this.chart.data(data)
+      this.chart.scale('num', {
+        nice: true
+      })
+      this.chart.tooltip({
+        showMarkers: false,
+        shared: true
+      })
+      this.chart.interval().position('month*num').color('name').adjust([
+        {
+          type: 'dodge',
+          marginRatio: 0
+        }
+      ])
+      this.chart.interaction('active-region')
+      this.chart.legend({
+        position: 'bottom'
+      })
+      this.chart.render()
+    },
+    doExport () {
+      const parameter = {
+        ...this.queryParam
+      }
+      exportMonthReport1(parameter).then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
+    doExportDetail (record, number) {
+      const parameter = {
+        ...this.queryParam,
+        month: record.month,
+        year: record.year,
+        number: number
+      }
+      exportMonthReportMonth1(parameter).then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
+    handlePrint (record) {
+      const modal = this.$refs.basePrintModal
+      this.visible = false
+      modal.base({ startMonth: this.queryParam.startMonth, endMonth: this.queryParam.endMonth, title: this.title, data: this.chartsData })
+    },
+    handleView (record, number) {
+      let modal
+      if (number === 1) {
+        modal = this.$refs.inStoreModal
+      } else {
+        modal = this.$refs.outStoreModal
+      }
+      console.log(record)
+      modal.base(record)
+    },
+    handleOk () {
+      this.visible = true
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.extra-wrapper {
+  line-height: 55px;
+  padding-right: 24px;
+
+  .extra-item {
+    display: inline-block;
+    margin-right: 24px;
+
+    a {
+      margin-left: 24px;
+    }
+  }
+}
+
+.antd-pro-pages-dashboard-analysis-twoColLayout {
+  position: relative;
+  display: flex;
+  display: block;
+  flex-flow: row wrap;
+}
+
+.antd-pro-pages-dashboard-analysis-salesCard {
+  height: calc(100% - 24px);
+  /deep/ .ant-card-head {
+    position: relative;
+  }
+}
+
+.dashboard-analysis-iconGroup {
+  i {
+    margin-left: 16px;
+    color: rgba(0,0,0,.45);
+    cursor: pointer;
+    transition: color .32s;
+    color: black;
+  }
+}
+.analysis-salesTypeRadio {
+  position: absolute;
+  right: 54px;
+  bottom: 12px;
+}
+</style>

src/views/dashboard/modules/DetailInStoreReport.vue

@@ -0,0 +1,170 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="1200"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <title-divider title="入库明细列表" width="90px"></title-divider>
+    <a-table
+      bordered
+      :data-source="data"
+      :columns="columns"
+      :scroll="{x: 1000, y: BaseTool.Constant.scrollY}"
+      tableLayout="auto"
+      rowKey="id"
+    >
+      <span slot="action" slot-scope="record">
+        <template>
+          <a @click="handleView(record)">查看</a>
+        </template>
+      </span>
+      <span slot="status" slot-scope="text">
+        <badge
+          :text="BaseTool.Object.getField(statusMap,text)"
+          :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]" />
+      </span>
+    </a-table>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
+    </template>
+    <detail :check-type="2" ref="detailModal"/>
+  </a-modal>
+</template>
+
+<script>
+import DetailList from '@/components/tools/DetailList'
+import Detail from '@/views/check/checkjob/modules/Detail'
+import { fetchCheckJob } from '@/api/check/checkjob'
+
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'DetailRepairReport',
+  components: {
+    DetailList,
+    DetailListItem,
+    Detail
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 下拉框map
+      typeMap: {},
+      statusMap: {},
+      model: {},
+      // 查询参数
+      queryParam: {
+        filter: this.filter,
+        searchType: this.searchType
+      },
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          checked: true,
+          width: '70px',
+          customRender: (text, record, index) => {
+            return `${index + 1}`
+          }
+        },
+        {
+          title: '入库单号',
+          dataIndex: 'inNo',
+          checked: true,
+          width: '150px'
+        },
+        {
+          title: '备件规格',
+          dataIndex: 'ggxh',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '原厂编号',
+          dataIndex: 'initNo',
+          checked: true,
+          width: '150px'
+        },
+        {
+          title: '备件名称',
+          dataIndex: 'spareId',
+          width: '100px',
+          checked: true,
+          customRender: (text, record, index) => {
+            return record.spareName
+          }
+        },
+        {
+          title: '入库数量',
+          dataIndex: 'num',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '入库单价',
+          dataIndex: 'price',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '入库总价',
+          dataIndex: 'totalPrice',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '入库日期',
+          dataIndex: 'createdTime',
+          checked: true,
+          width: '200px'
+        }
+      ],
+      // 下拉框map
+      levelMap: {},
+      standardLevelMap: {},
+      sbStatusMap: {},
+      periodTypeMap: {},
+      data: []
+    }
+  },
+  created () {
+    // 下拉框map
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_JOB_STATUS)
+    this.sbStatusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
+    this.standardLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_LEVEL)
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.modalTitle = '详情'
+      this.model = record
+      this.data = record.inDetailList
+      console.log(this.data)
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+    },
+    handleView (record) {
+      fetchCheckJob({ id: record.id }).then(res => {
+        const modal = this.$refs.detailModal
+        modal.base(res.data)
+      })
+    }
+  }
+}
+</script>

src/views/dashboard/modules/DetailOutStoreReport.vue

@@ -0,0 +1,169 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="1200"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <title-divider title="明细列表" width="90px"></title-divider>
+    <a-table
+      bordered
+      :data-source="data"
+      :columns="columns"
+      :scroll="{x: 1000, y: BaseTool.Constant.scrollY}"
+      tableLayout="auto"
+      rowKey="id"
+    >
+      <span slot="action" slot-scope="record">
+        <template>
+          <a @click="handleView(record)">查看</a>
+        </template>
+      </span>
+      <span slot="status" slot-scope="text">
+        <badge
+          :text="BaseTool.Object.getField(statusMap,text)"
+          :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]" />
+      </span>
+    </a-table>
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
+    </template>
+    <detail :check-type="2" ref="detailModal"/>
+  </a-modal>
+</template>
+
+<script>
+import DetailList from '@/components/tools/DetailList'
+import Detail from '@/views/check/checkjob/modules/Detail'
+import { fetchCheckJob } from '@/api/check/checkjob'
+
+const DetailListItem = DetailList.Item
+
+export default {
+  name: 'DetailRepairReport',
+  components: {
+    DetailList,
+    DetailListItem,
+    Detail
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      mdl: {},
+      modalTitle: null,
+      visible: false,
+      // 下拉框map
+      typeMap: {},
+      statusMap: {},
+      model: {},
+      // 查询参数
+      queryParam: {
+        filter: this.filter,
+        searchType: this.searchType
+      },
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          checked: true,
+          width: '70px',
+          customRender: (text, record, index) => {
+            return `${index + 1}`
+          }
+        },
+        {
+          title: '出库单号',
+          dataIndex: 'outNo',
+          checked: true,
+          width: '150px'
+        },
+        {
+          title: '备件规格',
+          dataIndex: 'ggxh',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '原厂编号',
+          dataIndex: 'initNo',
+          checked: true,
+          width: '150px'
+        },
+        {
+          title: '备件名称',
+          dataIndex: 'spareId',
+          width: '100px',
+          checked: true,
+          customRender: (text, record, index) => {
+            return record.spareName
+          }
+        },
+        {
+          title: '出库数量',
+          dataIndex: 'num',
+          checked: true,
+          width: '200px'
+        },
+        {
+          title: '出库单价',
+          dataIndex: 'price',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '出库总价',
+          dataIndex: 'totalPrice',
+          checked: true,
+          width: '150px',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Amount.formatter(text)
+          }
+        },
+        {
+          title: '出库日期',
+          dataIndex: 'createdTime',
+          checked: true,
+          width: '200px'
+        }
+      ],
+      // 下拉框map
+      levelMap: {},
+      standardLevelMap: {},
+      sbStatusMap: {},
+      periodTypeMap: {},
+      data: []
+    }
+  },
+  created () {
+    // 下拉框map
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_JOB_STATUS)
+    this.sbStatusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
+    this.standardLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_LEVEL)
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      this.modalTitle = '详情'
+      this.model = record
+      this.data = record.outDetailList
+    },
+    handleCancel () {
+      this.visible = false
+      this.confirmLoading = false
+    },
+    handleView (record) {
+      fetchCheckJob({ id: record.id }).then(res => {
+        const modal = this.$refs.detailModal
+        modal.base(res.data)
+      })
+    }
+  }
+}
+</script>

src/views/dashboard/modules/PrintInStoreInAndOutReport.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="print-content" v-show="visible">
+    <a-row :gutter="48" slot="extra">
+      <a-col :md="48" :sm="48">
+        <span class="table-page-search-submitButtons" style="float: right">
+          <a-button type="primary" v-print="'#print-container2'" :disabled="disabled">打印</a-button>
+          <a-button style="margin-left: 8px" @click="handleCancel()">返回列表</a-button>
+        </span>
+      </a-col>
+    </a-row>
+    <div class="container" id="print-container2">
+      <div class="text-center" style="position:relative;font-size:20px;font-weight:bold">
+        乾元坤和<br/> 出库入库数据月统计报表
+      </div>
+      <div>
+        <div class="col-md-4 text-center" style="padding: 0">统计周期: {{ record.startMonth }} 至 {{ record.endMonth }}</div>
+      </div>
+      <table class="gridtable list">
+        <tbody>
+          <tr>
+            <td class="text-center">月份</td>
+            <td class="text-center">入库数量</td>
+            <td class="text-center">入库金额</td>
+            <td class="text-center">出库数量</td>
+            <td class="text-center">出库金额</td>
+          </tr>
+          <tr :key="index" v-for="(item,index) in items">
+            <td class="text-center">{{ item.month}}</td>
+            <td class="text-center">{{ item.inStoreNum }}</td>
+            <td class="text-center">{{ item.inStorePrice }}</td>
+            <td class="text-center">{{ item.outStoreNum }}</td>
+            <td class="text-center">{{ item.outStorePrice }}</td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="row">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate } from '@/utils/util'
+
+export default {
+  name: 'PrintCheckJobReport',
+  components: { },
+  data () {
+    return {
+      visible: false,
+      disabled: true,
+      record: {},
+      count: 0,
+      items: [],
+      user: this.$store.getters.userInfo
+      // 下拉框map
+    }
+  },
+  props: {},
+  created () {
+    // 下拉框map
+  },
+  computed: {
+  },
+  methods: {
+    base (record) {
+      this.disabled = true
+      this.visible = true
+      this.record = record
+      this.items = record.data
+      console.log(this.items)
+      this.disabled = false
+    },
+    formatDateEn (value) {
+      return formatDate(new Date(value), 'yyyy-MM-dd')
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.$emit('ok', values)
+    }
+  }
+}
+</script>
+<style media=print>
+/* 应用这个样式的在打印时隐藏 */
+.noPrint {
+  display: none;
+}
+
+/* 应用这个样式的，从那个标签结束开始另算一页，之后在遇到再起一页，以此类推 */
+.page {
+  page-break-after: always;
+}
+</style>
+<style>
+.print-content{
+  width: 1123px;
+  background-color: #fff;
+}
+
+#print-container2 * {
+  font-family: SimHei !important;
+  color: #333447;
+  line-height: 1.5;
+}
+
+.container {
+  width: 95%;
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+  position: relative;
+  min-height: 1px;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+table.gridtable {
+  width: 100%;
+  font-family: verdana, arial, sans-serif;
+  font-size: 11px;
+  color: #333333;
+  border-width: 1px;
+  border-color: #666666;
+  border-collapse: collapse;
+}
+
+table.gridtable th {
+  border-width: 1px;
+  padding: 8px;
+  border-style: solid;
+  border-color: #666666;
+  background-color: #dedede;
+}
+
+table.gridtable td {
+  border-width: 1px;
+  padding: 8px;
+  border-style: solid;
+  border-color: #666666;
+  background-color: #ffffff;
+}
+
+table.content td {
+  height: 95px;
+}
+
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+.container:before,
+.container:after,
+.row:before, .row:after {
+  display: table;
+  content: " ";
+}
+
+.container:after, .row:after {
+  clear: both;
+}
+
+.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+  float: left;
+}
+
+.col-md-12 {
+  width: 100%;
+}
+
+.col-md-11 {
+  width: 91.66666667%;
+}
+
+.col-md-10 {
+  width: 83.33333333%;
+}
+
+.col-md-9 {
+  width: 75%;
+}
+
+.col-md-8 {
+  width: 66.66666667%;
+}
+
+.col-md-7 {
+  width: 58.33333333%;
+}
+
+.col-md-6 {
+  width: 50%;
+}
+
+.col-md-5 {
+  width: 41.66666667%;
+}
+
+.col-md-4 {
+  width: 33.33333333%;
+}
+
+.col-md-3 {
+  width: 25%;
+}
+
+.col-md-2 {
+  width: 16.66666667%;
+}
+
+.col-md-1 {
+  width: 8.33333333%;
+}
+</style>

src/views/download/DownloadModal.vue

@@ -6,7 +6,7 @@
     :confirmLoading="confirmLoading"
     @cancel="handleCancel"
   >
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button type="primary" icon="download" @click="downloadAll()">下载全部</a-button>
     </div>
     <a-table :columns="columns" :dataSource="data">

src/views/fill/execute/FillExecute.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('fill-executes-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('fill-executes-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('fill-executes-del')">

src/views/fill/execute/modules/FillExecuteSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/fill/gather-info/FillGatherInfo.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('fill-gather-infos-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('fill-gather-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('fill-gather-infos-del')">

src/views/fill/gather-info/modules/FillGatherInfoSelectModal.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('fill-gathers-edit')" type="primary" icon="plus" @click="addFillInfos">新增</a-button>
       </div>
 

src/views/fill/gather/FillGather.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('fill-gathers-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('fill-gathers-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('fill-gathers-del')">

src/views/fill/gather/modules/FillGatherSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/fill/info/FillInfo.vue

@@ -74,7 +74,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('fill-infos-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('fill-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('fill-infos-del')">

src/views/fill/info/modules/FillInfoSelectModal.vue

@@ -82,7 +82,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/fill/project-quantity/FillProjectQuantity.vue

@@ -45,7 +45,7 @@
           </a-form>
         </div>
 
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
           <a-button v-if="$auth('fill-project-quantities-add')" type="primary" icon="plus" @click="$refs.baseModal.base({}, {parentItem: selectedItem})">新增</a-button>
           <a-button style="margin-left: 8px" v-if="$auth('fill-project-quantities-export')" type="primary" icon="download" @click="doExport">导出</a-button>
           <a-button style="margin-left: 8px" type="primary" icon="download" @click="doImport">导入</a-button>

src/views/fill/project-quantity/modules/FillProjectQuantitySelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/firm/producer/FirmProducer.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('firm-producers-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('firm-producers-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('firm-producers-del')">

src/views/firm/producer/modules/FirmProducerSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/firm/supplier/FirmSupplier.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('firm-suppliers-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('firm-suppliers-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('firm-suppliers-del')">

src/views/firm/supplier/modules/FirmSupplierSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/operate/article/Article.vue

@@ -31,7 +31,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('operate-articles-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('operate-articles-del')">
         <a-menu slot="overlay">

src/views/part/info/PartInfo.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('part-infos-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('part-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('part-infos-del')">

src/views/part/info/modules/PartInfoList.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('sb-part-infos-add')" type="primary" icon="plus" @click="$refs.baseModal.base(dataParam,1)">新增</a-button>
         <a-button style="margin-left:8px;" type="primary" @click="handleSbSelect">
           <a-icon type="plus"/>

src/views/part/info/modules/PartInfoSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/part/info/modules/PartInfoTable.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="[1,2].includes(type) && $auth('part-infos-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="[1,2].includes(type) && $auth('part-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && [1,2].includes(type) && $auth('part-infos-del')">

src/views/part/type/PartType.vue

@@ -32,7 +32,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('part-types-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('part-types-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('part-types-del')">

src/views/purchase/purchase-apply/PurchaseApply.vue

@@ -19,7 +19,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-applies-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-applies-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-applies-del')">

src/views/purchase/purchase-apply/PurchaseApplyOrder.vue

@@ -44,7 +44,7 @@
       <!--        </a-form>-->
       <!--      </div>-->
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-orders-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-orders-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-orders-del')">

src/views/purchase/purchase-apply/PurchaseApplyOrderList.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-order-lists-add') && chooseFlag" type="primary" icon="plus" @click="handleAdd">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-order-lists-del')">

src/views/purchase/purchase-apply/list-modules/PurchaseApplyListSelectModal.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-apply/modules/PurchaseApplySelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-apply/order-modules/PurchaseOrderSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-contract-list/PurchaseContractList.vue

@@ -18,7 +18,7 @@
             </a-form>
         </div>
 
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
             <a-button v-if="$auth('purchase-purchase-contract-lists-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-contract-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-contract-lists-del')">

src/views/purchase/purchase-contract-list/modules/PurchaseContractListSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-contract-main-list/PurchaseContractMainList.vue

@@ -18,7 +18,7 @@
             </a-form>
         </div>
 
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
             <a-button v-if="$auth('purchase-purchase-contract-main-lists-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-contract-main-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-contract-main-lists-del')">

src/views/purchase/purchase-contract-main-list/modules/PurchaseContractMainListSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-contract/PurchaseContractList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" v-if="visible">
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-contract-lists-add') && !sbFlag" type="primary" icon="plus" @click="handleAdd">新增</a-button>
       <a-button v-if="$auth('purchase-purchase-contract-lists-add') && sbFlag" type="primary" icon="upload" @click="doImport">导入</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-contract-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>

src/views/purchase/purchase-contract/PurchaseContractMainList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" >
     <div v-if="visible">
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-contract-main-lists-add')" type="primary" icon="plus" @click="handleAdd">填写明细</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-contract-main-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-contract-main-lists-del')">

src/views/purchase/purchase-contract/list-modules/PurchaseOrderListSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-contract/main-list-modules/PurchaseContractMainListSelectModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-contract/modules/PurchaseContractSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-demand-plan-list-add/PurchaseDemandPlanListAdd.vue

@@ -18,7 +18,7 @@
             </a-form>
         </div>
 
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
             <a-button v-if="$auth('purchase-purchase-demand-plan-list_adds-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-demand-plan-list_adds-export')" type="primary" icon="download" @click="doExport">导出</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-demand-plan-list_adds-del')">

src/views/purchase/purchase-demand-plan-list-add/modules/PurchaseDemandPlanListAddSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-demand-plan/PurchaseDemandPlan.vue

@@ -28,7 +28,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-demand-plans-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-demand-plans-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-demand-plans-del')">

src/views/purchase/purchase-demand-plan/PurchaseDemandPlanAdd.vue

@@ -20,7 +20,7 @@
         <detail-list-item term="数量">{{ BaseTool.Amount.formatter(model.quantity) }}</detail-list-item>
       </detail-list>
       <title-divider title="增补记录" width="90px"></title-divider>
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
       </div>
 

src/views/purchase/purchase-demand-plan/PurchaseDemandPlanList.vue

@@ -18,7 +18,7 @@
     <!--      </a-form>-->
     <!--    </div>-->
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <!--      <a-button v-if="$auth('purchase-purchase-demand-plan-lists-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>-->
       <a-button style="margin-left: 8px" v-if="!viewFlag && $auth('purchase-purchase-demand-plans-edit')" type="primary" icon="upload" @click="doImport">导入明细</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-demand-plan-lists-export')" type="primary" icon="download" @click="doExport">导出明细</a-button>

src/views/purchase/purchase-demand-plan/PurchaseDemandPlanListForQuantity.vue

@@ -26,7 +26,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-demand-plan-lists-add')" type="primary" icon="plus" @click="updateList">列表保存</a-button>
     </div>
 

src/views/purchase/purchase-demand-plan/list-modules/PurchaseDemandPlanListSelectModal.vue

@@ -41,7 +41,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-demand-plan/modules/PurchaseDemandPlanSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-dispatch-container-list/PurchaseDispatchContainerList.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-dispatch-container-lists-add')" type="primary" icon="plus" @click="handleChoose">选择</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-container-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-dispatch-container-lists-del')">

src/views/purchase/purchase-dispatch-container-list/PurchaseDispatchContainerListPage.vue

@@ -18,7 +18,7 @@
 <!--      </a-form>-->
 <!--    </div>-->
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-container-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
     </div>
 

src/views/purchase/purchase-dispatch-container-list/modules/PurchaseDispatchContainerListSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-dispatch-container/modules/PurchaseDispatchContainerSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-dispatch-fee/PurchaseDispatchFee.vue

@@ -19,7 +19,7 @@
       <!--      </a-form>-->
       <!--    </div>-->
 
-      <!--    <div class="table-operator">-->
+      <!--    <div class="table-operator" style="margin-bottom: 8px;">-->
       <!--      <a-button v-if="$auth('purchase-purchase-dispatch-fees-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>-->
       <!--      <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-fees-export')" type="primary" icon="download" @click="doExport">导出</a-button>-->
       <!--      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-dispatch-fees-del')">-->

src/views/purchase/purchase-dispatch-fee/modules/PurchaseDispatchFeeSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-dispatch-order-list/PurchaseDispatchOrderList.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-dispatch-order-lists-add')" type="primary" icon="plus" @click="handleChoose">选择</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-dispatch-order-lists-del')">

src/views/purchase/purchase-dispatch-order-list/PurchaseDispatchOrderListForAdd.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-dispatch-order-lists-add')" type="primary" icon="plus" @click="handleAdd">从库添加</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-add')" type="primary" icon="plus" @click="updateNewest">列表保存</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>

src/views/purchase/purchase-dispatch-order-list/PurchaseDispatchOrderListForChoose.vue

@@ -18,7 +18,7 @@
       </a-form>
     </div>
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-dispatch-order-lists-add')" type="primary" icon="plus" @click="handleChoose">选择</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-add')" type="primary" icon="plus" @click="updateNewest">列表保存</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>

src/views/purchase/purchase-dispatch-order-list/PurchaseDispatchOrderListForView.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" v-if="visible">
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-button v-if="$auth('purchase-purchase-dispatch-order-lists-add')" type="primary" icon="plus" @click="handleChoose">选择</a-button>
 <!--      <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>-->
     </div>

src/views/purchase/purchase-dispatch-order-list/PurchaseDispatchOrderListPage.vue

@@ -18,7 +18,7 @@
     <!--      </a-form>-->
     <!--    </div>-->
 
-    <div class="table-operator">
+    <div class="table-operator" style="margin-bottom: 8px;">
       <!--      <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-import')" type="primary" icon="upload" @click="doImport">导入</a-button>-->
       <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
     </div>

src/views/purchase/purchase-dispatch-order-list/modules/PurchaseDispatchOrderListSelectModal.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-dispatch-order-list/modules/PurchaseOrderListSelectModal.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-dispatch-order/PurchaseDispatchOrderPage.vue

@@ -19,7 +19,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-orders-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <!--        <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-orders-export')" type="primary" icon="download" @click="doExport">导出</a-button>-->
       </div>

src/views/purchase/purchase-dispatch-order/PurchaseDispatchOrder_bak.vue

@@ -36,7 +36,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-dispatch-orders-add') && !endFlag " type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-orders-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-dispatch-orders-del')">

src/views/purchase/purchase-dispatch-order/PurchaseOrderDispatchOrder.vue

@@ -19,7 +19,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-dispatch-orders-add') && !endFlag " type="primary" icon="plus" @click="handleAdd">新增关联采购单发运明细</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-dispatch-orders-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-dispatch-orders-del')">

src/views/purchase/purchase-dispatch-order/modules/PurchaseDispatchOrderSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-list/PurchaseList.vue

@@ -18,7 +18,7 @@
             </a-form>
         </div>
 
-        <div class="table-operator">
+        <div class="table-operator" style="margin-bottom: 8px;">
             <a-button v-if="$auth('purchase-purchase-lists-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-lists-del')">

src/views/purchase/purchase-list/modules/PurchaseListSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table

src/views/purchase/purchase-order/PurchaseOrder.vue

@@ -19,7 +19,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <!--      <a-button v-if="$auth('purchase-purchase-orders-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>-->
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-orders-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-orders-del')">

src/views/purchase/purchase-order/PurchaseOrderList.vue

@@ -19,7 +19,7 @@
       <!--        </a-form>-->
       <!--      </div>-->
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-order-lists-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-order-lists-export') && !viewFlag && user.userId === order.purchaserId" type="primary" icon="upload" @click="handleImport">导入</a-button>
       </div>

src/views/purchase/purchase-order/modules/PurchaseOrderSelectModal.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-order/modules/PurchaseOrderSelectModalForPay.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-payment-order/modules/PurchasePaymentSelectOrderModal.vue

@@ -26,7 +26,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
       </div>
 
       <s-table

src/views/purchase/purchase-payment/PurchasePayment.vue

@@ -37,7 +37,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-payments-add') && user.userId === record.purchaserId" type="primary" icon="plus" @click="$refs.baseModal.base(null, record)">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-payments-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-payments-del') && user.userId === record.purchaserId">

src/views/purchase/purchase-payment/PurchasePaymentPage.vue

@@ -20,7 +20,7 @@
         </a-form>
       </div>
 
-      <div class="table-operator">
+      <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-payments-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
         <!--        <a-button style="margin-left: 8px" v-if="$auth('purchase-purchase-payments-export')" type="primary" icon="download" @click="doExport">导出</a-button>-->
       </div>

src/views/purchase/purchase-payment/modules/PurchasePaymentSelectModal.vue

@@ -26,7 +26,7 @@
                 </a-form>
             </div>
 
-            <div class="table-operator">
+            <div class="table-operator" style="margin-bottom: 8px;">
             </div>
 
             <s-table