lilei 1 år sedan
förälder
incheckning
cee25b437a

+ 1 - 0
src/config/router.config.js

@@ -1356,6 +1356,7 @@ export const asyncRouterMap = [
                 meta: {
                   title: '库存预警列表',
                   icon: 'alert',
+                  hidden: true,
                   permission: 'M_inventoryWarningList'
                 }
               }

+ 36 - 26
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -5,36 +5,42 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack(0)"><a-icon type="left" /> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.expenseAccountNo }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName || '--' }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
-      <a-collapse :activeKey="['1']" class="expenseReimbursementAddcont" v-if="detailData">
-        <a-collapse-panel key="1" header="基础信息">
-          <div slot="extra" style="padding: 0 20px; color: #00aaff;" @click.stop="handleEditBase" >
+      <a-card :bordered="false" size="small" class="expenseReimbursementAddcont" v-show="showDetail">
+        <div slot="title">
+          <span>基础信息</span>
+          <div style="cursor:pointer;color: #00aaff;float:right;" @click.stop="handleEditBase" >
             <a-icon type="edit" /> 编辑基础信息
           </div>
-          <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
-            <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
-            <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="详细说明" :span="3">{{ detailData&&detailData.content.join(',')||'' }}</a-descriptions-item>
-            <a-descriptions-item label="附件" :span="3">
-              <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
-                {{ item.fileName }}
-              </a>
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
+        </div>
+        <a-descriptions :column="{ xs: 2, sm: 3, md: 3}" v-if="detailData">
+          <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
+          <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="详细说明" :span="3">{{ detailData&&detailData.content.join(',')||'' }}</a-descriptions-item>
+          <a-descriptions-item label="附件" :span="3">
+            <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
+              {{ item.fileName }}
+            </a>
+          </a-descriptions-item>
+        </a-descriptions>
+      </a-card>
       <!-- 费用明细 -->
-      <a-card :bordered="false" size="small" class="expenseReimbursementAddcont">
+      <a-card :bordered="false" size="small" class="expenseContent">
         <div slot="title">
           <div style="display: flex;justify-content: space-between;align-items: center;">
             <div>费用明细</div>
@@ -170,6 +176,7 @@ export default {
       openEpenseDetailModal: false, // 费用明细弹框
       expenseAccountDetailSn: '',
       openProductInfoModal: false, // 产品信息弹框
+      showDetail: false,
       total: 0,
       loadData: parameter => {
         const params = Object.assign(parameter, { expenseAccountSn: this.$route.params.sn })
@@ -357,7 +364,10 @@ export default {
       height: 100%;
     }
     .expenseReimbursementAddcont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
+    }
+    .expenseContent{
+      min-height: calc(100vh - 190px);
     }
     .upload{
       width: 100%!important;

+ 33 - 29
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -7,6 +7,11 @@
             <a-icon type="left"></a-icon>
             返回列表
           </a>
+          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.expenseAccountNo || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">申请人:{{ detailData&&detailData.applyPersonName }}</span>
+          <a-button type="link" size="small" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -28,34 +33,29 @@
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="expenseManagementDetail-cont" v-if="detailData">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="{ xs: 2, sm: 3, md: 4}">
-              <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
-              <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="打印状态">{{ detailData&&detailData.printStatusDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
-              
-              <a-descriptions-item label="详细说明" :span="4">
-                {{ detailData.content.join(',')||'' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="附件" :span="4">
-                <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
-                  {{ item.fileName }}
-                </a>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="expenseManagementDetail-cont" v-show="showDetail">
+         <a-descriptions size="small" :column="{ xs: 2, sm: 3, md: 4}" v-if="detailData">
+           <a-descriptions-item label="费用单号">{{ detailData&&detailData.expenseAccountNo || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="申请人">{{ detailData&&detailData.applyPersonName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="申请部门">{{ detailData&&detailData.applyDepartmentName || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="费用类型">{{ detailData&&detailData.expenseTypeName || '--' }}<span v-if="detailData&&detailData.expenseType2">/{{ detailData&&detailData.expenseTypeName2 || '--' }}</span></a-descriptions-item>
+           <a-descriptions-item label="费用发生月份">{{ detailData&&detailData.expenseDate?detailData.expenseDate.substring(0, 7) : '--' }}</a-descriptions-item>
+           <a-descriptions-item label="合计金额">{{ (detailData.applyExpenseTotal || detailData.applyExpenseTotal == 0) ? toThousands(detailData.applyExpenseTotal)+' 元' : '--' }}</a-descriptions-item>
+           <a-descriptions-item label="状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="打印状态">{{ detailData&&detailData.printStatusDictValue || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="审核时间">{{ detailData&&detailData.finishDate || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="关联单号" v-if="detailData&&detailData.bizNo">{{ detailData&&detailData.bizNo || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="主题" :span="3">{{ detailData&&detailData.title || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="详细说明" :span="4">
+             {{ detailData.content.join(',')||'' }}
+           </a-descriptions-item>
+           <a-descriptions-item label="附件" :span="4">
+             <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailData.expenseAccountFilesList" :key="item.id">
+               {{ item.fileName }}
+             </a>
+           </a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <a-alert type="info" style="margin-bottom:10px">
@@ -129,6 +129,7 @@ export default {
       disabled: false,
       baseData: null,
       showTipModal: false,
+      showDetail: false,
       printType:'',
       count: 0,
       // 加载数据方法 必须为 Promise 对象
@@ -251,7 +252,10 @@ export default {
 <style lang="less">
 .expenseManagementDetail-wrap {
   .expenseManagementDetail-cont {
-    margin-bottom: 10px;
+    margin-bottom: 6px;
+  }
+  .pages-wrap{
+    min-height: calc(100vh - 140px);
   }
   .footer-cont{
     margin-top: 5px;

+ 78 - 73
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -1,84 +1,87 @@
 <template>
-  <a-card size="small" :bordered="false" class="salesManagementList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="费用类型">
+              <expenseType
+                id="salesManagementList-expenseType"
+                :changeOnSelect="true"
+                v-model="expenseTypes"
+                @change="expenseChange"
+                placeholder="请选择费用类型"
+              ></expenseType>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+              <a-form-item label="费用发生月份">
+                <a-month-picker
+                  placeholder="请选择月份"
+                  locale="zh-cn"
+                  v-model="queryParam.expenseDate"
+                  @change="onChange"
+                  :disabled-date="disabledDate"
+                  style="width: 100%;"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <employee style="width: 100%;" id="salesManagementList-Employee" v-model="queryParam.applyPersonSn"></employee>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="主题">
+                <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-              <a-form-item label="费用类型">
-                <expenseType
-                  id="salesManagementList-expenseType"
-                  :changeOnSelect="true"
-                  v-model="expenseTypes"
-                  @change="expenseChange"
-                  placeholder="请选择费用类型"
-                ></expenseType>
+              <a-form-item label="打印状态">
+                <v-select
+                  v-model="queryParam.printStatus"
+                  ref="printStatus"
+                  id="pushOrder-printStatus"
+                  code="EXPENSE_ACCOUNT_PRINT_STATUS"
+                  placeholder="请选择打印状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-                <a-form-item label="费用发生月份">
-                  <a-month-picker
-                    placeholder="请选择月份"
-                    locale="zh-cn"
-                    v-model="queryParam.expenseDate"
-                    @change="onChange"
-                    :disabled-date="disabledDate"
-                    style="width: 100%;"/>
-                </a-form-item>
-              </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="主题">
-                  <a-input id="salesManagementList-title" v-model.trim="queryParam.title" allowClear placeholder="请输入主题"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="打印状态">
-                  <v-select
-                    v-model="queryParam.printStatus"
-                    ref="printStatus"
-                    id="pushOrder-printStatus"
-                    code="EXPENSE_ACCOUNT_PRINT_STATUS"
-                    placeholder="请选择打印状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="salesManagementList-state"
-                    code="EXPENSE_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-item label="状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="salesManagementList-state"
+                  code="EXPENSE_STATE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="salesManagementList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
         <a-button type="primary" class="button-error" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
@@ -93,10 +96,11 @@
         ref="table"
         :row-selection="$hasPermissions('B_eRPrint')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: false } })}:null"
         @rowSelection="rowSelectionFun"
-        :style="{ height: tableHeight+70.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -165,6 +169,7 @@
       <previewModal v-if="showTipModal" ref="printModal" @printOk="printOk"></previewModal>
     </commonModal>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -418,7 +423,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 228
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 156 - 155
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -1,185 +1,186 @@
 <template>
-  <a-card size="small" :bordered="false" class="expenseReimbursementDetailList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" ref="ruleForm">
-          <a-row :gutter="15">
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" ref="ruleForm">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="审核时间">
+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-input id="expenseReimbursementDetailList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <employee style="width: 100%;" id="expenseReimbursementDetailList-applyPersonSn" @change="employeeChange" v-model="queryParam.applyPersonSn"></employee>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              <a-form-item label="申请部门" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <department style="width: 100%;" id="expenseReimbursementDetailList-applyDepartmentSn" @change="applyDepartmentChange" v-model="queryParam.applyDepartmentSn"></department>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="expenseReimbursementDetailList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-item label="费用类型">
+                <expenseType
+                  id="expenseReimbursementDetailList-expenseType"
+                  v-model="expenseTypes"
+                  :changeOnSelect="true"
+                  @change="expenseChange"
+                  placeholder="请选择费用类型"
+                ></expenseType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="申请人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <employee style="width: 100%;" id="expenseReimbursementDetailList-applyPersonSn" @change="employeeChange" v-model="queryParam.applyPersonSn"></employee>
+              <a-form-item label="费用发生月份">
+                <a-month-picker
+                  placeholder="请选择月份"
+                  v-model="queryParam.expenseDate"
+                  @change="onChange"
+                  :disabled-date="disabledDate"
+                  style="width: 100%;"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="申请部门" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <department style="width: 100%;" id="expenseReimbursementDetailList-applyDepartmentSn" @change="applyDepartmentChange" v-model="queryParam.applyDepartmentSn"></department>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用类型">
-                  <expenseType
-                    id="expenseReimbursementDetailList-expenseType"
-                    v-model="expenseTypes"
-                    :changeOnSelect="true"
-                    @change="expenseChange"
-                    placeholder="请选择费用类型"
-                  ></expenseType>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用发生月份">
-                  <a-month-picker
-                    placeholder="请选择月份"
-                    v-model="queryParam.expenseDate"
-                    @change="onChange"
-                    :disabled-date="disabledDate"
-                    style="width: 100%;"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="记账类型">
-                  <v-select
-                    v-model="queryParam.accountType"
-                    ref="accountType"
-                    id="expenseReimbursementDetailList-accountType"
-                    code="EXPENSE_ACCOUNT_TYPE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="记账名称">
-                  <!-- 部门 -->
-                  <department v-show="queryParam.accountType=='INNER_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></department>
-                  <!-- 经销商 -->
-                  <custList v-show="queryParam.accountType=='CUSTOMER'" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
-                  <!-- 供应商 -->
-                  <supplier v-show="queryParam.accountType=='OUT_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
-                  <a-select style="width: 100%" v-if="!queryParam.accountType" placeholder="请选择">
-                    <a-select-option value="" :disabled="true">
-                      请先选择记账类型
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属区域">
-                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属分区">
-                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所属省份">
-                  <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属省份" v-model="queryParam.provinceSn"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所属城市">
-                  <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属城市" leve="city" :parentId="queryParam.provinceSn" v-model="queryParam.citySn"></Area>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用承担方类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <v-select
-                    code="EXPENSE_ACCOUNT_DETAIL_SPLIT_OBJ_TYPE"
-                    allowClear
-                    style="width: 100%;"
-                    v-model="queryParam.splitObjType"
-                    @change="splitObjTypeChange"
-                    placeholder="请选择承担方类型"
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用承担方" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <!-- 部门 -->
-                  <department v-show="queryParam.splitObjType=='DEPARTMENT'" style="width: 100%;" placeholder="请选择承担方" v-model="queryParam.splitObjSn"></department>
-                  <!-- 经销商 -->
-                  <custList v-show="queryParam.splitObjType=='CUSTOMER'" ref="custList" @change="custChange" placeholder="请选择(输入名称搜索)"></custList>
-                  <a-select style="width: 100%" v-if="!queryParam.splitObjType" placeholder="请选择">
-                    <a-select-option value="" :disabled="true">
-                      请先选择承担方类型
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24" v-show="queryParam.splitObjType=='DEPARTMENT'">
-                <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <employee style="width: 100%;" placeholder="请选择承担人员" v-model="queryParam.childSplitObjSn"></employee>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24" v-show="queryParam.splitObjType==undefined">
-                <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <a-select style="width: 100%" placeholder="请选择">
-                    <a-select-option value="" :disabled="true">
-                      请先选择承担方类型
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a-button
-                  style="margin-left: 10px"
-                  type="primary"
-                  class="button-warning"
-                  @click="handleExport"
-                  :disabled="disabled"
-                  :loading="exportLoading"
-                  v-if="$hasPermissions('B_expenseAcctDetailReport')"
-                  id="expenseAcctDetail-export">导出</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
-              </span>
+              <a-form-item label="记账类型">
+                <v-select
+                  v-model="queryParam.accountType"
+                  ref="accountType"
+                  id="expenseReimbursementDetailList-accountType"
+                  code="EXPENSE_ACCOUNT_TYPE"
+                  placeholder="请选择状态"
+                  allowClear></v-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="记账名称">
+                <!-- 部门 -->
+                <department v-show="queryParam.accountType=='INNER_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></department>
+                <!-- 经销商 -->
+                <custList v-show="queryParam.accountType=='CUSTOMER'" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
+                <!-- 供应商 -->
+                <supplier v-show="queryParam.accountType=='OUT_ACCOUNT'" @change="accountNameSnChange" v-model="queryParam.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
+                <a-select style="width: 100%" v-if="!queryParam.accountType" placeholder="请选择">
+                  <a-select-option value="" :disabled="true">
+                    请先选择记账类型
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所属区域">
+                <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="所属分区">
+                <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所属省份">
+                <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属省份" v-model="queryParam.provinceSn"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所属城市">
+                <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属城市" leve="city" :parentId="queryParam.provinceSn" v-model="queryParam.citySn"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="费用承担方类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <v-select
+                  code="EXPENSE_ACCOUNT_DETAIL_SPLIT_OBJ_TYPE"
+                  allowClear
+                  style="width: 100%;"
+                  v-model="queryParam.splitObjType"
+                  @change="splitObjTypeChange"
+                  placeholder="请选择承担方类型"
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="费用承担方" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <!-- 部门 -->
+                <department v-show="queryParam.splitObjType=='DEPARTMENT'" style="width: 100%;" placeholder="请选择承担方" v-model="queryParam.splitObjSn"></department>
+                <!-- 经销商 -->
+                <custList v-show="queryParam.splitObjType=='CUSTOMER'" ref="custList" @change="custChange" placeholder="请选择(输入名称搜索)"></custList>
+                <a-select style="width: 100%" v-if="!queryParam.splitObjType" placeholder="请选择">
+                  <a-select-option value="" :disabled="true">
+                    请先选择承担方类型
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-show="queryParam.splitObjType=='DEPARTMENT'">
+              <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <employee style="width: 100%;" placeholder="请选择承担人员" v-model="queryParam.childSplitObjSn"></employee>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-show="queryParam.splitObjType==undefined">
+              <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-select style="width: 100%" placeholder="请选择">
+                  <a-select-option value="" :disabled="true">
+                    请先选择承担方类型
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a-button
+                style="margin-left: 10px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                v-if="$hasPermissions('B_expenseAcctDetailReport')"
+                id="expenseAcctDetail-export">导出</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="expenseReimbursementDetailList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- alert -->
-      <a-alert type="info" v-if="countData" style="margin-bottom:10px">
-        <div slot="message">
-          <div>
-            总单数:<strong>{{ countData&&(countData.detailNum || countData.detailNum==0) ? countData.detailNum : '--' }}</strong>;
-            总费用金额:<strong>{{ countData&&(countData.expense || countData.expense==0) ? toThousands(countData.expense) : '--' }}</strong>;
-          </div>
-        </div>
-      </a-alert>
+      <div>
+        总单数:<strong>{{ countData&&(countData.detailNum || countData.detailNum==0) ? countData.detailNum : '--' }}</strong>;
+        总费用金额:<strong>{{ countData&&(countData.expense || countData.expense==0) ? toThousands(countData.expense) : '--' }}</strong>;
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+70+'px' }"
+        :style="{ height: tableHeight+80+'px' }"
         size="small"
         rowKeyName="no"
         :rowKey="(record) => record.no"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight,x:2250 }"
         :defaultLoadData="false"
         bordered>
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -393,7 +394,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 226
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {

+ 1 - 1
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -539,7 +539,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 245
     },
     // 开票操作
     handleInvoice (con) {

+ 6 - 3
src/views/financialManagement/financialCollection/edit.vue

@@ -13,6 +13,12 @@
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="financialCollectionAddcont" v-show="showDetail">
+        <div slot="title">
+          <span>基础信息</span>
+          <div style="cursor:pointer;color: #00aaff;float:right;" @click.stop="handleEditBase" >
+            <a-icon type="edit" /> 编辑基础信息
+          </div>
+        </div>
         <div v-if="detailData">
           <a-descriptions :column="{ xs: 2, sm: 3, md: 3}">
             <a-descriptions-item label="创建时间">{{ detailData&&detailData.createDate || '--' }}</a-descriptions-item>
@@ -32,9 +38,6 @@
               </a>
             </a-descriptions-item>
           </a-descriptions>
-          <div style="text-align:center;">
-            <span style="color: #00aaff;cursor:pointer" @click.stop="handleEditBase"><a-icon type="edit" /> 编辑基础信息</span>
-          </div>
         </div>
       </a-card>
       <!-- 财务明细 -->

+ 1 - 1
src/views/inventoryManagement/intelligentReplenishment/edit.vue

@@ -300,7 +300,7 @@ export default {
       }
     }
     .intelligentReplenishmentEdit-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .intelligentReplenishmentEdit-cont{
       height: 100%;

+ 24 - 24
src/views/inventoryManagement/inventoryCheck/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="inventoryCheckDetail-wrap">
+  <div class="inventoryCheckDetail-wrap" :style="{paddingBottom:detail&&(detail.state!='FINISH' && detail.state!='DELETE')?'51px':'0px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" @back="handleBack" class="inventoryCheckDetail-cont" >
         <!-- 自定义的二级文字标题 -->
@@ -7,28 +7,27 @@
           <a id="inventoryCheckDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
           <span class="state-c" v-if="detail&&detail.state=='DELETE'">已作废</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="4">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="作废时间" v-if="detail&&detail.state=='DELETE'">{{ (detail&&detail.deleteTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont" v-show="showDetail">
+        <a-descriptions :column="4">
+          <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="作废时间" v-if="detail&&detail.state=='DELETE'">{{ (detail&&detail.deleteTime) || '--' }}</a-descriptions-item>
+        </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont">
@@ -59,7 +58,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">折叠列表</span></a-checkbox>
               </div>
             </a-col>
@@ -90,11 +89,10 @@
           @changePage="changePage" />
       </a-card>
     </a-spin>
-    <div class="affix-cont">
+    <div class="affix-cont" v-if="detail&&(detail.state!='FINISH' && detail.state!='DELETE') && $hasPermissions('B_inventoryCheckVoid')">
       <a-button
         type="primary"
         id="inventoryCheckDetail-submit-btn"
-        v-if="detail&&(detail.state!='FINISH' && detail.state!='DELETE') && $hasPermissions('B_inventoryCheckVoid')"
         size="large"
         class="button-primary"
         :disabled="spinning"
@@ -118,6 +116,7 @@ export default {
       spinning: false,
       disabled: false,
       loading: false,
+      showDetail: false,
       queryParam: {
         productCode: ''
       },
@@ -300,7 +299,7 @@ export default {
       height: 100%;
     }
     .inventoryCheckDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;
@@ -310,6 +309,7 @@ export default {
         color: #ed1c24;
         font-size: 13px;
         font-weight: bold;
+        margin: 0 15px 0 0;
       }
     }
   }

+ 71 - 80
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -1,76 +1,83 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="inventoryCheckList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24" v-show="isShowWarehouse">
+            <a-form-item label="仓库">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                isPermission
+                id="inventoryCheckList-warehouseSn"
+                placeholder="请选择仓库"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="盘点状态">
+              <v-select
+                v-model="queryParam.checkState"
+                ref="checkState"
+                id="inventoryCheckList-checkState"
+                code="CHECK_WAREHOUSE_STATE"
+                placeholder="请选择盘点状态"
+                allowClear
+              ></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="监盘状态">
+              <v-select
+                v-model="queryParam.checkSuperviseState"
+                ref="checkSuperviseState"
+                id="inventoryCheckList-checkSuperviseState"
+                code="CHECK_WAREHOUSE_SUPERVISE_STATE"
+                placeholder="请选择监盘状态"
+                allowClear
+              ></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="inventoryCheckList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 标签页 -->
-      <a-tabs type="card" :default-active-key="queryParam.deleteFlag" @change="handleTabChange" class="inventoryCheckList-tabs">
-        <a-tab-pane v-for="item in tabPaneData" :key="item.type">
-          <span slot="tab">{{ item.name }}</span>
-        </a-tab-pane>
-      </a-tabs>
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="inventoryCheckList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24" v-show="isShowWarehouse">
-              <a-form-item label="仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  isPermission
-                  id="inventoryCheckList-warehouseSn"
-                  placeholder="请选择仓库"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="盘点状态">
-                <v-select
-                  v-model="queryParam.checkState"
-                  ref="checkState"
-                  id="inventoryCheckList-checkState"
-                  code="CHECK_WAREHOUSE_STATE"
-                  placeholder="请选择盘点状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="监盘状态">
-                <v-select
-                  v-model="queryParam.checkSuperviseState"
-                  ref="checkSuperviseState"
-                  id="inventoryCheckList-checkSuperviseState"
-                  code="CHECK_WAREHOUSE_SUPERVISE_STATE"
-                  placeholder="请选择监盘状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryCheckList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_inventoryCheckAdd')" id="inventoryCheckList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+      <div class="table-operator flex-center" style="justify-content: space-between;">
+        <div class="flex-center">
+          <a-button v-if="$hasPermissions('B_inventoryCheckAdd')" id="inventoryCheckList-add" type="primary" @click="handleAdd">新增</a-button>
+        </div>
+        <div>
+          <a-radio-group v-model="queryParam.deleteFlag" @change="handleTabChange">
+            <a-radio-button v-for="item in tabPaneData" :key="item.type" :value="item.type">
+              {{ item.name }}
+            </a-radio-button>
+          </a-radio-group>
+        </div>
       </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
+        :pageSize="30"
         :defaultLoadData="false"
         bordered>
         <!-- 操作 -->
@@ -97,6 +104,7 @@
       @ok="openCommonModal=false"
       @cancel="openCommonModal=false" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -195,8 +203,8 @@ export default {
       this.$router.push({ path: `/inventoryManagement/inventoryCheck/detail/${data.checkWarehouseSn}` })
     },
     // 选择类型
-    handleTabChange (key) {
-      this.queryParam.deleteFlag = key
+    handleTabChange (event) {
+      this.queryParam.deleteFlag = event.target.value
       this.$refs.table.refresh(true)
     },
     // 详情
@@ -223,7 +231,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 332
+      this.tableHeight = window.innerHeight - 283
     }
   },
   watch: {
@@ -264,23 +272,6 @@ export default {
 
 <style lang="less">
   .inventoryCheckList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
-    // tab样式
-    .inventoryCheckList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
-      height: 30px!important;
-    }
-    .inventoryCheckList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
-      height: 30px!important;
-    }
-    .inventoryCheckList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
-      line-height: 26px!important;
-      height: 30px!important;
-    }
+    
   }
 </style>

+ 36 - 20
src/views/inventoryManagement/inventoryConfirmation/detail.vue

@@ -6,26 +6,25 @@
         <template slot="subTitle">
           <a id="inventoryConfirmationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="inventoryConfirmationDetail-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="inventoryConfirmationDetail-cont" v-show="showDetail">
+         <a-descriptions :column="3">
+           <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="inventoryConfirmationDetail-cont">
@@ -65,7 +64,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">仅显示盈亏</span></a-checkbox>
               </div>
             </a-col>
@@ -73,12 +72,15 @@
         </div>
         <!-- 列表 -->
         <s-table
-          class="sTable"
+          class="sTable fixPagination"
           ref="table"
           size="small"
+          :style="{ height: tableHeight+70+'px' }"
           :rowKey="(record) => record.id"
           :columns="columns"
+          :scroll="{ y: tableHeight }"
           :data="loadData"
+          :pageSize="30"
           :defaultLoadData="false"
           bordered>
           <!-- 盈亏数量 -->
@@ -111,6 +113,7 @@ export default {
     return {
       spinning: false,
       disabled: false,
+      showDetail: false,
       queryParam: {
         profitLossFlag: undefined,
         productCode: ''
@@ -136,6 +139,7 @@ export default {
           return data
         })
       },
+      tableHeight: 0,
       detail: null, //  详情数据
       foldState: false, //  是否仅显示盈亏
       productTotal: null //  合计
@@ -175,6 +179,7 @@ export default {
     resetSearchForm () {
       this.queryParam.productCode = ''
       this.$refs.table.refresh(true)
+      this.setTableH()
     },
     getCount (params) {
       checkWarehouseDetailCount(params).then(res => {
@@ -204,6 +209,17 @@ export default {
         this.queryParam.profitLossFlag = undefined
         this.$refs.table.refresh(true)
       }
+    },
+    setTableH () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.tableHeight = window.innerHeight - 315
+      })
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
     }
   },
   mounted () {
@@ -228,7 +244,7 @@ export default {
 <style lang="less">
   .inventoryConfirmationDetail-wrap{
     .inventoryConfirmationDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;

+ 34 - 30
src/views/inventoryManagement/inventoryConfirmation/list.vue

@@ -1,42 +1,47 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="inventoryConfirmationList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="仓库">
+              <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryConfirmationList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  
   <a-card size="small" :bordered="false" class="inventoryConfirmationList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 标签页 -->
-      <a-tabs type="card" :default-active-key="queryParam.state" @change="handleTabChange" class="inventoryConfirmationList-tabs">
+      <a-tabs :default-active-key="queryParam.state" @change="handleTabChange" class="inventoryConfirmationList-tabs">
         <a-tab-pane v-for="item in tabPaneData" :key="item.type">
           <span slot="tab">{{ item.name }}</span>
         </a-tab-pane>
       </a-tabs>
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="inventoryConfirmationList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryConfirmationList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :pageSize="30"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
@@ -66,6 +71,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -213,7 +219,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 295
+      this.tableHeight = window.innerHeight - 290
     }
   },
   watch: {
@@ -247,12 +253,10 @@ export default {
 
 <style lang="less">
   .inventoryConfirmationList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
+    .ant-card-body{
+      &:last-child{
+        padding-top: 0;
+      }
     }
     // tab样式
     .inventoryConfirmationList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -94,9 +94,9 @@ export default {
       let _this=this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '22%', ellipsis: true, customRender: function (text) { return text || '--' }, ellipsis: true},
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text ? text : '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '22%', ellipsis: true, customRender: function (text) { return text || '--' }, ellipsis: true},
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'left', customRender: function (text) { return text ? text : '--' } },
         { title: '入库时间', dataIndex: 'putTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },

+ 87 - 76
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -1,87 +1,90 @@
 <template>
+  <div>
+   <a-card size="small" :bordered="false" class="searchBoxNormal">
+     <!-- 搜索条件 -->
+     <div ref="tableSearch" class="table-page-search-wrapper">
+       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+         <a-row :gutter="15">
+           <a-col :md="6" :sm="24">
+             <a-form-item label="产品编码">
+               <a-input id="inventoryQueryList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+             </a-form-item>
+           </a-col>
+           <a-col :md="6" :sm="24">
+             <a-form-item label="原厂编码">
+               <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+             </a-form-item>
+           </a-col>
+           <a-col :md="5" :sm="24">
+             <a-form-item label="产品名称">
+               <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+             </a-form-item>
+           </a-col>
+           <template v-if="advanced">
+             <a-col :md="6" :sm="24">
+               <a-form-item label="产品品牌">
+                 <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+               </a-form-item>
+             </a-col>
+             <a-col :md="6" :sm="24">
+               <a-form-model-item label="产品分类">
+                 <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+               </a-form-model-item>
+             </a-col>
+             <a-col :md="6" :sm="24">
+               <a-form-item label="仓库">
+                 <warehouse
+                   isPermission
+                   v-model="queryParam.warehouseSn"
+                   id="inventoryQueryList-warehouseSn"
+                   placeholder="请选择仓库"
+                 />
+               </a-form-item>
+             </a-col>
+             <a-col :md="4" :sm="24">
+               <a-form-item label="库存情况">
+                 <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
+               </a-form-item>
+             </a-col>
+           </template>
+           <a-col :md="7" :sm="24">
+             <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
+             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
+             <a-button
+               v-if="$hasPermissions('B_inventoryQuery_export')"
+               type="primary"
+               style="margin-left: 5px"
+               class="button-warning"
+               @click="openExcelModal=true"
+               :disabled="disabled"
+               :loading="exportLoading"
+               id="inventoryQueryList-export">导出</a-button>
+             <a @click="advanced=!advanced" style="margin-left: 5px">
+               {{ advanced ? '收起' : '展开' }}
+               <a-icon :type="advanced ? 'up' : 'down'"/>
+             </a>
+           </a-col>
+         </a-row>
+       </a-form>
+     </div>
+  </a-card>
+  
   <a-card size="small" :bordered="false" class="inventoryQueryList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="inventoryQueryList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="原厂编码">
-                <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-              </a-form-item>
-            </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品品牌">
-                  <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="仓库">
-                  <warehouse
-                    isPermission
-                    v-model="queryParam.warehouseSn"
-                    id="inventoryQueryList-warehouseSn"
-                    placeholder="请选择仓库"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="库存情况">
-                  <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="7" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
-              <a-button
-                v-if="$hasPermissions('B_inventoryQuery_export')"
-                type="primary"
-                style="margin-left: 5px"
-                class="button-warning"
-                @click="openExcelModal=true"
-                :disabled="disabled"
-                :loading="exportLoading"
-                id="inventoryQueryList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 合计 -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div class="ftext" slot="message">
-          可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}个</strong>;
-          <span v-if="$hasPermissions('M_inventoryQueryList_costPrice')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
-        </div>
-      </a-alert>
+      <div class="ftext tongji-bar">
+        可用库存总数量:<strong>{{ (currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0)) ? currentStock.currentStockQty : '--' }}个</strong>;
+        <span v-if="$hasPermissions('M_inventoryQueryList_costPrice')">可用库存总成本:<strong>{{ (currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0)) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>。</span>
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+68+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
+        :pageSize="30"
         :data="loadData"
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
@@ -111,6 +114,7 @@
     <!-- 导出Excel -->
     <export-excel-modal :openModal="openExcelModal" @ok="handleExcelOk" @close="openExcelModal=false" />
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -203,9 +207,9 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '货位编号', dataIndex: 'stackPlaceEntity.stackPlaceCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后入库时间', dataIndex: 'lastStockTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -291,7 +295,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 226
     }
   },
   watch: {
@@ -328,3 +332,10 @@ export default {
   }
 }
 </script>
+<style lang="less">
+  .inventoryQueryList-wrap{
+    .sTable{
+      margin-top: 10px;
+    }
+  }
+</style>

+ 8 - 8
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -100,7 +100,7 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -187,15 +187,15 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '6%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下推单号', dataIndex: 'bizSubNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'unitName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位名称', dataIndex: 'unitName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
@@ -267,7 +267,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 295
+      this.tableHeight = window.innerHeight - tableSearchH - 268
     }
   },
   watch: {
@@ -303,10 +303,10 @@ export default {
 <style lang="less">
   .inventoryQueryWarehouseDetail-wrap{
     .inventoryQueryWarehouseDetail-back{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .inventoryQueryWarehouseDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .green{
       color: #19be6b;

+ 62 - 58
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -1,70 +1,73 @@
 <template>
-  <a-card size="small" :bordered="false" class="inventoryWarningList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品编码">
+              <a-input id="inventoryWarningList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="原厂编码">
+              <a-input id="inventoryWarningList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="产品名称">
+              <a-input id="inventoryWarningList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="inventoryWarningList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品品牌">
+                <ProductBrand id="inventoryWarningList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="原厂编码">
-                <a-input id="inventoryWarningList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-item>
+              <a-form-model-item label="产品分类">
+                <ProductType id="inventoryWarningList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+              </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="inventoryWarningList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+              <a-form-item label="仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  isPermission
+                  id="inventoryWarningList-warehouseSn"
+                  placeholder="请选择仓库"
+                />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品品牌">
-                  <ProductBrand id="inventoryWarningList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="inventoryWarningList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                <a-form-item label="仓库">
-                  <warehouse
-                    v-model="queryParam.warehouseSn"
-                    isPermission
-                    id="inventoryWarningList-warehouseSn"
-                    placeholder="请选择仓库"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="预警提示">
-                  <v-select
-                    v-model="queryParam.stockState"
-                    ref="stockState"
-                    id="inventoryWarningList-stockState"
-                    code="STOCK_WARN_TIP"
-                    placeholder="请选择预警提示"
-                    allowClear
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryWarningList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+              <a-form-item label="预警提示">
+                <v-select
+                  v-model="queryParam.stockState"
+                  ref="stockState"
+                  id="inventoryWarningList-stockState"
+                  code="STOCK_WARN_TIP"
+                  placeholder="请选择预警提示"
+                  allowClear
+                ></v-select>
+              </a-form-item>
             </a-col>
-          </a-row>
-        </a-form>
-      </div>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryWarningList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
+  <a-card size="small" :bordered="false" class="inventoryWarningList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div v-if="$hasPermissions('B_inventoryWarning_refresh')" class="table-operator">
         <a-button class="button-error" type="primary" id="inventoryWarningList-update" :loading="loading" @click="handleupdate">批量更新</a-button>
@@ -76,7 +79,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+70+'px' }"
         size="small"
         :row-selection="$hasPermissions('B_inventoryWarning_refresh')?{ columnWidth: '4%' }:null"
         :rowKey="(record) => record.id"
@@ -160,6 +163,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>

+ 20 - 20
src/views/inventoryManagement/makeInventory/check.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="makeInventoryCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -20,24 +23,20 @@
             @click="handlePdPrint">盘点打印</a-button>
         </template></a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="makeInventoryCheck-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="makeInventoryCheck-cont" v-show="showDetail">
+         <a-descriptions :column="3">
+           <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="makeInventoryCheck-cont">
@@ -75,7 +74,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">折叠列表</span></a-checkbox>
               </div>
             </a-col>
@@ -161,6 +160,7 @@ export default {
       spinning: false,
       disabled: false,
       loading: false,
+      showDetail: false,
       queryParam: {
         productCode: ''
       },
@@ -403,7 +403,7 @@ export default {
       height: 100%;
     }
     .makeInventoryCheck-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;

+ 31 - 27
src/views/inventoryManagement/makeInventory/list.vue

@@ -1,37 +1,40 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="makeInventoryList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <a-form-item label="仓库">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                id="inventoryCheckList-warehouseSn"
+                isPermission
+                placeholder="请选择仓库"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventoryList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="makeInventoryList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="makeInventoryList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="makeInventoryList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-item label="仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="inventoryCheckList-warehouseSn"
-                  isPermission
-                  placeholder="请选择仓库"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventoryList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="makeInventoryList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+73+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -53,6 +56,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>

+ 21 - 21
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="supervisionDiskCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.checkWarehouseNo }}</span>
+          <a-button size="small" type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -20,24 +23,20 @@
             @click="handlePdPrint">监盘打印</a-button>
         </template></a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="supervisionDiskCheck-cont">
-        <a-collapse>
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
-              <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+      <a-card size="small" :bordered="false" class="supervisionDiskCheck-cont" v-show="showDetail">
+         <a-descriptions :column="3">
+           <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘人">{{ (detail&&detail.checkSupervisePersonName) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="监盘时间">{{ (detail&&detail.checkSuperviseTime) || '--' }}</a-descriptions-item>
+           <a-descriptions-item label="财务确认时间">{{ (detail&&detail.financeAuditTime) || '--' }}</a-descriptions-item>
+         </a-descriptions>
       </a-card>
       <!-- 产品详情 -->
       <a-card size="small" :bordered="false" class="supervisionDiskCheck-cont">
@@ -76,7 +75,7 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top:6px;">
                 <a-checkbox v-model="foldState" @change="foldStateChange"><span style="display: inline-block;margin-top: 1px;">折叠列表</span></a-checkbox>
               </div>
             </a-col>
@@ -132,7 +131,7 @@
     </a-spin>
     <div class="affix-cont">
       <a-button
-        type="primary"
+        type="default"
         id="supervisionDiskCheck-check-btn"
         size="large"
         class="button-primary"
@@ -170,6 +169,7 @@ export default {
       spinning: false,
       disabled: false,
       loading: false,
+      showDetail: false,
       queryParam: {
         productCode: ''
       },
@@ -435,7 +435,7 @@ export default {
       height: 100%;
     }
     .supervisionDiskCheck-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
       .billno{
         font-size: 16px;
         font-weight: bold;

+ 32 - 34
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -1,37 +1,40 @@
 <template>
+  <div>
+  <a-card size="small" :bordered="false" class="searchBoxNormal">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="盘点单号">
+              <a-input id="supervisionDiskList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <a-form-item label="仓库">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                id="supervisionDiskList-warehouseSn"
+                isPermission
+                placeholder="请选择仓库"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionDiskList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="supervisionDiskList-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+  </a-card>
   <a-card size="small" :bordered="false" class="supervisionDiskList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="supervisionDiskList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-              <a-form-item label="仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="supervisionDiskList-warehouseSn"
-                  isPermission
-                  placeholder="请选择仓库"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionDiskList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="supervisionDiskList-reset">重置</a-button>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+73+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -53,6 +56,7 @@
       </s-table>
     </a-spin>
   </a-card>
+  </div>
 </template>
 
 <script>
@@ -176,12 +180,6 @@ export default {
 
 <style lang="less">
   .supervisionDiskList-wrap{
-    .active{
-      color: #ed1c24;
-      cursor: pointer;
-    }
-    .common{
-      color: rgba(0, 0, 0);
-    }
+     
   }
 </style>

+ 6 - 3
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -16,6 +16,12 @@
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-show="showDetail">
+        <div slot="title">
+          <span>基础信息</span>
+          <div style="cursor:pointer;color: #00aaff;float:right;" @click.stop="handleEditBase" >
+            <a-icon type="edit" /> 编辑基础信息
+          </div>
+        </div>
          <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
            <a-descriptions-item label="采购退货单号">{{ (detailsData && detailsData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
            <a-descriptions-item label="供应商名称">{{ (detailsData && detailsData.supplier && detailsData.supplier.supplierName) || '--' }}</a-descriptions-item>
@@ -37,9 +43,6 @@
              <span v-else>--</span>
            </a-descriptions-item>
          </a-descriptions>
-         <div style="text-align:center;">
-           <span style="color: #00aaff;cursor:pointer" @click.stop="handleEditBase"><a-icon type="edit" /> 编辑基础信息</span>
-         </div>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
         <queryPart ref="partQuery" :newLoading="isInster" :addMoreLoading="addMoreLoading" @add="saveProduct" @bachAdd="saveMoreProduct"></queryPart>