From 18cb11fe6633548f039d01b1e96481dc584b3e01 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 3 Aug 2022 14:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=9B=92=E5=A4=84=E7=90=86/?=
 =?UTF-8?q?=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../caseManage/caseList/index.vue             |  82 +++++++----
 .../caseManage/caseLog/index.vue              | 129 +++++++++++++-----
 .../archivesManage/outInStorage/data1.json    | 110 ---------------
 .../outInStorage/inStorage/data1.json         | 116 ----------------
 .../outInStorage/inStorage/index.vue          |   4 +-
 .../outInStorage/module/detailDialog.vue      |   6 +-
 .../outInStorage/outInHistory/index.vue       |  21 ++-
 .../outInStorage/outStorage/index.vue         |   5 +-
 8 files changed, 170 insertions(+), 303 deletions(-)
 delete mode 100644 src/views/archivesManage/outInStorage/data1.json
 delete mode 100644 src/views/archivesManage/outInStorage/inStorage/data1.json

diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue
index f59b540..c167c51 100644
--- a/src/views/archivesManage/caseManage/caseList/index.vue
+++ b/src/views/archivesManage/caseManage/caseList/index.vue
@@ -4,13 +4,12 @@
     <div class="head-container">
       <crudOperation :permission="permission">
         <template v-slot:right>
-          <!-- 搜索 v-model="query.enabled"-->
-          <!-- <el-select clearable size="small" class="filter-item" style="width: 100px" @change="crud.toQuery">
-            <el-option v-for="item in stateOptions" :key="item.key" :label="item.label" :value="item.key" />
-          </el-select> -->
           <el-button icon="el-icon-delete" size="mini" :disabled="!crud.selections.length" @click="handleDel(crud.selections)">删除</el-button>
-          <el-input v-model="crud.query[inputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;margin-left:10px" class="input-prepend filter-item" @keyup.enter.native="crud.toQuery">
-            <el-select slot="prepend" v-model="inputSelect" style="width: 90px" @change="crud.toQuery">
+          <el-select v-model="stateType" clearable size="small" class="filter-item" style="width: 100px; margin:0 0 0 10px;" @change="crud.toQuery">
+            <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+          <el-input v-model="crud.query[inputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;margin-left:10px" class="input-prepend filter-item" @clear="crud.toQuery" @keyup.enter.native="crud.toQuery">
+            <el-select slot="prepend" v-model="inputSelect" style="width: 90px">
               <el-option v-for="item in queryOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-input>
@@ -28,7 +27,17 @@
     <span class="right-top-line" />
     <span class="left-bottom-line" />
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :cell-class-name="cell" :data="crud.data" style="width: 100%;" height="calc(100vh - 357px)" @row-dblclick="handleDbClick" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler">
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :cell-class-name="cell"
+      :data="crud.data"
+      style="width: 100%;"
+      height="calc(100vh - 357px)"
+      @row-dblclick="handleDbClick"
+      @selection-change="crud.selectionChangeHandler"
+      @row-click="clickRowHandler"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="storageType" label="入库" align="center" min-width="56">
@@ -123,7 +132,7 @@ export default {
         download: false,
         group: false
       },
-      sort: []
+      sort: ['create_time,desc']
     })
   },
   data() {
@@ -136,24 +145,29 @@ export default {
       msgVisible: false,
       deleteVisible: false,
       verifyDialVisible: false,
-      // stateOptions: [
-      //   {
-      //     label: '全部',
-      //     value: 'center'
-      //   },
-      //   {
-      //     label: '未入',
-      //     value: 'left'
-      //   },
-      //   {
-      //     label: '待入',
-      //     value: 'right'
-      //   },
-      //   {
-      //     label: '已入',
-      //     value: 'right'
-      //   }
-      // ],
+      stateType: '全部',
+      stateOptions: [
+        {
+          label: '全部',
+          value: '全部'
+        },
+        {
+          label: '未入',
+          value: '0'
+        },
+        {
+          label: '待入',
+          value: '1'
+        },
+        {
+          label: '已入',
+          value: '2'
+        },
+        {
+          label: '待出',
+          value: '3'
+        }
+      ],
       inputSelect: 'caseName',
       queryOptions: [
         {
@@ -168,12 +182,24 @@ export default {
           label: '条形码',
           value: 'barcode'
         }
-      ],
-      storageTypeVal: null
+      ]
     }
   },
 
   methods: {
+    // 获取数据前的处理
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.storageType = null
+      if (this.stateType === '全部') {
+        this.crud.query.storageType = null
+      } else {
+        this.crud.query.storageType = this.stateType
+      }
+      // this.crud.query.caseName = null
+      // this.crud.query.tid = null
+      // this.crud.query.barcode = null
+      // this.crud.query[this.caseLogSelect] = this.caseQuery[this.caseLogSelect]
+    },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row)
     },
diff --git a/src/views/archivesManage/caseManage/caseLog/index.vue b/src/views/archivesManage/caseManage/caseLog/index.vue
index c8cb11d..a2a9d1d 100644
--- a/src/views/archivesManage/caseManage/caseLog/index.vue
+++ b/src/views/archivesManage/caseManage/caseLog/index.vue
@@ -1,39 +1,43 @@
 <template>
   <div>
     <div class="head-container">
-      <!-- <el-button v-permission="permission.download" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="handleExport">导出</el-button> -->
-      <el-button size="mini" icon="el-icon-download" style="margin-right: 6px;">导出</el-button>
-      <el-select slot="prepend" v-model="bindType" class="filter-item" style="width: 130px;height:30px;margin-right:6px" @change="initData">
+      <el-button :loading="crud.downloadLoading" :disabled="!crud.selections.length" size="mini" icon="el-icon-download" style="margin-right: 6px;" @click="downloadApi(crud.selections)">导出</el-button>
+      <el-select slot="prepend" v-model="bindType" class="filter-item" style="width: 130px; height:30px; margin-right:6px" @change="crud.toQuery">
         <el-option v-for="item in bindTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-input v-model="keyWord" clearable size="small" placeholder="请输入关键词" style="width: 200px;margin-right: 6px;" class="input-prepend filter-item" @keyup.enter.native="initData">
-        <el-select slot="prepend" v-model="type" style="width: 80px">
+      <el-input v-model="caseQuery[caseLogSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;margin-right: 6px;" class="input-prepend filter-item" @clear="crud.toQuery" @keyup.enter.native="crud.toQuery">
+        <el-select slot="prepend" v-model="caseLogSelect" style="width: 90px">
           <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-input>
       <rrOperation />
-
     </div>
     <!--表格渲染-->
-    <!-- <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 357px)" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler"> -->
-    <el-table ref="table" :data="tableData" style="width: 100%;" height="calc(100vh - 357px)">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      :row-key="getRowKey"
+      style="width: 100%;"
+      height="calc(100vh - 357px)"
+      @selection-change="crud.selectionChangeHandler"
+      @row-click="clickRowHandler"
+    >
+      <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column prop="" label="类型" align="center" />
-      <el-table-column prop="" label="盒名称" align="center" />
-      <el-table-column prop="" label="TID" align="center" />
-      <el-table-column prop="" label="条形码" align="center" />
-      <el-table-column label="存放位置" align="center">
-        <!-- <template slot-scope="scope">
-          <span v-if="scope.row.folderLocationDetails === ''">-</span>
-          <span v-else>{{ scope.row.folderLocationDetails }}</span>
-        </template> -->
+      <el-table-column prop="" label="类型" align="center" width="80">
+        <template slot-scope="scope">
+          <div>{{ scope.row.operationType | caseType }}</div>
+        </template>
       </el-table-column>
-      <el-table-column prop="" label="操作人" align="center" />
-      <el-table-column prop="update_time" width="175" label="操作时间" align="center">
-        <!-- <template slot-scope="scope">
-          <div>{{ scope.row.update_time | parseTime }}</div>
-        </template> -->
+      <el-table-column prop="caseName" label="盒名称" align="center" />
+      <el-table-column prop="tid" label="TID" align="center" />
+      <el-table-column prop="barcode" label="条形码" align="center" />
+      <el-table-column prop="create_by" label="操作人" align="center" />
+      <el-table-column prop="update_time" width="200" label="操作时间" align="center">
+        <template slot-scope="scope">
+          <div>{{ scope.row.create_time | parseTime }}</div>
+        </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
@@ -45,15 +49,27 @@
 import pagination from '@crud/Pagination'
 import CRUD, { presenter, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
+import qs from 'qs'
+import { exportFile } from '@/utils/index'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'CaseLog',
   components: { pagination, rrOperation },
+  filters: {
+    caseType(val) {
+      switch (val) {
+        case 1:
+          return '装盒'
+        case 2:
+          return '拆盒'
+      }
+    }
+  },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
-      // title: '岗位',
-      url: 'api/case/initCaseList',
+      url: 'api/case/initCaseLog',
       // crudMethod: { ...crudJob },
       optShow: {
         add: false,
@@ -61,30 +77,62 @@ export default {
         del: false,
         download: false,
         group: false
-      }
+      },
+      sort: ['create_time,desc']
     })
   },
   data() {
     return {
-      tableData: [],
-      keyWord: '',
-      bindType: '0',
+      bindType: '全部',
       bindTypeOptions: [
-        { value: '0', label: '全部' },
+        { value: '全部', label: '全部' },
         { value: '1', label: '装盒' },
         { value: '2', label: '拆盒' }
       ],
-      type: '1',
+      caseQuery: {},
+      caseLogSelect: 'caseName',
       typeOptions: [
-        { value: '1', label: '盒名称' },
-        { value: '2', label: 'TID' },
-        { value: '3', label: '条形码' }
+        { value: 'caseName', label: '盒名称' },
+        { value: 'tid', label: 'TID' },
+        { value: 'barcode', label: '条形码' }
       ]
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
   methods: {
-    initData() {
-
+    // 获取数据前的处理
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.operationType = null
+      if (this.bindType === '全部') {
+        this.crud.query.operationType = null
+      } else {
+        this.crud.query.operationType = this.bindType
+      }
+      this.crud.query.caseName = null
+      this.crud.query.tid = null
+      this.crud.query.barcode = null
+      this.crud.query[this.caseLogSelect] = this.caseQuery[this.caseLogSelect]
+    },
+    getRowKey(row) {
+      return row.id
+    },
+    selectionChangeHandler(val) {
+      this.selections = val
+    },
+    clickRowHandler(row) {
+      this.$refs.table.toggleRowSelection(row)
+    },
+    // 导出接口调用
+    downloadApi(data) {
+      const ids = data.map(item => { return item.id })
+      const params = {
+        'logIds': ids
+      }
+      exportFile(this.baseApi + '/api/case/exportCaseLogList?' + qs.stringify(params, { indices: false }))
     }
   }
 }
@@ -92,5 +140,12 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
-
+::v-deep .input-prepend{
+  .el-select .el-input__inner{
+    padding-left: 15px !important;
+  }
+  .el-input__inner {
+    padding-left: 90px !important;
+  }
+}
 </style>
diff --git a/src/views/archivesManage/outInStorage/data1.json b/src/views/archivesManage/outInStorage/data1.json
deleted file mode 100644
index 6f9a95d..0000000
--- a/src/views/archivesManage/outInStorage/data1.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "total":8,
-  "rows":[
-      {
-          "id":"29f16d62bc7242d5ba8dc84de5451f93",
-          "checkNum":"PD-202205250840",
-          "inState":"未入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40",
-          "childrenNum":11
-      },
-      {
-          "id":"3d6d548d30db426ea3d95d63f589b294",
-          "checkNum":"PD-202205250840",
-          "containPath":"未入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:41",
-          "childrenNum":11
-      },
-      {
-          "id":"45ff597e7cc64d11803ac422816b1e23",
-          "checkNum":"PD-202205250840",
-          "inState":"待入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:42",
-          "childrenNum":11
-      },
-      {
-          "id":"49106aa0d1534a7a900843d0c4531840",
-          "checkNum":"PD-202205250840",
-          "inState":"待入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:50",
-          "childrenNum":11
-      },
-      {
-          "id":"6e604355ff1e47e8b48117dca36420c7",
-          "checkNum":"PD-202205250841",
-          "inState":"未入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40",
-          "childrenNum":11
-      },
-      {
-          "id":"6f4a6631d9d3424b960793704f3757b3",
-          "checkNum":"PD-202205250841",
-          "inState":"待入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40",
-          "childrenNum":11
-
-      },
-      {
-          "id":"76e29d5c0a0541bfb1ee9da432183b15",
-          "checkNum":"PD-202205250842",
-          "inState":"待入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40"
-      },
-      {
-          "id":"a0ffdd94161146c49161662c3f9a70cd",
-          "checkNum":"PD-202205250842",
-          "inState":"未入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40"
-      }
-  ],
-  "footer":null,
-  "postparam":null
-}
\ No newline at end of file
diff --git a/src/views/archivesManage/outInStorage/inStorage/data1.json b/src/views/archivesManage/outInStorage/inStorage/data1.json
deleted file mode 100644
index c1f20e8..0000000
--- a/src/views/archivesManage/outInStorage/inStorage/data1.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "total":8,
-  "rows":[
-      {
-          "id":"29f16d62bc7242d5ba8dc84de5451f93",
-          "checkNum":"PD-202205250840",
-          "inState":"未入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-000",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40",
-          "childrenNum":11,
-          "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
-          ]
-      },
-      {
-          "id":"3d6d548d30db426ea3d95d63f589b294",
-          "checkNum":"PD-202205250840",
-          "inState":"未入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:41",
-          "childrenNum":11,
-          "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
-          ]
-      },
-      {
-          "id":"45ff597e7cc64d11803ac422816b1e23",
-          "checkNum":"PD-202205250840",
-          "inState":"待入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:42",
-          "childrenNum":11,
-          "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
-          ]
-      },
-      {
-          "id":"49106aa0d1534a7a900843d0c4531840",
-          "checkNum":"PD-202205250840",
-          "inState":"待入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:50",
-          "childrenNum":11,
-          "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
-          ]
-      },
-      {
-          "id":"6e604355ff1e47e8b48117dca36420c7",
-          "checkNum":"PD-202205250841",
-          "inState":"未入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40",
-          "childrenNum":11,
-          "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
-          ]
-      },
-      {
-          "id":"6f4a6631d9d3424b960793704f3757b3",
-          "checkNum":"PD-202205250841",
-          "inState":"待入",
-          "havePutIn":"2",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40",
-          "childrenNum":11,
-          "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
-            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
-          ]
-
-      }
-  ],
-  "footer":null,
-  "postparam":null
-}
\ No newline at end of file
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index cfcef77..ff9def2 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -9,6 +9,7 @@
           placeholder="请输入关键词"
           style="width: 300px;margin-right:10px;"
           class="input-prepend filter-item"
+          @clear="crud.toQuery"
           @keyup.enter.native="crud.toQuery"
         >
           <el-select slot="prepend" v-model="optionVal" style="width: 88px">
@@ -107,7 +108,8 @@ export default {
     return CRUD({
       url: 'api/storage/readyInto',
       // crudMethod: caseCrudMethod,
-      optShow: {}
+      optShow: {},
+      sort: []
     })
   },
   data() {
diff --git a/src/views/archivesManage/outInStorage/module/detailDialog.vue b/src/views/archivesManage/outInStorage/module/detailDialog.vue
index a765183..28d7404 100644
--- a/src/views/archivesManage/outInStorage/module/detailDialog.vue
+++ b/src/views/archivesManage/outInStorage/module/detailDialog.vue
@@ -36,7 +36,11 @@
           <el-table-column prop="securityClass" align="center" label="保密程度" width="140" />
           <el-table-column prop="department" align="center" label="部门" width="100" />
           <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
-          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="150" />
+          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="150">
+            <template>
+              <div>{{ rowData.folderLocationDetails }}</div>
+            </template>
+          </el-table-column>
           <el-table-column prop="update_time" align="center" label="创建时间" width="180">
             <template slot-scope="scope">
               <div>{{ scope.row.update_time | parseTime }}</div>
diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue
index c1ec8de..76d7724 100644
--- a/src/views/archivesManage/outInStorage/outInHistory/index.vue
+++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <div class="head-container">
-      <!-- <crudOperation /> -->
       <el-button v-permission="permission.download" :loading="crud.downloadLoading" :disabled="!selections.length" size="mini" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <el-select v-model="storageType" class="filter-item" style="width: 100px; height: 30px;margin:0 0 0 10px" @change="crud.toQuery">
         <el-option v-for="item in storageTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
@@ -11,11 +10,12 @@
         size="small"
         clearable
         placeholder="请输入关键词"
-        style="width: 300px;margin-right:10px;padding-left:10px"
+        style="width: 300px;"
         class="input-prepend filter-item"
+        @clear="crud.toQuery"
         @keyup.enter.native="crud.toQuery"
       >
-        <el-select slot="prepend" v-model="optionVal" style="width: 100px" @keyup.enter.native="crud.toQuery">
+        <el-select slot="prepend" v-model="optionVal" style="width: 88px" @keyup.enter.native="crud.toQuery">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -25,7 +25,6 @@
         </el-select>
       </el-input>
       <rrOperation />
-      <!-- <button @click="getTableData">测试按钮</button> -->
     </div>
     <!--表格渲染-->
     <el-table
@@ -87,7 +86,7 @@ export default {
   cruds() {
     return CRUD({
       url: 'api/storage/initStorageLogList',
-      sort: ['update_time,desc'],
+      sort: [],
       // crudMethod: caseCrudMethod,
       optShow: {
         add: false,
@@ -115,10 +114,10 @@ export default {
       storageType: '全部',
       storageTypeOptions: [
         { value: '全部', label: '全部' },
-        { value: '0', label: '未入' },
         { value: '1', label: '待入' },
+        { value: '3', label: '待出' },
         { value: '2', label: '已入' },
-        { value: '3', label: '待出' }
+        { value: '4', label: '已出' }
 
       ]
     }
@@ -200,4 +199,12 @@ export default {
 .setting-dialog{
   color: #fff;
 }
+::v-deep .input-prepend{
+  .el-select .el-input__inner{
+    padding-left: 15px !important;
+  }
+  .el-input__inner {
+    padding-left: 90px !important;
+  }
+}
 </style>
diff --git a/src/views/archivesManage/outInStorage/outStorage/index.vue b/src/views/archivesManage/outInStorage/outStorage/index.vue
index 573f27e..3c95aaf 100644
--- a/src/views/archivesManage/outInStorage/outStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/outStorage/index.vue
@@ -2,14 +2,13 @@
   <div>
     <div class="head-container dpflex">
       <div>
-        <el-input v-model="keyWord" size="small" clearable placeholder="请输入关键词" style="width: 300px;margin-right:10px;" class="input-prepend filter-item" @keyup.enter.native="crud.toQuery">
+        <el-input v-model="keyWord" size="small" clearable placeholder="请输入关键词" style="width: 300px;margin-right:10px;" class="input-prepend filter-item" @clear="crud.toQuery" @keyup.enter.native="crud.toQuery">
           <el-select slot="prepend" v-model="optionVal" style="width: 88px">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-input>
         <rrOperation />
       </div>
-      <!-- <button @click="getTableData">测试按钮</button> -->
       <div>
         <el-button size="mini" class="orange-btn iconfont icon-chuku-fanbai" :disabled="!selections.length" @click="handleOut">出库</el-button>
         <el-button size="mini" class="green-btn iconfont icon-chuku-fanbai" :disabled="!selections.length" @click="handleManual">人工确认</el-button>
@@ -86,7 +85,7 @@ export default {
   cruds() {
     return CRUD({
       url: 'api/storage/alReadyInto',
-      sort: ['update_time,desc'],
+      sort: [],
       // crudMethod: caseCrudMethod,
       optShow: {}
     })