Browse Source

库存盘点改报表查询

shenji 2 years ago
parent
commit
ce99938499
1 changed files with 20 additions and 53 deletions
  1. 20 53
      src/views/oa/InventoryRecordsList.vue

+ 20 - 53
src/views/oa/InventoryRecordsList.vue

@@ -5,33 +5,30 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="资产类别">
+              <j-dict-select-tag placeholder="请选择资产类别" v-model="queryParam.assetsCategory" dictCode="assets_category"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="资产状态">
+              <j-dict-select-tag placeholder="请选择资产状态" v-model="queryParam.assetState" dictCode="assets_status"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" icon="download" @click="handleExportXls('盘点表')" style="margin-left: 8px">导出</a-button>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 查询区域-END -->
-    
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('盘点表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -41,7 +38,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{fixed:true,selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         
         @change="handleTableChange">
 
@@ -65,22 +61,6 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
       </a-table>
     </div>
 
@@ -92,11 +72,14 @@
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import InventoryRecordsModal from './modules/InventoryRecordsModal'
+  import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: "InventoryRecordsList",
     mixins:[JeecgListMixin],
     components: {
+      JDictSelectTag,
       InventoryRecordsModal
     },
     data () {
@@ -114,11 +97,6 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'盘点日期',
-            align:"center",
-            dataIndex: 'checkDate'
-          },
           {
             title:'资产编码',
             align:"center",
@@ -154,11 +132,6 @@
             align:"center",
             dataIndex: 'durableYears'
           },
-          {
-            title:'存放地点',
-            align:"center",
-            dataIndex: 'storageLocation'
-          },
           {
             title:'使用人',
             align:"center",
@@ -173,12 +146,6 @@
             title:'资产状态',
             align:"center",
             dataIndex: 'assetState'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' }
           }
         ],
         url: {