wans

src/views/store/instoreform/InStoreForm.vue

@@ -51,6 +51,7 @@
         size="default"
         rowKey="id"
         :columns="columns"
+        :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
         :data="loadData"
         :alert="options.alert"
         :rowSelection="options.rowSelection"
@@ -125,37 +126,51 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
+          checked: true,
+          width: 70,
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
         {
           title: '入库单号',
+          checked: true,
+          width: 140,
           dataIndex: 'inNo'
         },
         {
           title: '入库类型',
           dataIndex: 'type',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.typeMap, text)
           }
         },
         {
           title: '总价',
+          checked: true,
+          width: 140,
           dataIndex: 'totalPrice'
         },
         {
           title: '状态',
+          checked: true,
+          width: 140,
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '创建日期',
+          checked: true,
+          width: 140,
           dataIndex: 'createdTime'
         },
         {
           title: '仓库',
           dataIndex: 'storeId',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return record.storeName
           }
@@ -163,7 +178,9 @@ export default {
         {
           title: '操作',
           key: 'action',
+          checked: true,
           width: '200px',
+          fixed: 'right',
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -1,75 +1,101 @@
 <template>
   <a-card :bordered="false">
     <div v-show="visible">
-      <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
+      <a-drawer
+        title="筛选"
+        placement="top"
+        :closable="false"
+        :visible="showFilter"
+        :height="330"
+        @close="showFilter=false"
+      >
+        <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
+          <a-form layout="inline">
+            <a-row :gutter="48">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关键字">
+                  <a-input v-model.trim="queryParam.keyword" placeholder="请输入单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="用友单号">
+                  <a-input v-model.trim="queryParam.yyId" placeholder="请输入用友单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库类型">
+                  <a-select v-model="queryParam.type" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in typeMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="申请部门">
+                  <a-select v-model="queryParam.applyDept" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in deptYYMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库状态">
+                  <a-select v-model="queryParam.status" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in statusMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="开始时间">
+                  <a-date-picker style="width:100%" v-model.trim="queryParam.searchStartTime" placeholder="请选择开始时间"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="结束时间">
+                  <a-date-picker style="width:100%" v-model.trim="queryParam.searchEndTime" placeholder="请选择结束时间"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6 || 24" :sm="24">
+                <span class="table-page-search-submitButtons">
+                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                </span>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+      </a-drawer>
+      <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="6" :sm="24">
+            <a-col :md="8" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model.trim="queryParam.keyword" placeholder="请输入单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="用友单号">
-                <a-input v-model.trim="queryParam.yyId" placeholder="请输入用友单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="出库类型">
-                <a-select v-model="queryParam.type" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in typeMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="申请部门">
-                <a-select v-model="queryParam.applyDept" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in deptYYMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="出库状态">
-                <a-select v-model="queryParam.status" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in statusMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="开始时间">
-                <a-date-picker style="width:100%" v-model.trim="queryParam.searchStartTime" placeholder="请选择开始时间"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="结束时间">
-                <a-date-picker style="width:100%" v-model.trim="queryParam.searchEndTime" placeholder="请选择结束时间"/>
-              </a-form-item>
-            </a-col>
             <a-col :md="6 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
+              <a-space>
+                <a-button type="primary" @click="handleOk">查询</a-button>
+                <a-button type="primary" @click="showFilter=true">筛选</a-button>
+                <a-button @click="resetSearchForm">重置</a-button>
+              </a-space>
             </a-col>
           </a-row>
         </a-form>
       </div>
-
       <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('store-out-store-forms-add')" type="primary" icon="plus" @click="handleAdd()">{{ outFlag?'新增':'退库申请' }}</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('store-out-store-forms-export')" type="primary" icon="download" @click="doExport">导出</a-button>
@@ -90,6 +116,7 @@
         rowKey="id"
         :columns="columns"
         :data="loadData"
+        :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
         :alert="options.alert"
         :rowSelection="options.rowSelection"
         showPagination="auto"
@@ -99,7 +126,7 @@
             <a @click="handleView(record)">查看</a>
             <a-divider v-if="(record.status==0 || record.status == 3)&&outFlag" type="vertical" />
             <a v-if="$auth('store-out-store-forms-edit')&&(record.status==0 || record.status == 3)&&outFlag" @click="handleEdit(record)">修改</a>
-            <a-divider v-if="record.status == 0 || record.status == 5 || record.status == 4" type="vertical" />
+            <a-divider v-if="record.status == 4 || record.status == 5 || record.status == 4" type="vertical" />
             <a v-if="record.status == 4 || record.status == 5" @click="handleViewTicket(record)">打印</a>
             <a-divider v-if="record.status==0" type="vertical" />
             <a-popconfirm v-if="record.status==0" title="是否提交审核？" @confirm="updateStore(record.id)">
@@ -169,30 +196,37 @@ export default {
     return {
       // 查询参数
       queryParam: {
-        filter: this.filter,
-        outFlag: this.outFlag,
         ...this.$route.query
       },
+      showFilter: false,
       // 表头
       columns: [
         {
           title: '序号',
           dataIndex: 'index',
+          checked: true,
+          width: 70,
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
         {
           title: '出库单号',
+          checked: true,
+          width: 140,
           dataIndex: 'outNo'
         },
         {
           title: '用友单号',
+          checked: true,
+          width: 140,
           dataIndex: 'yyId'
         },
         {
           title: '出库类型',
           dataIndex: 'type',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.typeMap, text)
           }
@@ -200,6 +234,8 @@ export default {
         {
           title: '申请部门',
           dataIndex: 'applyDept',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.deptYYMap, text)
           }
@@ -207,24 +243,34 @@ export default {
         {
           title: '状态',
           dataIndex: 'status',
+          checked: true,
+          width: 140,
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '领用日期',
+          checked: true,
+          width: 140,
           dataIndex: 'userTime'
         },
         {
           title: '仓库',
+          checked: true,
+          width: 140,
           dataIndex: 'storeName'
         },
         {
           title: '维修工单',
+          checked: true,
+          width: 140,
           dataIndex: 'repairNo'
         },
         {
           title: '操作',
           key: 'action',
           width: '200px',
+          checked: true,
+          fixed: 'right',
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }
@@ -243,6 +289,8 @@ export default {
         parameter = {
           ...parameter,
           ...this.queryParam,
+          filter: this.filter,
+          outFlag: this.outFlag,
           dataScope: {
             sortBy: 'desc',
             sortName: 'update_time'
@@ -381,7 +429,6 @@ export default {
     },
     resetSearchForm () {
       this.queryParam = {
-        filter: this.filter
       }
       this.$refs.table.refresh(true)
     },

src/views/store/transferstoreform/TransferStoreForm.vue

@@ -52,6 +52,8 @@
       :columns="columns"
       :data="loadData"
       :alert="options.alert"
+      :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+
       :rowSelection="options.rowSelection"
       showPagination="auto"
     >
@@ -114,17 +116,23 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
+          checked: true,
+          width: 70,
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
         {
           title: '单号',
+          checked: true,
+          width: 140,
           dataIndex: 'no'
         },
         {
           title: '出库仓库',
           dataIndex: 'storeId',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return record.storeName
           }
@@ -132,6 +140,8 @@ export default {
         {
           title: '入库仓库',
           dataIndex: 'inStoreId',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return record.inStoreName
           }
@@ -139,6 +149,8 @@ export default {
         {
           title: '总价',
           dataIndex: 'totalPrice',
+          checked: true,
+          width: 140,
           customRender: (text, record, index) => {
             return this.BaseTool.Amount.formatter(text)
           }
@@ -146,16 +158,23 @@ export default {
         {
           title: '状态',
           dataIndex: 'status',
+          checked: true,
+          width: 140,
           scopedSlots: { customRender: 'status' }
         },
         {
           title: '创建日期',
+          checked: true,
+          width: 140,
           dataIndex: 'createdTime'
         },
         {
           title: '操作',
           key: 'action',
           width: '200px',
+          checked: true,
+          fixed: 'right',
+
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }
@@ -268,6 +287,7 @@ export default {
     },
     resetSearchForm () {
       this.queryParam = {
+        filter: this.filter
       }
       this.$refs.table.refresh(true)
     },