diff --git a/yxt-as-ui/src/views/storage/stocktaking/index.vue b/yxt-as-ui/src/views/storage/stocktaking/index.vue
index 6f698b9c2a..db37545d59 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/index.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="盘点列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="盘点列表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,28 +10,26 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="部门名称">
-                <el-input v-model="queryParams.params.deptNmae" placeholder="" clearable />
+                <el-input v-model="queryParams.params.deptNmae" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="盘点编号">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="生成日期">
-                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
-                至
-                <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"/>
+                <span style="padding: 0px 8px">至</span>
+                <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"/>
               </el-form-item>
               <el-form-item label="盘点状态">
                 <el-select v-model="queryParams.params.checkState" placeholder="请选择" style="width: 200px;">
-                  <el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.name" />
+                  <el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.sid"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="盘点人">
-                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="监盘人">
-                <el-input v-model="queryParams.params.superviseName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.superviseName" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -47,17 +45,14 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="selectionLineChangeHandle">
-            <el-table-column fixed width="50" type="selection" align="center" />
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center"/>
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" align="center" width="220">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
-                <el-button type="primary" size="mini" v-show="scope.row.state=='0'"
-                  @click="toEdit(scope.row)">办理</el-button>
-                <el-button type="primary" size="mini" v-show="scope.row.state=='0'"
-                  @click="toReport(scope.row)">盘库报告</el-button>
+                <el-button type="primary" size="mini" v-show="scope.row.state=='0'" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" v-show="scope.row.state=='0'" @click="toReport(scope.row)">盘库报告</el-button>
               </template>
             </el-table-column>
             <el-table-column label="流程状态" width="120" align="center">
@@ -66,150 +61,132 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="deptName" label="部门" width="120" align="center" />
-            <el-table-column prop="billNo" label="盘点编号" width="120" align="center" />
-            <el-table-column prop="createTime" label="生成日期" width="120" align="center" />
-            <el-table-column prop="createByName" label="盘点人" width="120" align="center" />
-            <el-table-column prop="superviseName" label="监盘人" width="120" align="center" />
-            <el-table-column prop="checkState" label="盘点状态" width="120" align="center" />
+            <el-table-column prop="deptName" label="部门" width="120" align="center"/>
+            <el-table-column prop="billNo" label="盘点编号" width="120" align="center"/>
+            <el-table-column prop="createTime" label="生成日期" width="120" align="center"/>
+            <el-table-column prop="createByName" label="盘点人" width="120" align="center"/>
+            <el-table-column prop="superviseName" label="监盘人" width="120" align="center"/>
+            <el-table-column prop="checkState" label="盘点状态" width="120" align="center"/>
             <el-table-column label="应盘" align="center">
-              <el-table-column prop="bookCount" label="数量" align="center" width="100" />
-              <el-table-column prop="bookAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="bookCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="bookAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="实盘" align="center">
-              <el-table-column prop="realCount" label="数量" align="center" width="100" />
-              <el-table-column prop="realAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="realCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="realAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="未盘" align="center">
-              <el-table-column prop="notCount" label="数量" align="center" width="100" />
-              <el-table-column prop="notAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="notCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="notAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="盘盈" align="center">
-              <el-table-column prop="profitCount" label="数量" align="center" width="100" />
-              <el-table-column prop="profitAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="profitCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="profitAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="盘亏" align="center">
-              <el-table-column prop="loseCount" label="数量" align="center" width="100" />
-              <el-table-column prop="loseAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="loseCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="loseAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="盘损" align="center">
-              <el-table-column prop="lossCount" label="数量" align="center" width="100" />
-              <el-table-column prop="lossAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="lossCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="lossAmount" label="金额" align="center" width="100"/>
             </el-table-column>
-            <el-table-column prop="remarks" label="备注" align="center" width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" width="200"/>
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </div>
 
     <!-- 盘库 -->
-    <stocktakingRackCodeList v-show="viewState == 2 " ref="divstocktak" @doback="resetState" @reloadlist="loadList" />
+    <stocktakingRackCodeList v-show="viewState == 2 " ref="divstocktak" @doback="resetState" @reloadlist="loadList"/>
     <!-- 办理 -->
-    <stocktakingEditReport v-show="viewState == 3 " ref="divedit" @doback="resetState" @reloadlist="loadList" />
+    <stocktakingEditReport v-show="viewState == 3 " ref="divedit" @doback="resetState" @reloadlist="loadList"/>
     <!-- 盘库报告 -->
-    <stocktakingReportDetail v-show="viewState == 4 " ref="divreport" @doback="resetState" @reloadlist="loadList" />
+    <stocktakingReportDetail v-show="viewState == 4 " ref="divreport" @doback="resetState" @reloadlist="loadList"/>
     <!--查看详情 -->
-    <stocktakingInfo v-show="viewState == 5" ref="divinfo" @doback="resetState" />
+    <stocktakingInfo v-show="viewState == 5" ref="divinfo" @doback="resetState"/>
 
     <el-dialog title="新建盘点单" :visible.sync="dialogVisible" :before-close="handleClose">
       <el-form ref="form_obj" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj">
         <el-row class="first_row">
           <el-col :span="12">
             <div class="span-sty">盘点人</div>
-            <el-form-item> <span class="addinputInfo addinputw">{{formobj.createByName}}</span></el-form-item>
+            <el-form-item><span class="addinputInfo addinputw">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">生成日期</div>
-            <el-form-item> <span class="addinputInfo addinputw">{{formobj.createDate}}</span></el-form-item>
+            <el-form-item><span class="addinputInfo addinputw">{{ formobj.createDate }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row class="first_row">
           <el-col :span="12">
             <div class="span-sty"><span class="must">*</span> 盘点类型</div>
             <el-form-item prop="checkTypeValue">
-              <el-select v-model="formobj.checkTypeValue" placeholder="请选择" class="addinputInfo addinputw"
-                @change="selectStocktakTyp">
-                <el-option v-for="item in stocktakTypeList" :key="item.sid" :label="item.name" :value="item.sid" />
+              <el-select v-model="formobj.checkTypeValue" placeholder="请选择" class="addinputInfo addinputw" @change="selectStocktakTyp">
+                <el-option v-for="item in stocktakTypeList" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
-              <!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
-                  multiple @change="selectFinance">
-                  <el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
-                </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty"><span class="must">*</span> 监盘人</div>
             <el-form-item prop="superviseName">
-              <el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw"
-                @change="selectFinance">
-                <el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid" />
+              <el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw" @change="selectFinance">
+                <el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
-              <!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
-                multiple @change="selectFinance">
-                <el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
-              </el-select> -->
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
-            <el-form-item><el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw"
-                clearable />
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
-
         <div class="title titleOne" v-show="showList=='1'">
           <div>盘点库位</div>
           <el-button type="primary" size="mini" class="btntopblueline" @click="seleRack()">选择库位</el-button>
         </div>
         <el-table v-loading="tableLoading" :data="formobj.dataList" border style="width: 100%" v-show="showList=='1'">
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column fixed label="操作" align="center" width="100">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="toDeleted(scope.row)">删除</el-button>
+              <el-button type="danger" size="mini" @click="toDeleted(scope.$index)">删除</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="warehouseName" label="仓库" align="center" />
-          <el-table-column prop="locationName" label="库区" align="center" />
-          <el-table-column prop="rackCode" label="库位" align="center" />
+          <el-table-column prop="warehouseName" label="仓库" align="center"/>
+          <el-table-column prop="zoneName" label="区域" align="center"/>
+          <el-table-column prop="locationName" label="库区" align="center"/>
+          <el-table-column prop="rackCode" label="库位" align="center"/>
         </el-table>
-
       </el-form>
-
       <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
         <el-button type="primary" style="margin-top: 20px;" @click="saveExamine">保 存</el-button>
         <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
       </div>
-
     </el-dialog>
-
     <el-dialog title="选择盘点库位" :visible.sync="dialogVisible2" :before-close="handleClose2">
       <el-form ref="form_obj2" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj">
         <el-form :inline="true" class="tab-header">
           <el-form-item label="仓库">
-            <el-select v-model="dialogParams.params.warehouseName" placeholder="请选择仓库" @change="selectWarehouseChange"
-              style="width: 200px;">
-              <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid" />
+            <el-select v-model="dialogParams.params.warehouseName" placeholder="请选择仓库" @change="selectWarehouseChange" style="width: 200px;">
+              <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
             </el-select>
           </el-form-item>
           <el-form-item label="库区">
-            <el-select v-model="dialogParams.params.warehouseAreaName" placeholder="请选择库区"
-              @change="selectWarehouseAreaChange" style="width: 200px;">
-              <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid" />
+            <el-select v-model="dialogParams.params.warehouseAreaName" placeholder="请选择库区" @change="selectWarehouseAreaChange" style="width: 200px;">
+              <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid"/>
             </el-select>
           </el-form-item>
           <el-form-item label="库位">
-            <el-select v-model="dialogParams.params.warehouseRackCode" placeholder="请选择库位" style="width: 200px;"
-              @change="selectWarehouseRackChange">
+            <el-select v-model="dialogParams.params.warehouseRackCode" placeholder="请选择库位" style="width: 200px;" @change="selectWarehouseRackChange">
               <el-option v-for="item in  warehouseRackList" :key="item.sid" :label="item.rackCode" :value="item.sid">
               </el-option>
             </el-select>
@@ -222,707 +199,600 @@
         <div class="title titleOne" style="margin-top: 0px;">
           <div>库位列表</div>
         </div>
-        <el-table v-loading="tableLoading" :data="allWarehouseRackList" border style="width: 100%;"
-          @selection-change="selectionWarehouseRack">
-          <el-table-column fixed width="50" type="selection" align="center" />
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column prop="warehouseName" label="仓库" align="center" />
-          <el-table-column prop="locationName" label="库区" align="center" />
-          <el-table-column prop="rackCode" label="库位" align="center" />
+        <el-table v-loading="tableLoading" :data="allWarehouseRackList" border style="width: 100%;" @selection-change="selectionWarehouseRack">
+          <el-table-column fixed width="50" type="selection" align="center"/>
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column prop="warehouseName" label="仓库" align="center"/>
+          <el-table-column prop="locationName" label="库区" align="center"/>
+          <el-table-column prop="rackCode" label="库位" align="center"/>
         </el-table>
-        <pagination v-show="allWarehouseRackList.length > 0" :total="dialogParams.total"
-          :page.sync="dialogParams.current" :limit.sync="dialogParams.size" class="pagination" @pagination="seleRack" />
-
+        <pagination v-show="allWarehouseRackList.length > 0" :total="dialogParams.total" :page.sync="dialogParams.current" :limit.sync="dialogParams.size" class="pagination" @pagination="seleRack"/>
       </el-form>
-
       <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
         <el-button type="primary" style="margin-top: 20px;" @click="addRck">确 认</el-button>
         <el-button type="primary" style="margin-top: 20px;" @click="handleClose2">关 闭</el-button>
       </div>
-
     </el-dialog>
-
     <!-- 流程审批记录 -->
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
-      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
-        :src="this.centerDialogVisible === true ? url :''"></iframe>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/stocktaking.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import stocktakingAdd from './stocktakingAdd.vue'
-  import stocktakingInfo from './stocktakingInfo.vue'
-  import stocktakingRackCodeList from './stocktakingRackCodeList.vue'
-  import stocktakingEditReport from './stocktakingEditReport.vue'
-  import stocktakingReportDetail from './stocktakingReportDetail.vue'
-  import req2 from '@/api/warehouse/warehouse.js'
-  import req3 from '@/api/warehouse/warehouseArea.js'
-  import req4 from '@/api/warehouse/goodsShelves.js'
-  import {
-    getCurrentDate
-  } from '@/utils/index.js'
-  import {
-    selAllByOrgSidPath
-  } from '@/api/Common/dictcommons'
-  import {
-    getStorage
-  } from '@/utils/auth'
-
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      stocktakingAdd,
-      stocktakingInfo,
-      stocktakingRackCodeList,
-      stocktakingEditReport,
-      stocktakingReportDetail
-    },
-    data() {
-      return {
-        url: '',
-        dialogHeight: '80%',
-        centerDialogVisible: false,
-        showList: '2',
-        dialogVisible: false,
-        dialogVisible2: false,
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'primary',
-            size: 'small',
-            icon: 'plus',
-            btnKey: 'toAdd',
-            btnLabel: '生成盘点单'
-          },
-          {
-            type: 'primary',
-            size: 'small',
-            icon: 'edit',
-            btnKey: 'toShowBill',
-            btnLabel: '盘库'
-          },
-          {
-            type: 'primary',
-            size: 'small',
-            icon: 'edit',
-            btnKey: 'toStocktak',
-            btnLabel: '生成盘库报告'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "deptNmae": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "checkState": "",
-            "createByName": "",
-            "superviseName": "",
-            "warehouseTypeKey": "01"
-          }
+import req from '@/api/storage/stocktaking.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import stocktakingAdd from './stocktakingAdd.vue'
+import stocktakingInfo from './stocktakingInfo.vue'
+import stocktakingRackCodeList from './stocktakingRackCodeList.vue'
+import stocktakingEditReport from './stocktakingEditReport.vue'
+import stocktakingReportDetail from './stocktakingReportDetail.vue'
+import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
+import req4 from '@/api/warehouse/goodsShelves.js'
+import {
+  getCurrentDate
+} from '@/utils/index.js'
+import {
+  selAllByOrgSidPath
+} from '@/api/Common/dictcommons'
+import {
+  getStorage
+} from '@/utils/auth'
+
+export default {
+  components: {
+    ButtonBar,
+    Pagination,
+    stocktakingAdd,
+    stocktakingInfo,
+    stocktakingRackCodeList,
+    stocktakingEditReport,
+    stocktakingReportDetail
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      showList: '2',
+      dialogVisible: false,
+      dialogVisible2: false,
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [{
+        type: 'primary',
+        size: 'small',
+        icon: 'plus',
+        btnKey: 'toAdd',
+        btnLabel: '生成盘点单'
+      },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toShowBill',
+          btnLabel: '盘库'
         },
-        sids: [],
-        selectionList: [],
-        checkStateList: [{
-            sid: '1',
-            name: '未完成'
-          },
-          {
-            sid: '2',
-            name: '已完成'
-          }
-        ],
-        stocktakTypeList: [{
-            sid: '1',
-            name: '月度抽盘'
-          },
-          {
-            sid: '2',
-            name: '季度全盘'
-          },
-
-        ],
-        formobj: {
-          createByName: window.sessionStorage.getItem('name'),
-          createBySid: window.sessionStorage.getItem('userSid'),
-          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          createDate: getCurrentDate(),
-          checkTypeValue: '',
-          checkTypeKey: '',
-          superviseName: '',
-          superviseSid: '',
-          remarks: "",
-          dataList: [],
-          "warehouseTypeKey": "01",
-          "warehouseTypeValue": "配件库"
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toStocktak',
+          btnLabel: '生成盘库报告'
         },
-        financeList: [],
-        rules: {
-          checkTypeValue: [{
-            required: true,
-            message: '请选择盘点类型',
-            trigger: 'change'
-          }],
-          superviseName: [{
-            required: true,
-            message: '请选择监盘人',
-            trigger: 'change'
-          }],
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          deptNmae: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          checkState: '',
+          createByName: '',
+          superviseName: '',
+          warehouseTypeKey: '01',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
+        }
+      },
+      sids: [],
+      selectionList: [],
+      checkStateList: [
+        {
+          sid: '1',
+          name: '盘点中'
         },
-        dialogParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "warehouseSid": "",
-            "warehouseName": "",
-            "warehouseAreaSid": "",
-            "warehouseAreaName": "",
-            "warehouseRackSid": "",
-            "warehouseRackCode": "",
-            "warehouseTypeKey": "01",
-          }
+        {
+          sid: '2',
+          name: '盘点完成'
+        }
+      ],
+      stocktakTypeList: [
+        {
+          sid: '1',
+          name: '月度抽盘'
         },
-        warehouseList: [],
-        warehouseAreaList: [],
-        warehouseRackList: [],
-        allWarehouseRackList: [],
-        selectionWarehouseRackList: []
+        {
+          sid: '2',
+          name: '季度全盘'
+        }
+      ],
+      formobj: {
+        createByName: window.sessionStorage.getItem('name'),
+        createBySid: window.sessionStorage.getItem('userSid'),
+        deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        createDate: getCurrentDate(),
+        checkTypeValue: '',
+        checkTypeKey: '',
+        superviseName: '',
+        superviseSid: '',
+        remarks: '',
+        dataList: [],
+        warehouseTypeKey: '01',
+        warehouseTypeValue: '配件库'
+      },
+      financeList: [],
+      rules: {
+        checkTypeValue: [{ required: true, message: '请选择盘点类型', trigger: 'change' }],
+        superviseName: [{ required: true, message: '请选择监盘人', trigger: 'change' }]
+      },
+      dialogParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          warehouseSid: '',
+          warehouseName: '',
+          warehouseAreaSid: '',
+          warehouseAreaName: '',
+          warehouseRackSid: '',
+          warehouseRackCode: '',
+          warehouseTypeKey: '01'
+        }
+      },
+      warehouseList: [],
+      warehouseAreaList: [],
+      warehouseRackList: [],
+      allWarehouseRackList: [],
+      selectionWarehouseRackList: []
+    }
+  },
+  mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+    selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      if (res.success) {
+        this.financeList = res.data
+      }
+    })
+    getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then(resp => {
+      this.warehouseList = resp.data
+    })
+  },
+  methods: {
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
       }
     },
-    mounted() {
-      // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
-      window.addEventListener('message', this.handleMessage)
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
     },
-    created() {
-      this.loadList()
-
-      selAllByOrgSidPath({
-        orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
-      }).then((res) => {
-        if (res.success) {
-          this.financeList = res.data
-        }
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    getWarehouseArea(sid) {
+      this.dialogParams.params.warehouseAreaSid = ''
+      this.dialogParams.params.warehouseAreaName = ''
+      getWarehouseareas({ ckSid: sid }).then(resp => {
+        this.warehouseAreaList = resp.data
       })
-
-      req2.getAllWarehouse({
-        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-      }).then(resp => {
-        this.warehouseList = resp.data
+    },
+    getAllTypeByAreaSid(sid) {
+      this.dialogParams.params.warehouseRackSid = ''
+      this.dialogParams.params.warehouseRackCode = ''
+      getAllRackByKQSid({ kqSid: sid }).then(resp => {
+        this.warehouseRackList = resp.data
       })
-
     },
-    methods: {
-      async handleMessage(event) {
-        var code = ''
-        if (event.data.params !== null && event.data.params !== undefined) {
-          code = event.data.params.code
-        }
-        if (code === 1) {
-          this.centerDialogVisible = false
-        } else if (code === 2) {
-          this.dialogHeight = event.data.params.data
-          this.setIframeHeight(document.getElementById('iframe'))
-        }
-      },
-      closeIt() {
-        this.url = ''
-        this.centerDialogVisible = false
-      },
-      setIframeHeight(iframe) {
-        iframe.height = this.dialogHeight
-      },
-      flowRecord(row) {
-        this.centerDialogVisible = true
-        var params = {
-          deployId: row.procDefId,
-          procInsId: row.procInstId,
-          token: getStorage()
-        }
-        this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
-      },
-      getWarehouseArea(sid) {
-        this.dialogParams.params.warehouseAreaSid = ''
-        this.dialogParams.params.warehouseAreaName = ''
-
-        var params = {
-          ckSid: sid
-        }
-
-        req3.getAllWarehouseareaBysid(params).then(resp => {
-          console.log('>>>>>>>>>getAllWarehousearea', resp)
-          this.warehouseAreaList = resp.data
-        }).catch(() => {})
-      },
-
-      getAllTypeByAreaSid(sid) {
-        this.dialogParams.params.warehouseRackSid = ''
-        this.dialogParams.params.warehouseRackCode = ''
-
-        var params = {
-          areaSid: sid
-        }
-
-        req4.getAllTypeByAreaSid(params).then(resp => {
-          console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
-          this.warehouseRackList = resp.data
-        }).catch(() => {})
-      },
-
-
-      selectWarehouseChange(val) {
-        const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseChange', choose)
-        this.dialogParams.params.warehouseSid = choose[0].sid
-        this.dialogParams.params.warehouseName = choose[0].warehouseName
-
-        this.getWarehouseArea(choose[0].sid)
-
-      },
-
-      selectWarehouseAreaChange(val) {
-        const choose = this.warehouseAreaList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
-        this.dialogParams.params.warehouseAreaSid = choose[0].sid
-        this.dialogParams.params.warehouseAreaName = choose[0].areaName
-
-        this.getAllTypeByAreaSid(choose[0].sid)
-      },
-
-      selectWarehouseRackChange(val) {
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseRackChange', choose)
-        this.dialogParams.params.warehouseRackSid = choose[0].sid
-        this.dialogParams.params.warehouseRackCode = choose[0].rackCode
-
-      },
-
-
-      dialogDosearch() {
-        this.dialogParams.current = 1
-        this.seleRack()
-      },
-      dialogResetQuery() {
-        this.dialogParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "warehouseSid": "",
-            "warehouseName": "",
-            "warehouseAreaSid": "",
-            "warehouseAreaName": "",
-            "warehouseRackSid": "",
-            "warehouseRackCode": "",
-            "warehouseTypeKey": "01",
-          }
-        }
-        this.seleRack()
-      },
-      seleRack() {
-
-        this.dialogParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.dialogParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.dialogParams.params.menuUrl = this.$route.path
-
-        req4.warehouserackListAll(this.dialogParams).then(resp => {
-          console.log('>>>>>>>>>warehouserackListAll', resp)
-
-          if (resp.success) {
-            const data = resp.data
-            this.dialogParams.total = data.total
-            this.allWarehouseRackList = data.records
-            this.dialogVisible2 = true
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.allWarehouseRackList = []
-            this.dialogParams.total = 0
-          }
-
-        }).catch(() => {})
-
-      },
-      selectionWarehouseRack(val) {
-        console.log('>>>>>>>>>selectionWarehouseRack', val)
-        this.selectionWarehouseRackList = val
-      },
-      addRck() {
-        this.formobj.dataList = []
-        for (var i = 0; i < this.selectionWarehouseRackList.length; i++) {
-          var item = this.selectionWarehouseRackList[i]
-
-          this.formobj.dataList.push(item)
-
-        }
-        console.log('>>>>>>>>>addRck', this.formobj.dataList)
-
-        this.dialogParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "warehouseSid": "",
-            "warehouseName": "",
-            "warehouseAreaSid": "",
-            "warehouseAreaName": "",
-            "warehouseRackSid": "",
-            "warehouseRackCode": "",
-            "warehouseTypeKey": "01",
-          }
-        }
-        this.dialogVisible2 = false
-      },
-      handleClose2() {
-        this.dialogParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "warehouseSid": "",
-            "warehouseName": "",
-            "warehouseAreaSid": "",
-            "warehouseAreaName": "",
-            "warehouseRackSid": "",
-            "warehouseRackCode": "",
-            "warehouseTypeKey": "01",
-          }
-        }
-        this.dialogVisible2 = false
-      },
-      toDeleted(row) {
-        console.log('>>>>>>>>>toDeleted', row)
-        const index = this.formobj.dataList.findIndex((item) => item == row)
-        this.formobj.dataList.splice(index, 1)
-      },
-      selectStocktakTyp(val) {
-        this.showList = val
-
-        console.log('>>>>>>>>>selectStocktakTyp', val)
-        const choose = this.stocktakTypeList.filter((item) => val.includes(item.sid))
-        console.log('>>>>>>>>>selectStocktakTyp', choose)
-        this.formobj.checkTypeValue = choose[0].name
-        this.formobj.checkTypeKey = choose[0].sid
-      },
-      selectFinance(val) {
-
-        console.log('>>>>>>>>>selectFinance', val)
-
-        const choose = this.financeList.filter((item) => val.includes(item.sid))
-        console.log('>>>>>>>>>selectFinance', choose)
-        this.formobj.superviseName = choose[0].name
-        this.formobj.superviseSid = choose[0].sid
-
-        // this.formobj.finances = []
-        // for (var i = 0; i < choose.length; i++) {
-
-        //   this.formobj.finances.push({
-        //     name: choose[i].name,
-        //     sid: choose[i].sid
-        //   })
-
-        // }
-
-      },
-      handleClose() {
-        this.dialogVisible = false
-        this.showList = "2"
-        this.formobj.checkTypeValue = ''
-        this.formobj.checkTypeKey = ''
-        this.formobj.superviseName = ''
-        this.formobj.superviseSid = ''
-        this.formobj.remarks = ''
-        this.formobj.dataList = []
-      },
-      saveExamine() {
-
-        console.log('>>>>>>>>>saveExamine', this.formobj)
-        this.formobj.rackSids = []
-        for (var i = 0; i < this.formobj.dataList.length; i++) {
-          var item = this.formobj.dataList[i]
-          this.formobj.rackSids.push(item.sid)
+    selectWarehouseChange(val) {
+      const choose = this.warehouseList.filter((item) => item.sid === val)
+      this.dialogParams.params.warehouseSid = choose[0].sid
+      this.dialogParams.params.warehouseName = choose[0].warehouseName
+      this.getWarehouseArea(choose[0].sid)
+    },
+    selectWarehouseAreaChange(val) {
+      const choose = this.warehouseAreaList.filter((item) => item.sid === val)
+      this.dialogParams.params.warehouseAreaSid = choose[0].sid
+      this.dialogParams.params.warehouseAreaName = choose[0].areaName
+      this.getAllTypeByAreaSid(choose[0].sid)
+    },
+    selectWarehouseRackChange(val) {
+      const choose = this.warehouseRackList.filter((item) => item.sid === val)
+      this.dialogParams.params.warehouseRackSid = choose[0].sid
+      this.dialogParams.params.warehouseRackCode = choose[0].rackCode
+    },
+    dialogDosearch() {
+      this.dialogParams.current = 1
+      this.seleRack()
+    },
+    dialogResetQuery() {
+      this.dialogParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          warehouseSid: '',
+          warehouseName: '',
+          warehouseAreaSid: '',
+          warehouseAreaName: '',
+          warehouseRackSid: '',
+          warehouseRackCode: '',
+          warehouseTypeKey: '01'
         }
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            req.createBill(this.formobj).then((resp) => {
-              if (resp.success) {
-                this.$message({
-                  type: 'success',
-                  message: '操作成功',
-                  showClose: true
-                })
-                this.handleClose()
-                this.loadList()
-              }
-            }).catch(() => {})
-          }
-        })
-      },
-
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
+      }
+      this.seleRack()
+    },
+    seleRack() {
+      this.dialogParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.dialogParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.dialogParams.params.menuUrl = this.$route.path
+      req4.warehouserackListAll(this.dialogParams).then(resp => {
+        if (resp.success) {
+          const data = resp.data
+          this.dialogParams.total = data.total
+          this.allWarehouseRackList = data.records
+          this.dialogVisible2 = true
         } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'toShowBill':
-            this.toShowBill()
-            break
-          case 'toStocktak':
-            this.toStocktak()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
-        }
-      },
-      loadList() {
-        this.tableLoading = true
-        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.queryParams.params.menuUrl = this.$route.path
-        req.listPage(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-
-        // this.$http({
-        //   method: "post",
-        //   url: "http://127.0.0.1:4523/mock/430173/user/list",
-        //   params: this.queryParams,
-        // }).then((resp) => {
-        //   const data = resp.data
-        //   this.queryParams.total = data.total
-        //   this.dataList = data.records
-        // });
-
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "deptNmae": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "checkState": "",
-            "createByName": "",
-            "superviseName": "",
-            "warehouseTypeKey": "01",
-          }
+          // 根据resp.code进行异常情况处理
+          this.allWarehouseRackList = []
+          this.dialogParams.total = 0
         }
-        this.loadList()
-      },
-      toAdd() {
-        // this.viewState = 2
-        // this.$refs['divadd'].showAdd()
-
-
-        this.dialogVisible = true
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-      },
-      selectionLineChangeHandle(val) {
-        console.log('val', val)
-
-        this.selectionList = val
-        const aa = []
-        val.forEach(element => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-      },
-      toDetail(row) {
-        console.log('toDetail', row)
-
-        this.viewState = 5
-        this.$refs['divinfo'].showDetail(row.sid)
-      },
-      toShowBill() {
-
-        if (this.selectionList.length != 1) {
-          this.$message({
-            type: 'warning',
-            message: '请选择一条数据。',
-            showClose: true
-          })
-          return
-        }
-
-        this.viewState = 2
-        this.$refs['divstocktak'].showDetail(this.selectionList[0].sid)
-      },
-      toStocktak() {
-        if (this.selectionList.length != 1) {
-          this.$message({
-            type: 'warning',
-            message: '请选择一条数据。',
-            showClose: true
-          })
-          return
+      }).catch(() => {
+      })
+    },
+    selectionWarehouseRack(val) {
+      this.selectionWarehouseRackList = val
+    },
+    addRck() {
+      for (var i = 0; i < this.selectionWarehouseRackList.length; i++) {
+        var item = this.selectionWarehouseRackList[i]
+        this.formobj.dataList.push(item)
+      }
+      this.dialogParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          warehouseSid: '',
+          warehouseName: '',
+          warehouseAreaSid: '',
+          warehouseAreaName: '',
+          warehouseRackSid: '',
+          warehouseRackCode: '',
+          warehouseTypeKey: '01'
         }
-
-        if (this.selectionList[0].state == '0') {
-          this.$message({
-            type: 'warning',
-            message: '所选记录已生成报告,不可重复生成。',
-            showClose: true
-          })
-          return
+      }
+      this.dialogVisible2 = false
+    },
+    handleClose2() {
+      this.dialogParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          warehouseSid: '',
+          warehouseName: '',
+          warehouseAreaSid: '',
+          warehouseAreaName: '',
+          warehouseRackSid: '',
+          warehouseRackCode: '',
+          warehouseTypeKey: '01'
         }
-
-        this.$confirm("请确认是否盘点完毕，生成盘点报告后将不能再盘点！", "提示", {
-          // iconClass: "el-icon-question", //自定义图标样式
-          confirmButtonText: "确认", //确认按钮文字更换
-          cancelButtonText: "取消", //取消按钮文字更换
-          showClose: true, //是否显示右上角关闭按钮
-          type: "warning", //提示类型 success/info/warning/error
-        }).then(() => {
-          //确认操作
-          var params = {
-            sid: this.selectionList[0].sid
-          }
-
-          req.billCreateReport(params).then((resp) => {
+      }
+      this.dialogVisible2 = false
+    },
+    toDeleted(index) {
+      this.formobj.dataList.splice(index, 1)
+    },
+    selectStocktakTyp(val) {
+      this.showList = val
+      const choose = this.stocktakTypeList.filter((item) => val.includes(item.sid))
+      this.formobj.checkTypeValue = choose[0].name
+      this.formobj.checkTypeKey = choose[0].sid
+    },
+    selectFinance(val) {
+      const choose = this.financeList.filter((item) => val.includes(item.sid))
+      this.formobj.superviseName = choose[0].name
+      this.formobj.superviseSid = choose[0].sid
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.showList = '2'
+      this.formobj.checkTypeValue = ''
+      this.formobj.checkTypeKey = ''
+      this.formobj.superviseName = ''
+      this.formobj.superviseSid = ''
+      this.formobj.remarks = ''
+      this.formobj.dataList = []
+    },
+    saveExamine() {
+      this.formobj.rackSids = []
+      for (var i = 0; i < this.formobj.dataList.length; i++) {
+        var item = this.formobj.dataList[i]
+        this.formobj.rackSids.push(item.sid)
+      }
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          req.createBill(this.formobj).then((resp) => {
             if (resp.success) {
               this.$message({
                 type: 'success',
                 message: '操作成功',
                 showClose: true
               })
-
+              this.handleClose()
               this.loadList()
             }
-          }).catch(() => {})
-        }).catch(() => {
-          //取消操作
-        });
-
-
+          }).catch(() => {
+          })
+        }
+      })
+    },
 
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toShowBill':
+          this.toShowBill()
+          break
+        case 'toStocktak':
+          this.toStocktak()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    loadList() {
+      this.tableLoading = true
+      this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.queryParams.params.menuUrl = this.$route.path
+      req.listPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
+        } else {
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
+        }
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          deptNmae: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          checkState: '',
+          createByName: '',
+          superviseName: '',
+          warehouseTypeKey: '01',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
+        }
+      }
+      this.loadList()
+    },
+    toAdd() {
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+    },
+    selectionLineChangeHandle(val) {
+      console.log('val', val)
 
-      },
-      toEdit(row) {
-        this.viewState = 3
-        this.$refs['divedit'].showEdit(row)
-      },
-      toReport(row) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    toDetail(row) {
+      console.log('toDetail', row)
 
-        this.viewState = 4
-        this.$refs['divreport'].showDetail(row)
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
+      this.viewState = 5
+      this.$refs['divinfo'].showDetail(row.sid)
+    },
+    toShowBill() {
+      if (this.selectionList.length !== 1) {
+        this.$message({
+          type: 'warning',
+          message: '请选择一条数据。',
+          showClose: true
+        })
+        return
+      }
+      this.viewState = 2
+      this.$refs['divstocktak'].showDetail(this.selectionList[0].sid)
+    },
+    toStocktak() {
+      if (this.selectionList.length !== 1) {
+        this.$message({
+          type: 'warning',
+          message: '请选择一条数据。',
+          showClose: true
+        })
+        return
+      }
 
-      resetState() {
-        this.viewState = 1
+      if (this.selectionList[0].state == '0') {
+        this.$message({
+          type: 'warning',
+          message: '所选记录已生成报告,不可重复生成。',
+          showClose: true
+        })
+        return
       }
+
+      this.$confirm('请确认是否盘点完毕，生成盘点报告后将不能再盘点！', '提示', {
+        // iconClass: "el-icon-question", //自定义图标样式
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        showClose: true,
+        type: 'warning'
+      }).then(() => {
+        var params = {
+          sid: this.selectionList[0].sid
+        }
+        req.billCreateReport(params).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '操作成功',
+              showClose: true
+            })
+            this.loadList()
+          }
+        }).catch(() => {
+        })
+      }).catch(() => {
+      })
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divedit'].showEdit(row)
+    },
+    toReport(row) {
+      this.viewState = 4
+      this.$refs['divreport'].showDetail(row)
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 90px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 80px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 80px !important;
-    width: calc(100% - 70px);
-  }
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  /deep/ .el-form-item__error {
-    margin-left: 180px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-    display: inline;
-    line-height: 1px;
-    vertical-align: middle;
-  }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+
+.must {
+  color: #f00;
+}
+
+.span-sty {
+  width: 90px !important;
+}
+
+.addinputInfo {
+  margin-left: 80px !important;
+}
+
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 80px !important;
+  width: calc(100% - 70px);
+}
+
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
+
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+/deep/ .el-form-item__error {
+  margin-left: 180px !important;
+}
+
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue
index 958d0c0289..99d246f78a 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue
@@ -127,7 +127,7 @@
           </div>
           <el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="warehouseAreaeName" label="仓库-库区" width="200" align="center" />
+            <el-table-column prop="warehouseAreaeName" label="仓库-区域-库区" width="200" align="center" />
             <el-table-column prop="ypNum" label="应盘" align="center" />
             <el-table-column prop="ypMoney" label="应盘金额" align="center" />
             <el-table-column prop="spNum" label="实盘" align="center" />
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
index 477beecf2d..36247467fe 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="库位商品盘点明细" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="库位商品盘点明细" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,13 +10,13 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="商品ID">
-                <el-input v-model="queryParams.params.goodsID" placeholder="" clearable />
+                <el-input v-model="queryParams.params.goodsID" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品名称">
-                <el-input v-model="queryParams.params.goodsSkuTitle" placeholder="" clearable />
+                <el-input v-model="queryParams.params.goodsSkuTitle" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品图号">
-                <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable />
+                <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -33,239 +33,187 @@
         <!-- Start 项目列表 -->
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
-            <el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center" />
-            <el-table-column prop="goodsSkuCode" label="图号" width="120" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="120" align="center" />
-            <el-table-column prop="warehouseArea" label="库区" width="120" align="center" />
-            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center" />
-            <el-table-column prop="unit" label="单位" width="120" align="center" />
-            <el-table-column prop="cost" label="单价" width="120" align="center" />
-            <el-table-column prop="bookCount" label="库存数量" width="120" align="center" />
-            <el-table-column prop="bookAmount" label="库存金额" width="120" align="center" />
-            <el-table-column prop="realCount" label="实盘数量" width="120" align="center" />
-            <el-table-column prop="realCount" label="实盘金额" width="120" align="center" />
-            <el-table-column prop="state" label="状态" width="120" align="center" />
-            <el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center" />
-            <el-table-column prop="profitAndLoseAmount" label="盈亏金额" width="120" align="center" />
-            <el-table-column prop="lossCount" label="盘损数量" width="120" align="center" />
-            <el-table-column prop="lossAmount" label="盘损金额" width="120" align="center" />
-            <el-table-column prop="remarks" label="备注" align="center" width="200" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="goodsID" label="商品ID" width="120" align="center"/>
+            <el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center"/>
+            <el-table-column prop="goodsSkuCode" label="图号" width="120" align="center"/>
+            <el-table-column prop="warehouseName" label="仓库" width="120" align="center"/>
+            <el-table-column prop="zoneName" label="区域" width="120" align="center"/>
+            <el-table-column prop="warehouseArea" label="库区" width="120" align="center"/>
+            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center"/>
+            <el-table-column prop="unit" label="单位" width="120" align="center"/>
+            <el-table-column prop="cost" label="单价" width="120" align="center"/>
+            <el-table-column prop="bookCount" label="库存数量" width="120" align="center"/>
+            <el-table-column prop="bookAmount" label="库存金额" width="120" align="center"/>
+            <el-table-column prop="realCount" label="实盘数量" width="120" align="center"/>
+            <el-table-column prop="realAmount" label="实盘金额" width="120" align="center"/>
+            <el-table-column prop="state" label="状态" width="120" align="center"/>
+            <el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center"/>
+            <el-table-column prop="profitAndLoseAmount" label="亏盈金额" width="120" align="center"/>
+            <el-table-column prop="lossCount" label="盘损数量" width="120" align="center"/>
+            <el-table-column prop="lossAmount" label="盘损金额" width="120" align="center"/>
+            <el-table-column prop="remarks" label="备注" align="center" width="200"/>
             <el-table-column label="附件" align="center">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.fillPaths)">
-                  查看
-                </div>
+                <span class="bluezi" @click="showImage(scope.row.fillPaths)">查看</span>
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </div>
 
     <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
-
       <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
-
         <el-row class="first_row">
           <el-col :span="24" class="trightb">
-            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
-              v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item]">
+            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item, index) in fileList" :key="index" :src="item.url" :preview-src-list="[item]">
             </el-image>
           </el-col>
         </el-row>
-
       </el-form>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/stocktaking.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
+import req from '@/api/storage/stocktaking.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+
+export default {
+  components: {
+    ButtonBar,
+    Pagination
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [{
+        type: 'info',
+        size: 'small',
+        icon: 'cross',
+        btnKey: 'doClose',
+        btnLabel: '关闭'
+      }],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billSid: '',
+          warehouseRackSid: '',
+          goodsID: '',
+          goodsSkuTitle: '',
+          goodsSkuCode: ''
+        }
+      },
+      billSid: '',
+      warehouseRackSid: '',
+      fileList: []
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    showImage(paths) {
+      this.fileList = paths
+      this.dialogVisible = true
+    },
+    handleClose() {
+      this.dialogVisible = false
     },
-    data() {
-      return {
-        dialogVisible: false,
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-          type: 'info',
-          size: 'small',
-          icon: 'cross',
-          btnKey: 'doClose',
-          btnLabel: '关闭'
-        }],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "billSid": "",
-            "warehouseRackSid": "",
-            "goodsID": "",
-            "goodsSkuTitle": "",
-            "goodsSkuCode": ""
-          }
-        },
-        billSid: "",
-        warehouseRackSid: "",
-        fileList: []
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
       }
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'doClose':
+          this.close()
+          break
+        default:
+          break
+      }
     },
-    created() {
 
+    showDetail(sid, warehouseRackSid) {
+      this.billSid = sid
+      this.warehouseRackSid = warehouseRackSid
+      this.queryParams.params.billSid = sid
+      this.queryParams.params.warehouseRackSid = warehouseRackSid
+      this.loadList()
     },
-    methods: {
-      showImage(paths) {
-        this.fileList = paths
-        this.dialogVisible = true
-      },
-      handleClose() {
-        this.dialogVisible = false
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
+
+    loadList() {
+      this.tableLoading = true
+      req.billRackCodeDetail(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
         } else {
-          this.searchxianshitit = '显示查询条件'
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
         }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'doClose':
-            this.close()
-            break
-          default:
-            break
-        }
-      },
-
-      showDetail(sid, warehouseRackSid) {
-        this.billSid = sid
-        this.warehouseRackSid = warehouseRackSid
-        this.queryParams.params.billSid = sid
-        this.queryParams.params.warehouseRackSid = warehouseRackSid
-        this.loadList()
-      },
-
-      loadList() {
-        this.tableLoading = true
-        req.billRackCodeDetail(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
 
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "billSid": this.billSid,
-            "warehouseRackSid": this.warehouseRackSid,
-            "goodsID": "",
-            "goodsSkuTitle": "",
-            "goodsSkuCode": ""
-          }
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billSid: this.billSid,
+          warehouseRackSid: this.warehouseRackSid,
+          goodsID: '',
+          goodsSkuTitle: '',
+          goodsSkuCode: ''
         }
-        this.loadList()
-      },
-
-      close() {
-        this.$emit('doback')
-      },
-
+      }
+      this.loadList()
+    },
+    close() {
+      this.$emit('doback')
     }
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 90px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 80px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 80px !important;
-    width: calc(100% - 70px);
-  }
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  /deep/ .el-form-item__error {
-    margin-left: 180px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-    display: inline;
-    line-height: 1px;
-    vertical-align: middle;
-  }
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
index 981ab0cbb1..ffc4af331a 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="盘库明细" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="盘库明细" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,24 +10,26 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="仓库">
-                <el-select v-model="queryParams.params.warehouseName" placeholder="请选择仓库"
-                  @change="selectWarehouseChange">
-                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
-                    :value="item.sid" />
+                <el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择" style="width:100%" @change="selectWarehouseName">
+                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="区域">
+                <el-select v-model="queryParams.params.zoneName" filterable clearable placeholder="请选择" @change="selectWareZoneName">
+                  <el-option v-for="item in warehouseZoneList" :key="item.sid" :label="item.zoneName" :value="item.sid">
+                  </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="库区">
-                <el-select v-model="queryParams.params.warehouseAreaName" placeholder="请选择库区"
-                  @change="selectWarehouseAreaChange">
-                  <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName"
-                    :value="item.sid" />
+                <el-select v-model="queryParams.params.warehouseAreaName" filterable clearable placeholder="请选择" @change="selectWareAreaName">
+                  <el-option v-for="item in wareAreaList" :key="item.sid" :label="item.areaName" :value="item.sid">
+                  </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="库位">
-                <el-select v-model="queryParams.params.warehouseRackName" placeholder="请选择库位"
-                  @change="selectWarehouseRackChange">
-                  <el-option v-for="item in  warehouseRackList" :key="item.sid" :label="item.rackName"
-                    :value="item.sid">
+                <el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择" style="width:100%">
+                  <el-option v-for="item in warehouseRackList" :key="item.rackCode" :label="item.rackCode" :value="item.rackCode">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -46,310 +48,254 @@
         <!-- Start 项目列表 -->
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="warehouseName" label="仓库" width="120" align="center" />
-            <el-table-column prop="warehouseArea" label="库区" width="120" align="center" />
-            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="120" align="center"/>
+            <el-table-column prop="zoneName" label="区域" width="120" align="center"/>
+            <el-table-column prop="warehouseArea" label="库区" width="120" align="center"/>
+            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center"/>
             <el-table-column label="应盘" align="center">
-              <el-table-column prop="bookCount" label="数量" align="center" width="100" />
-              <el-table-column prop="bookAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="bookCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="bookAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="实盘" align="center">
-              <el-table-column prop="realCount" label="数量" align="center" width="100" />
-              <el-table-column prop="realAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="realCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="realAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="未盘" align="center">
-              <el-table-column prop="notCount" label="数量" align="center" width="100" />
-              <el-table-column prop="notAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="notCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="notAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="盘盈" align="center">
-              <el-table-column prop="profitCount" label="数量" align="center" width="100" />
-              <el-table-column prop="profitAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="profitCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="profitAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="盘亏" align="center">
-              <el-table-column prop="loseCount" label="数量" align="center" width="100" />
-              <el-table-column prop="loseAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="loseCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="loseAmount" label="金额" align="center" width="100"/>
             </el-table-column>
             <el-table-column label="盘损" align="center">
-              <el-table-column prop="lossCount" label="数量" align="center" width="100" />
-              <el-table-column prop="lossAmount" label="金额" align="center" width="100" />
+              <el-table-column prop="lossCount" label="数量" align="center" width="100"/>
+              <el-table-column prop="lossAmount" label="金额" align="center" width="100"/>
             </el-table-column>
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </div>
     <!-- 查看库位明细 -->
-    <stocktakingRackCodeDetail v-show="viewState == 2" ref="divSp" @doback="resetState" />
+    <stocktakingRackCodeDetail v-show="viewState == 2" ref="divSp" @doback="resetState"/>
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/stocktaking.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import stocktakingRackCodeDetail from './stocktakingRackCodeDetail.vue'
-  import req2 from '@/api/warehouse/warehouse.js'
-  import req3 from '@/api/warehouse/warehouseArea.js'
-  import req4 from '@/api/warehouse/goodsShelves.js'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      stocktakingRackCodeDetail
-    },
-    data() {
-      return {
-        dialogVisible: false,
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
+import req from '@/api/storage/stocktaking.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import stocktakingRackCodeDetail from './stocktakingRackCodeDetail.vue'
+import { getAllRackByKQSid, getAllWarehouse, getAllWarehouseareaByZoneSid, getAllWarehousezoneBysid } from '@/api/Common/dictcommons'
+
+export default {
+  components: {
+    ButtonBar,
+    Pagination,
+    stocktakingRackCodeDetail
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [
+        {
           type: 'info',
           size: 'small',
           icon: 'cross',
           btnKey: 'doClose',
           btnLabel: '关闭'
-        }],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "billSid": "",
-            "warehouseSid": "",
-            "warehouseName": "",
-            "warehouseAreaSid": "",
-            "warehouseAreaName": "",
-            "warehouseRackSid": "",
-            "warehouseRackName": "",
-          }
-        },
-        billSid: "",
-        warehouseList: [],
-        warehouseAreaList: [],
-        warehouseRackList: []
+        }
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billSid: '',
+          warehouseName: '',
+          zoneName: '',
+          wareAreaName: '',
+          warehouseRackCode: ''
+        }
+      },
+      billSid: '',
+      warehouseList: [],
+      warehouseAreaList: [],
+      warehouseRackList: []
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    initData() {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
+        if (res.success) {
+          this.warehouseList = res.data
+        }
+      })
+    },
+    selectWarehouseName(val) {
+      this.warehouseZoneList = []
+      this.wareAreaList = []
+      this.warehouseRackList = []
+      const choose = this.warehouseList.filter((item) => item.sid === val)
+      if (choose !== null || choose.length > 0) {
+        this.queryParams.params.warehouseName = choose[0].warehouseName
+        this.getWarehouseZoneList(choose[0].sid)
+      } else {
+        this.queryParams.params.warehouseName = ''
       }
+      this.queryParams.params.wareZoneName = ''
+      this.queryParams.params.wareAreaName = ''
+      this.queryParams.params.warehouseRackCode = ''
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    getWarehouseZoneList(sid) {
+      getAllWarehousezoneBysid({ ckSid: sid }).then((res) => {
+        if (res.success) {
+          this.warehouseZoneList = res.data
+        }
+      })
     },
-    created() {
-
+    selectWareZoneName(val) {
+      this.wareAreaList = []
+      this.warehouseRackList = []
+      const choose = this.warehouseZoneList.filter((item) => item.sid === val)
+      if (choose !== null && choose.length > 0) {
+        this.queryParams.params.wareZoneName = choose[0].zoneName
+        this.getWareAreaList(choose[0].sid)
+      } else {
+        this.queryParams.params.wareZoneName = ''
+      }
+      this.queryParams.params.wareAreaName = ''
+      this.queryParams.params.warehouseRackCode = ''
     },
-    methods: {
-
-      initData() {
-
-        var parpams = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-        }
-
-        req2.getAllWarehouse(parpams).then(resp => {
-          this.warehouseList = resp.data
-        })
-      },
-
-      getWarehouseArea(sid) {
-        this.queryParams.params.warehouseAreaSid = ''
-        this.queryParams.params.warehouseAreaName = ''
-
-        var params = {
-          ckSid: sid
+    getWareAreaList(sid) {
+      getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => {
+        if (res.success) {
+          this.wareAreaList = res.data
         }
-
-        req3.getAllWarehouseareaBysid(params).then(resp => {
-          console.log('>>>>>>>>>getAllWarehousearea', resp)
-          this.warehouseAreaList = resp.data
-        }).catch(() => {})
-      },
-
-      getAllTypeByAreaSid(sid) {
-        this.queryParams.params.warehouseRackSid = ''
-        this.queryParams.params.warehouseRackName = ''
-
-        var params = {
-          areaSid: sid
+      })
+    },
+    selectWareAreaName(val) {
+      this.warehouseRackList = []
+      const choose = this.wareAreaList.filter((item) => item.sid === val)
+      if (choose !== null && choose.length > 0) {
+        this.queryParams.params.wareAreaName = choose[0].areaName
+        this.getWarehouseRackList(choose[0].sid)
+      } else {
+        this.queryParams.params.wareAreaName = ''
+      }
+      this.queryParams.params.warehouseRackCode = ''
+    },
+    getWarehouseRackList(sid) {
+      getAllRackByKQSid({ kqSid: sid }).then((res) => {
+        if (res.success) {
+          this.warehouseRackList = res.data
         }
-
-        req4.getAllTypeByAreaSid(params).then(resp => {
-          console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
-          this.warehouseRackList = resp.data
-        }).catch(() => {})
-      },
-
-
-      selectWarehouseChange(val) {
-        const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseChange', choose)
-        this.queryParams.params.warehouseSid = choose[0].sid
-        this.queryParams.params.warehouseName = choose[0].warehouseName
-
-        this.getWarehouseArea(choose[0].sid)
-
-      },
-
-      selectWarehouseAreaChange(val) {
-        const choose = this.warehouseAreaList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
-        this.queryParams.params.warehouseAreaSid = choose[0].sid
-        this.queryParams.params.warehouseAreaName = choose[0].areaName
-
-        this.getAllTypeByAreaSid(choose[0].sid)
-      },
-
-      selectWarehouseRackChange(val) {
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseRackChange', choose)
-        this.queryParams.params.warehouseRackSid = choose[0].sid
-        this.queryParams.params.warehouseRackName = choose[0].rackName
-
-      },
-
-
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'doClose':
+          this.close()
+          break
+        default:
+          break
+      }
+    },
+    showDetail(sid) {
+      this.initData()
+      this.billSid = sid
+      this.queryParams.params.billSid = sid
+      this.loadList()
+    },
+    loadList() {
+      this.tableLoading = true
+      req.billStocktak(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
         } else {
-          this.searchxianshitit = '显示查询条件'
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
         }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'doClose':
-            this.close()
-            break
-          default:
-            break
-        }
-      },
-      showDetail(sid) {
-        this.initData()
-        this.billSid = sid
-        this.queryParams.params.billSid = sid
-        this.loadList()
-      },
-
-      loadList() {
-        this.tableLoading = true
-        req.billStocktak(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "billSid": this.billSid,
-            "warehouseSid": "",
-            "warehouseName": "",
-            "warehouseAreaSid": "",
-            "warehouseAreaName": "",
-            "warehouseRackSid": "",
-            "warehouseRackName": "",
-          }
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billSid: this.billSid,
+          warehouseName: '',
+          zoneName: '',
+          wareAreaName: '',
+          warehouseRackCode: ''
         }
-        this.loadList()
-      },
-
-      toDetail(row) {
-
-        this.viewState = 2
-        this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid)
-      },
-      close() {
-        this.$emit('doback')
-      },
-
-      resetState() {
-        this.viewState = 1
       }
+      this.loadList()
+    },
+    toDetail(row) {
+      this.viewState = 2
+      this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid)
+    },
+    close() {
+      this.$emit('doback')
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
+}
 </script>
-<style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 90px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 80px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 80px !important;
-    width: calc(100% - 70px);
-  }
 
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  /deep/ .el-form-item__error {
-    margin-left: 180px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-    display: inline;
-    line-height: 1px;
-    vertical-align: middle;
-  }
+<style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue
index fcee90cc40..2df4b4ad2a 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue
@@ -124,7 +124,7 @@
           </div>
           <el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="warehouseAreaeName" label="仓库-库区" align="center" />
+            <el-table-column prop="warehouseAreaeName" label="仓库-区域-库区" align="center" />
             <el-table-column prop="ypNum" label="应盘" align="center" />
             <el-table-column prop="ypMoney" label="应盘金额" width="150" align="center" />
             <el-table-column prop="spNum" label="实盘" width="150" align="center" />