diff --git a/SC-web/src/views/scm/basicInformation/areasetting/index.vue b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
index de8d926f..6ff6f454 100644
--- a/SC-web/src/views/scm/basicInformation/areasetting/index.vue
+++ b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
@@ -1,18 +1,25 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="区域名称">
-              <el-input v-model="query.mName" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.mName"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -20,274 +27,380 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary"  icon="el-icon-plus"v-has="'btn_add'"   @click="addOrUpdateHandle()" >新增
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              v-has="'btn_add'"
+              @click="addOrUpdateHandle()"
+              >新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              v-has="'btn_download'"
+              @click="exportData()"
+              >导出
             </el-button>
-<!--            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入-->
-<!--            </el-button>-->
-            <el-button type="text" icon="el-icon-download"  v-has="'btn_edit'"  @click="">编辑
+            <!--            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入-->
+            <!--            </el-button>-->
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              v-has="'btn_edit'"
+              @click=""
+              >编辑
             </el-button>
-            <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              v-has="'btn_batchRemove'"
+              @click="handleBatchRemoveDel()"
+              >批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-                    @selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号"    align="center" />
-          <el-table-column prop="mName" label="区域名称" width="300" align="center"sortable    />
-          <el-table-column prop="creatortime" label="创建时间" width="300" sortable align="center"/>
-          <el-table-column prop="creatorusername" label="创建人名称" width="300" sortable align="center"/>
-          <el-table-column prop="lastmodifytime" label="修改时间" width="300" sortable align="center"/>
-          <el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/>
-          <el-table-column label="操作" fixed="right"  width="100">
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          :hasNO="false"
+          @selection-change="handleSelectionChange"
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            type="index"
+            width="50"
+            label="序号"
+            align="center"
+          />
+          <el-table-column
+            prop="mName"
+            label="区域名称"
+            width="300"
+            align="center"
+            sortable
+          />
+          <el-table-column
+            prop="creatortime"
+            label="创建时间"
+            width="300"
+            sortable
+            align="center"
+          />
+          <el-table-column
+            prop="creatorusername"
+            label="创建人名称"
+            width="300"
+            sortable
+            align="center"
+          />
+          <el-table-column
+            prop="lastmodifytime"
+            label="修改时间"
+            width="300"
+            sortable
+            align="center"
+          />
+          <el-table-column
+            prop="lastmodifyusername"
+            label="修改人名称"
+            width="300"
+            sortable
+            align="center"
+          />
+          <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text"  v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button
+                type="text"
+                v-has="'btn_edit'"
+                @click="addOrUpdateHandle(scope.row.id)"
+                >编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)"
+                >删除
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {
-      JNPFForm,
-      ExportBox,
-      Detail
-    },
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          mName: undefined
+export default {
+  components: {
+    JNPFForm,
+    ExportBox,
+    Detail,
+  },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        mName: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        {
+          prop: "mName",
+          label: "区域名称",
         },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+        {
+          prop: "creatortime",
+          label: "创建时间",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: ''
+        {
+          prop: "creatorusername",
+          label: "创建人名称",
         },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [{
-          prop: 'mName',
-          label: '区域名称'
+        {
+          prop: "lastmodifytime",
+          label: "修改时间",
         },
-          {
-            prop: 'creatortime',
-            label: '创建时间'
-          },
-          {
-            prop: 'creatorusername',
-            label: '创建人名称'
-          },
-          {
-            prop: 'lastmodifytime',
-            label: '修改时间'
-          },
-          {
-            prop: 'lastmodifyusername',
-            label: '修改人名称'
-          }
-        ]
-      }
+        {
+          prop: "lastmodifyusername",
+          label: "修改人名称",
+        },
+      ],
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-areasetting-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-areasetting-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-areasetting-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-areasetting-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-areasetting-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-areasetting-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/areasetting/Areasetting/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = []
-          for (let i = 0; i < res.data.list.length; i++) {
-            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-              10) : '';
-            res.data.list[i].lastmodifytime = res.data.list[i].lastmodifytime ? res.data.list[i].lastmodifytime.substring(0,
-              10) : '';
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/areasetting/Areasetting/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          res.data.list[i].creatorTime = res.data.list[i].creatorTime
+            ? res.data.list[i].creatorTime.substring(0, 10)
+            : "";
+          res.data.list[i].lastmodifytime = res.data.list[i].lastmodifytime
+            ? res.data.list[i].lastmodifytime.substring(0, 10)
+            : "";
 
-            let _data = res.data.list[i]
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/areasetting/Areasetting/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/areasetting/Areasetting/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
-        })
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/areasetting/Areasetting/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: ''
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/areasetting/Areasetting/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: 'desc',
+      //   sidx: ''
+      // }
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
index 664b23b9..5a3be567 100644
--- a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
+++ b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue
@@ -1,329 +1,508 @@
 <template>
-    <div class="JNPF-common-layout">
-
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="单据编号">
-                                        <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                  <template v-if="showAll">
-                  <el-col :span="6">
-                    <el-form-item label="来源单号">
-                      <el-input v-model="query.sourceOrderNo" placeholder="请输入" clearable>  </el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="合同名称">
-                      <el-input v-model="query.contractNm" placeholder="请输入" clearable>  </el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="客户">
-                      <el-input v-model="query.customerNm" placeholder="请输入" clearable>  </el-input>
-                    </el-form-item>
-                  </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="业务日期">
-                                        <el-date-picker v-model="query.businessDate" type="daterange"
-                                                        value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                                                        end-placeholder="结束日期" >
-                                        </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                    </template>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
-                            <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                              v-if="!showAll">展开</el-button>
-                            <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                              收起</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-<!--                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增-->
-<!--                                    </el-button>-->
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-<!--                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="单据编号">
+              <el-input
+                v-model="query.documentNo"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="来源单号">
+                <el-input
+                  v-model="query.sourceOrderNo"
+                  placeholder="请输入"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="合同名称">
+                <el-input
+                  v-model="query.contractNm"
+                  placeholder="请输入"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="客户">
+                <el-input
+                  v-model="query.customerNm"
+                  placeholder="请输入"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务日期">
+                <el-date-picker
+                  v-model="query.businessDate"
+                  type="daterange"
+                  value-format="timestamp"
+                  format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </template>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-down"
+                @click="showAll = true"
+                v-if="!showAll"
+                >展开</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-up"
+                @click="showAll = false"
+                v-else
+              >
+                收起</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <!--                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增-->
+            <!--                                    </el-button>-->
+            <el-button type="text" icon="el-icon-download" @click="exportData()"
+              >导出
+            </el-button>
+            <!--                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
                                     </el-button> -->
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange" custom-column border>
-                            <el-table-column prop="businessDate" label="业务日期" sortable width="150" align="center"
-/>
-                            <el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center"
-/>
-                            <el-table-column prop="customerNm" label="客户" sortable width="200" align="center"
-/>
-                            <el-table-column prop="amount" label="金额" sortable width="150" align="center"
-/>
-                            <el-table-column prop="quantity" label="数量" sortable width="150" align="center"
-/>
-                                <el-table-column label="币别 " width="150" prop="currency" algin="center" sortable
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.currency | dynamicText(currencyOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="invoiceAmount" label="发票金额"  sortable width="150" align="center"
-/>
-                            <el-table-column prop="invoiceQuantity" label="发票数量" sortable width="150" align="center"
-/>
-                            <el-table-column prop="sourceOrderNo" label="来源单号" sortable width="200" align="center"
-/>
-                            <el-table-column prop="contractNm" label="合同名称" sortable width="200" align="center"
-/>
-<!--                                <el-table-column label="单据状态 " width="150" prop="status" algin="center"-->
-<!--&gt;-->
-<!--                                    <template slot-scope="scope">-->
-<!--                                        {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--                                    </template>-->
-<!--                                </el-table-column>-->
-                  <el-table-column prop="status" label="单据状态" sortable width="150" align="center">
-                    <template slot-scope="scope">
-                      <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-                      <el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
-                      <el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
-                    </template>
-                  </el-table-column>
-                            <el-table-column prop="remark" label="备注" sortable width="150" align="center"
-/>
-                        <el-table-column label="操作" fixed="right" width="150" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
-                                        </el-button>
-<!--                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button> -->
-                                        <el-button type="text"
-                                                   @click="goDetail(scope.row.id)"v-has="'btn_detail'">详情
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
+            </el-tooltip>
+            <screenfull isContainer />
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="businessDate"
+            label="业务日期"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="documentNo"
+            label="单据编号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="customerNm"
+            label="客户"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="amount"
+            label="金额"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="quantity"
+            label="数量"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            label="币别 "
+            width="150"
+            prop="currency"
+            algin="center"
+            sortable
+          >
+            <template slot-scope="scope">
+              {{ scope.row.currency | dynamicText(currencyOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="invoiceAmount"
+            label="发票金额"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="invoiceQuantity"
+            label="发票数量"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="sourceOrderNo"
+            label="来源单号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="contractNm"
+            label="合同名称"
+            sortable
+            width="200"
+            align="center"
+          />
+          <!--                                <el-table-column label="单据状态 " width="150" prop="status" algin="center"-->
+          <!--&gt;-->
+          <!--                                    <template slot-scope="scope">-->
+          <!--                                        {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--                                    </template>-->
+          <!--                                </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="150"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >审批中</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已审批</el-tag
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remark"
+            label="备注"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row.id)"
+                v-has="'btn_edit'"
+                >编辑
+              </el-button>
+              <!--                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button> -->
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
+      </div>
     </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
+  </div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
-
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                showAll: false,
-                detailVisible: false,
-                query: {
-                                documentNo:undefined,
-                                businessDate:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'businessDate', label: '业务日期'},
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'customerNm', label: '客户'},
-                    {prop: 'amount', label: '金额'},
-                    {prop: 'quantity', label: '数量'},
-                    {prop: 'currency', label: '币别 '},
-                    {prop: 'invoiceAmount', label: '发票金额'},
-                    {prop: 'invoiceQuantity', label: '发票数量'},
-                    {prop: 'sourceOrderNo', label: '销售订单号'},
-                    {prop: 'contractNm', label: '合同名称'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'remark', label: '备注'},
-                ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
-                            statusProps:{"label":"fullName","value":"id"},
-            }
-        },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
-        },
-        created() {
-                this.initData()
-        },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/arinvoices/Arinvoices/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/arinvoices/Arinvoices/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 2500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/arinvoices/Arinvoices/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/arinvoices/Arinvoices/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                // for (let key in this.query) {
-                //     this.query[key] = undefined
-                // }
-                this.search()
-            },
-            resetAll() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
-        }
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        documentNo: undefined,
+        businessDate: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "businessDate", label: "业务日期" },
+        { prop: "documentNo", label: "单据编号" },
+        { prop: "customerNm", label: "客户" },
+        { prop: "amount", label: "金额" },
+        { prop: "quantity", label: "数量" },
+        { prop: "currency", label: "币别 " },
+        { prop: "invoiceAmount", label: "发票金额" },
+        { prop: "invoiceQuantity", label: "发票数量" },
+        { prop: "sourceOrderNo", label: "销售订单号" },
+        { prop: "contractNm", label: "合同名称" },
+        { prop: "status", label: "单据状态 " },
+        { prop: "remark", label: "备注" },
+      ],
+      currencyOptions: [
+        { fullName: "人民币", id: "0" },
+        { fullName: "美元", id: "1" },
+        { fullName: "英镑", id: "2" },
+      ],
+      currencyProps: { label: "fullName", value: "id" },
+      statusOptions: [
+        { fullName: "已保存", id: "0" },
+        { fullName: "审批中", id: "1" },
+        { fullName: "已审批", id: "2" },
+      ],
+      statusProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
+    },
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-arinvoices-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-arinvoices-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-arinvoices-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-arinvoices-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
     }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-arinvoices-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem(
+      "scm-basicInformation-arinvoices-query",
+      json_query
+    );
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
+    },
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/arinvoices/Arinvoices/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
+
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `/api/arinvoices/Arinvoices/${id}`,
+            method: "DELETE",
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              },
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `/api/arinvoices/Arinvoices/batchRemove/${ids}`,
+            method: "DELETE",
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              },
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/arinvoices/Arinvoices/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //         currentPage: 1,
+      //         pageSize: 20,
+      //     sort: "desc",
+      //     sidx: "",
+      // }
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //     this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index 64526295..b23d46eb 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -1,28 +1,46 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-              <el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.documentNo"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="客户名称">
-              <el-input v-model="query.customerNm" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.customerNm"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="合同名称">
-              <el-input v-model="query.contractNm" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.contractNm"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -30,502 +48,667 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()" v-has="'btn_add'">新增
+            <el-button
+              type="text"
+              icon="el-icon-plus"
+              @click="addOrUpdateHandle()"
+              v-has="'btn_add'"
+              >新增
             </el-button>
-            <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'"
+              >批量删除
             </el-button>
-<!--            <el-button type="text" icon="el-icon-check" @click="exportData()">审核-->
-<!--            </el-button>-->
-<!--            <el-button type="text" icon="el-icon-close" @click="exportData()">弃审-->
-<!--            </el-button>-->
-<!--            <el-button type="text" icon="el-icon-check" @click="commit()">提交-->
-<!--            </el-button>-->
-            <el-button type="text" icon="el-icon-check" @click="confirmprice()"v-has="'btn_confirmprice'">认款
+            <!--            <el-button type="text" icon="el-icon-check" @click="exportData()">审核-->
+            <!--            </el-button>-->
+            <!--            <el-button type="text" icon="el-icon-close" @click="exportData()">弃审-->
+            <!--            </el-button>-->
+            <!--            <el-button type="text" icon="el-icon-check" @click="commit()">提交-->
+            <!--            </el-button>-->
+            <el-button
+              type="text"
+              icon="el-icon-check"
+              @click="confirmprice()"
+              v-has="'btn_confirmprice'"
+              >认款
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
             <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c 
-          @selection-change="handleSelectionChange" custom-column border>
-          <el-table-column prop="documentNo" label="单据编号"    sortable width="200" align="center" />
-          <el-table-column prop="customerNm" label="客户名称"    sortable width="200" align="center" />
-          <el-table-column prop="contractNm" label="合同名称"    sortable width="200" align="center" />
-          <el-table-column label="币别 " width="80" sortable prop="currency" align="center" >
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentNo"
+            label="单据编号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="customerNm"
+            label="客户名称"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="contractNm"
+            label="合同名称"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            label="币别 "
+            width="80"
+            sortable
+            prop="currency"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="amountCollected" sortable label="收款金额" width="150" align="center" />
-          <el-table-column prop="collectionCount" sortable label="收款账户" width="150" align="center" />
-          <el-table-column prop="collectionBank" sortable label="收款银行" width="150" align="center" />
-          <el-table-column label="收款类型" sortable width="150" prop="paymentType" align="center" >
+          <el-table-column
+            prop="amountCollected"
+            sortable
+            label="收款金额"
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="collectionCount"
+            sortable
+            label="收款账户"
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="collectionBank"
+            sortable
+            label="收款银行"
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            label="收款类型"
+            sortable
+            width="150"
+            prop="paymentType"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column label="结算类型" sortable width="150" prop="settlementType" align="center" >
+          <el-table-column
+            label="结算类型"
+            sortable
+            width="150"
+            prop="settlementType"
+            align="center"
+          >
             <template slot-scope="scope">
-              {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
+              {{
+                scope.row.settlementType | dynamicText(settlementTypeOptions)
+              }}
             </template>
           </el-table-column>
-<!--          <el-table-column label="单据状态" sortable width="150" prop="status" align="center" >-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column prop="status" label="单据状态" sortable width="150" align="center">
+          <!--          <el-table-column label="单据状态" sortable width="150" prop="status" align="center" >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-              <el-tag type="info" v-else-if="scope.row.status==1">已提交</el-tag>
-              <el-tag type="warning" v-else-if="scope.row.status==2">已认款</el-tag>
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >已提交</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已认款</el-tag
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
-          <el-table-column label="操作"  fixed="right" width="150">
+          <el-table-column
+            prop="creatorUserName"
+            sortable
+            label="制单人"
+            width="150"
+            align="center"
+          />
+          <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)"v-has="'btn_edit'">编辑
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)"v-has="'btn_batchRemove'">删除
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                @click="handleDel(scope.row)"
+                v-has="'btn_batchRemove'"
+                >删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)"v-has="'btn_detail'">详情
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
               </el-button>
 
-<!--              <el-button type="text" @click="">撤回申请</el-button>-->
-<!--              <el-button type="text" @click="">审核</el-button>-->
-<!--              <el-button type="text" @click="">弃审</el-button>-->
-<!--              <el-button type="text" @click="">提交</el-button>-->
-
+              <!--              <el-button type="text" @click="">撤回申请</el-button>-->
+              <!--              <el-button type="text" @click="">审核</el-button>-->
+              <!--              <el-button type="text" @click="">弃审</el-button>-->
+              <!--              <el-button type="text" @click="">提交</el-button>-->
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {
-      JNPFForm,
-      ExportBox,
-      Detail
-    },
-    data() {
-      return {
-        showAll: false,
-        detailVisible: false,
-        query: {
-          documentNo: undefined,
+export default {
+  components: {
+    JNPFForm,
+    ExportBox,
+    Detail,
+  },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        documentNo: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      multipleSelectionItem: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        {
+          prop: "documentNo",
+          label: "单据编号",
         },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+        {
+          prop: "customerNm",
+          label: "客户名称",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        multipleSelectionItem: [],
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
+        {
+          prop: "contractNm",
+          label: "合同名称",
         },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [{
-            prop: 'documentNo',
-            label: '单据编号'
-          },
-          {
-            prop: 'customerNm',
-            label: '客户名称'
-          },
-          {
-            prop: 'contractNm',
-            label: '合同名称'
-          },
-          {
-            prop: 'currency',
-            label: '币别 '
-          },
-          {
-            prop: 'amountCollected',
-            label: '收款金额'
-          },
-          {
-            prop: 'collectionCount',
-            label: '收款账户'
-          },
-          {
-            prop: 'collectionBank',
-            label: '收款银行'
-          },
-          {
-            prop: 'paymentType',
-            label: '收款类型 '
-          },
-          {
-            prop: 'settlementType',
-            label: '结算类型'
-          },
-          {
-            prop: 'status',
-            label: '单据状态 '
-          },
-          {
-            prop: 'creatorUserName',
-            label: '制单人'
-          },
-        ],
-        paymentTypeOptions: [{
-          "fullName": "货款",
-          "id": "0"
-        }, {
-          "fullName": "运费",
-          "id": "1"
-        }, {
-          "fullName": "仓储",
-          "id": "2"
-        }],
-        paymentTypeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "currency",
+          label: "币别 ",
         },
-        currencyOptions: [{
-          "fullName": "人民币",
-          "id": "0"
-        }, {
-          "fullName": "美元",
-          "id": "1"
-        }, {
-          "fullName": "英镑",
-          "id": "2"
-        }],
-        currencyProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "amountCollected",
+          label: "收款金额",
         },
-        settlementTypeOptions: [{
-          "fullName": "现金",
-          "id": "0"
-        }, {
-          "fullName": "赊购",
-          "id": "1"
-        }, {
-          "fullName": "网银",
-          "id": "2"
-        }, {
-          "fullName": "银企直连",
-          "id": "3"
-        }, {
-          "fullName": "银票",
-          "id": "4"
-        }, {
-          "fullName": "商票",
-          "id": "5"
-        }],
-        settlementTypeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "collectionCount",
+          label: "收款账户",
         },
-        statusOptions: [{
-          "fullName": "已保存",
-          "id": "0"
-        }, {
-          "fullName": "已提交",
-          "id": "1"
-        }, {
-          "fullName": "已认款",
-          "id": "2"
-        }, ],
-        statusProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "collectionBank",
+          label: "收款银行",
         },
-      }
-    },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      this.initData()
-    },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
+        {
+          prop: "paymentType",
+          label: "收款类型 ",
+        },
+        {
+          prop: "settlementType",
+          label: "结算类型",
+        },
+        {
+          prop: "status",
+          label: "单据状态 ",
+        },
+        {
+          prop: "creatorUserName",
+          label: "制单人",
+        },
+      ],
+      paymentTypeOptions: [
+        {
+          fullName: "货款",
+          id: "0",
+        },
+        {
+          fullName: "运费",
+          id: "1",
+        },
+        {
+          fullName: "仓储",
+          id: "2",
+        },
+      ],
+      paymentTypeProps: {
+        label: "fullName",
+        value: "id",
       },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
+      currencyOptions: [
+        {
+          fullName: "人民币",
+          id: "0",
+        },
+        {
+          fullName: "美元",
+          id: "1",
+        },
+        {
+          fullName: "英镑",
+          id: "2",
+        },
+      ],
+      currencyProps: {
+        label: "fullName",
+        value: "id",
       },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/collection/Collection/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
-
-          this.listLoading = false
-        })
+      settlementTypeOptions: [
+        {
+          fullName: "现金",
+          id: "0",
+        },
+        {
+          fullName: "赊购",
+          id: "1",
+        },
+        {
+          fullName: "网银",
+          id: "2",
+        },
+        {
+          fullName: "银企直连",
+          id: "3",
+        },
+        {
+          fullName: "银票",
+          id: "4",
+        },
+        {
+          fullName: "商票",
+          id: "5",
+        },
+      ],
+      settlementTypeProps: {
+        label: "fullName",
+        value: "id",
       },
-      handleDel(row) {
-        if(row.Status != '0'){
-          this.$message({
-          	type: 'error',
-          	message: '已认款无法删除',
-          	duration: 2500,
-          })
-          return
+      statusOptions: [
+        {
+          fullName: "已保存",
+          id: "0",
+        },
+        {
+          fullName: "已提交",
+          id: "1",
+        },
+        {
+          fullName: "已认款",
+          id: "2",
+        },
+      ],
+      statusProps: {
+        label: "fullName",
+        value: "id",
+      },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
+    },
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-collection-pageSize") !== null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-collection-pageSize")
+      );
+    }
+    if (sessionStorage.getItem("scm-basicInformation-collection-query") !== null) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-collection-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-collection-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-collection-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
+    },
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/collection/Collection/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
         }
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.list = _list;
+        this.total = res.data.pagination.total;
+
+        this.listLoading = false;
+      });
+    },
+    handleDel(row) {
+      if (row.Status != "0") {
+        this.$message({
+          type: "error",
+          message: "已认款无法删除",
+          duration: 2500,
+        });
+        return;
+      }
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/collection/Collection/${row.id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {});
-      },
-      handleSelectionChange(val) {
-        this.multipleSelectionItem = val
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        var statusFlag = true;
-          this.multipleSelectionItem.forEach((item, index)=>{
-            if(item.status != '0'){
-              statusFlag = false;
-            }
           });
-          if(!statusFlag){
-            this.$message({
-            	type: 'error',
-            	message: '已认款无法删除',
-              duration: 1000
-            });
-            return
-          }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/collection/Collection/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
-          })
-        }).catch(() => {})
-      },
-      commit(){
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      this.multipleSelectionItem = val;
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      var statusFlag = true;
+      this.multipleSelectionItem.forEach((item, index) => {
+        if (item.status != "0") {
+          statusFlag = false;
         }
-        if (this.multipleSelection.length === 1) {
-          let ids = this.multipleSelection.join()
+      });
+      if (!statusFlag) {
+        this.$message({
+          type: "error",
+          message: "已认款无法删除",
+          duration: 1000,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
-            url: `/api/collection/Collection/commit/${ids}`,
-            method: 'POST',
-          }).then(res => {
+            url: `/api/collection/Collection/batchRemove/${ids}`,
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }
-        if (this.multipleSelection.length > 1){
-          this.$message({
-            type: 'error',
-            message: '请选择单条数据',
-            duration: 2500
-          })
-        }
-      },
-      confirmprice() {
-        if (!this.multipleSelection.length) {
+          });
+        })
+        .catch(() => {});
+    },
+    commit() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelection.length === 1) {
+        let ids = this.multipleSelection.join();
+        request({
+          url: `/api/collection/Collection/commit/${ids}`,
+          method: "POST",
+        }).then((res) => {
           this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        let ids = this.multipleSelection.join()
-        if (this.multipleSelection.length === 1) {
+            type: "success",
+            message: res.msg,
+            onClose: () => {
+              this.initData();
+            },
+          });
+        });
+      }
+      if (this.multipleSelection.length > 1) {
+        this.$message({
+          type: "error",
+          message: "请选择单条数据",
+          duration: 2500,
+        });
+      }
+    },
+    confirmprice() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      let ids = this.multipleSelection.join();
+      if (this.multipleSelection.length === 1) {
         request({
           url: `/api/collection/Collection/confirmprice/${ids}`,
-          method: 'POST',
-        }).then(res => {
+          method: "POST",
+        }).then((res) => {
           this.$message({
-            type: 'success',
+            type: "success",
             message: res.msg,
             onClose: () => {
-              this.initData()
-            }
+              this.initData();
+            },
           });
-        })
+        });
         if (this.multipleSelection.length > 1) {
           this.$message({
-            type: 'error',
-            message: '请选择单条数据',
-            duration: 2500
-          })
-        }
+            type: "error",
+            message: "请选择单条数据",
+            duration: 2500,
+          });
         }
-      },
-      addOrUpdateHandle(row, isDetail) {
-        var id = undefined;
-        if (row){
-          id = row.id;
-          if(row.status != '0'){
-            var msg = '';
-            if(row.status == '1'){
-              msg = '已提交';
-            }else if(row.status == '2'){
-              msg = '已认款';
-            }
-            this.$message({
-              type: 'error',
-              message: msg +'无法编辑',
-              duration: 2500
-            });
-            return
+      }
+    },
+    addOrUpdateHandle(row, isDetail) {
+      var id = undefined;
+      if (row) {
+        id = row.id;
+        if (row.status != "0") {
+          var msg = "";
+          if (row.status == "1") {
+            msg = "已提交";
+          } else if (row.status == "2") {
+            msg = "已认款";
           }
+          this.$message({
+            type: "error",
+            message: msg + "无法编辑",
+            duration: 2500,
+          });
+          return;
         }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/collection/Collection/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
       }
-    }
-  }
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/collection/Collection/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
index 1861d973..e0888ea8 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
@@ -1,23 +1,34 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="编码">
-              <el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.inventoryOrgCode"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="名称">
-              <el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.inventoryOrgName"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -25,205 +36,267 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-<!--            <el-button type="primary" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
-<!--            </el-button>-->
+            <!--            <el-button type="primary" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+            <!--            </el-button>-->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
-          <el-table-column prop="inventoryOrgCode" label="编码" width="0" align="left"
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+        >
+          <el-table-column
+            prop="inventoryOrgCode"
+            label="编码"
+            width="0"
+            align="left"
           />
-          <el-table-column prop="inventoryOrgName" label="名称" width="0" align="left"
+          <el-table-column
+            prop="inventoryOrgName"
+            label="名称"
+            width="0"
+            align="left"
           />
-          <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
+          <el-table-column
+            prop="creatorTime"
+            label="创建时间"
+            width="0"
+            align="left"
           />
-          <el-table-column prop="companyId" label="所属组织" width="0" align="left"
+          <el-table-column
+            prop="companyId"
+            label="所属组织"
+            width="0"
+            align="left"
           />
-          <el-table-column label="操作" fixed="right"
-                           width="100">
+          <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-<!--              <el-button type="text"  v-has="'btn_edit'"-->
-<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
-<!--              </el-button>-->
-<!--              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
-<!--              </el-button>-->
-              <el-button type="text"
-                         @click="goDetail(scope.row.id)">详情
+              <!--              <el-button type="text"  v-has="'btn_edit'"-->
+              <!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+              <!--              </el-button>-->
+              <!--              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+              <!--              </el-button>-->
+              <el-button type="text" @click="goDetail(scope.row.id)"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {JNPFForm, ExportBox, Detail},
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          inventoryOrgCode: undefined,
-          inventoryOrgName: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
-        },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          {prop: 'inventoryOrgCode', label: '编码'},
-          {prop: 'inventoryOrgName', label: '名称'},
-          {prop: 'creatorTime', label: '创建时间'},
-          {prop: 'companyId', label: '所属组织'},
-        ],
-        companyIdOptions: [],
-        companyIdProps: {"label": "F_FullName", "value": "F_Id"},
-      }
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        inventoryOrgCode: undefined,
+        inventoryOrgName: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "inventoryOrgCode", label: "编码" },
+        { prop: "inventoryOrgName", label: "名称" },
+        { prop: "creatorTime", label: "创建时间" },
+        { prop: "companyId", label: "所属组织" },
+      ],
+      companyIdOptions: [],
+      companyIdProps: { label: "F_FullName", value: "F_Id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-inventoryOrd-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-inventoryOrd-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-inventoryOrd-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-inventoryOrd-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-inventoryOrd-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-inventoryOrd-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({column, prop, order}) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/example/InventoryOrg/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/InventoryOrg/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/InventoryOrg/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {
-        });
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
+          });
         })
-      },
-      download(data) {
-        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
-        request({
-          url: `/api/example/InventoryOrg/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/InventoryOrg/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "creatorTime",
+      // }
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
index 0c07332c..46166ace 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
@@ -1,23 +1,34 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="编码">
-              <el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.inventoryOrgDetailCode"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="名称">
-              <el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.inventoryOrgDetailName"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -25,205 +36,272 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-<!--            <el-button type="primary"  v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
-<!--            </el-button>-->
-            <el-button type="text"  v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
+            <!--            <el-button type="primary"  v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+            <!--            </el-button>-->
+            <el-button
+              type="text"
+              v-has="'btn_download'"
+              icon="el-icon-download"
+              @click="exportData()"
+              >导出
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
-          <el-table-column prop="inventoryOrgDetailCode" label="编码" width="0" align="left"
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+        >
+          <el-table-column
+            prop="inventoryOrgDetailCode"
+            label="编码"
+            width="0"
+            align="left"
           />
-          <el-table-column prop="inventoryOrgDetailName" label="名称" width="0" align="left"
+          <el-table-column
+            prop="inventoryOrgDetailName"
+            label="名称"
+            width="0"
+            align="left"
           />
-          <el-table-column prop="inventoryId" label="库存组织" width="0" align="left"
+          <el-table-column
+            prop="inventoryId"
+            label="库存组织"
+            width="0"
+            align="left"
           />
-          <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
+          <el-table-column
+            prop="creatorTime"
+            label="创建时间"
+            width="0"
+            align="left"
           />
-          <el-table-column label="操作" fixed="right"
-                           width="100">
+          <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-<!--              <el-button type="text" v-has="'btn_edit'"-->
-<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
-<!--              </el-button>-->
-<!--              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
-<!--              </el-button>-->
-              <el-button type="text"
-                         @click="goDetail(scope.row.id)">详情
+              <!--              <el-button type="text" v-has="'btn_edit'"-->
+              <!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+              <!--              </el-button>-->
+              <!--              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+              <!--              </el-button>-->
+              <el-button type="text" @click="goDetail(scope.row.id)"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {JNPFForm, ExportBox, Detail},
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          inventoryOrgDetailCode: undefined,
-          inventoryOrgDetailName: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
-        },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          {prop: 'inventoryOrgDetailCode', label: '编码'},
-          {prop: 'inventoryOrgDetailName', label: '名称'},
-          {prop: 'inventoryId', label: '库存组织'},
-          {prop: 'creatorTime', label: '创建时间'},
-        ],
-      }
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        inventoryOrgDetailCode: undefined,
+        inventoryOrgDetailName: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "inventoryOrgDetailCode", label: "编码" },
+        { prop: "inventoryOrgDetailName", label: "名称" },
+        { prop: "inventoryId", label: "库存组织" },
+        { prop: "creatorTime", label: "创建时间" },
+      ],
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-inventoryOrdDetail-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-inventoryOrdDetail-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-inventoryOrdDetail-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-inventoryOrdDetail-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-inventoryOrdDetail-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-inventoryOrdDetail-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({column, prop, order}) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/example/InventoryOrgDetail/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/InventoryOrgDetail/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/InventoryOrgDetail/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {
-        });
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
+          });
         })
-      },
-      download(data) {
-        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
-        request({
-          url: `/api/example/InventoryOrgDetail/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/InventoryOrgDetail/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "creatorTime",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/invoices/index.vue b/SC-web/src/views/scm/basicInformation/invoices/index.vue
index 40c580db..f2ee6929 100644
--- a/SC-web/src/views/scm/basicInformation/invoices/index.vue
+++ b/SC-web/src/views/scm/basicInformation/invoices/index.vue
@@ -1,47 +1,84 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-              <el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.documentNo"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="采购订单号">
-                <el-input v-model="query.souceno" placeholder="请输入" clearable> </el-input>
+                <el-input
+                  v-model="query.souceno"
+                  placeholder="请输入"
+                  clearable
+                >
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="采购合同">
-                <el-input v-model="query.purchaseName" placeholder="请输入" clearable></el-input>
+                <el-input
+                  v-model="query.purchaseName"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="供应商">
-                <el-input v-model="query.supplierName" placeholder="请输入" clearable></el-input>
+                <el-input
+                  v-model="query.supplierName"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="制单日期">
-                <el-date-picker v-model="query.creatorTime" type="daterange"
-                                value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                                end-placeholder="结束日期">
+                <el-date-picker
+                  v-model="query.creatorTime"
+                  type="daterange"
+                  value-format="timestamp"
+                  format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </template>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">展开</el-button>
-              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                收起</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-down"
+                @click="showAll = true"
+                v-if="!showAll"
+                >展开</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-up"
+                @click="showAll = false"
+                v-else
+              >
+                收起</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -51,378 +88,539 @@
           <div>
             <!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button> -->
-            <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
             </el-button>
             <!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
             <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" custom-column border>
-          <el-table-column prop="documentNo" label="单据编号"    width="200" align="center" sortable="custom" />
-          <el-table-column prop="businessDate" label="业务日期"    width="150" align="center" sortable="custom" />
-          <el-table-column prop="purchaseorderId" label="采购订单号" width="150" align="center" sortable="custom" />
-          <el-table-column prop="contractId" label="合同名称" width="150" align="center" sortable="custom" />
-          <el-table-column prop="supplierId" label="供应商" width="150" align="center" sortable="custom" />
-          <el-table-column prop="amount" label="金额" width="150" align="center" sortable="custom" />
-          <el-table-column prop="quantity" label="结算重量" width="150" align="center" sortable="custom" />
-          <el-table-column label="发票类型" width="150" prop="invoiceType" align="center" sortable="custom">
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentNo"
+            label="单据编号"
+            width="200"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="businessDate"
+            label="业务日期"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="purchaseorderId"
+            label="采购订单号"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="contractId"
+            label="合同名称"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="supplierId"
+            label="供应商"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="amount"
+            label="金额"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="quantity"
+            label="结算重量"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            label="发票类型"
+            width="150"
+            prop="invoiceType"
+            align="center"
+            sortable="custom"
+          >
             <template slot-scope="scope">
               {{ scope.row.invoiceType | dynamicText(invoiceTypeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column label="币别 " width="150" prop="currency" align="center" sortable="custom">
+          <el-table-column
+            label="币别 "
+            width="150"
+            prop="currency"
+            align="center"
+            sortable="custom"
+          >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="invoiceAmount" label="发票金额" width="150" align="center" sortable="custom" />
-          <el-table-column prop="invoiceQuantity" label="发票数量" width="150" align="center" sortable="custom" />
-<!--          <el-table-column label="单据状态" width="150" prop="status"sortable="custom" align="center" >-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column prop="status" label="单据状态" sortable width="150" align="center">
+          <el-table-column
+            prop="invoiceAmount"
+            label="发票金额"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="invoiceQuantity"
+            label="发票数量"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <!--          <el-table-column label="单据状态" width="150" prop="status"sortable="custom" align="center" >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-              <el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
-              <el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >审批中</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已审批</el-tag
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" />
-          <el-table-column label="操作" fixed="right"  width="150" align="center" >
+          <el-table-column
+            prop="remark"
+            label="备注"
+            width="150"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)"  v-has="'btn_edit'">编辑
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
               </el-button>
               <!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button> -->
-              <el-button type="text" @click="goDetail(scope.row.id)"  v-has="'btn_detail'">详情
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {
-      JNPFForm,
-      ExportBox,
-      Detail
-    },
-    data() {
-      return {
-        showAll: false,
-        detailVisible: false,
-        query: {
-          documentNo: undefined,
+export default {
+  components: {
+    JNPFForm,
+    ExportBox,
+    Detail,
+  },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        documentNo: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        {
+          prop: "documentNo",
+          label: "单据编号",
         },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+        {
+          prop: "businessDate",
+          label: "业务日期",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
+        {
+          prop: "amount",
+          label: "金额",
         },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [{
-            prop: 'documentNo',
-            label: '单据编号'
-          },
-          {
-            prop: 'businessDate',
-            label: '业务日期'
-          },
-          {
-            prop: 'amount',
-            label: '金额'
-          },
-          {
-            prop: 'quantity',
-            label: '数量'
-          },
-          {
-            prop: 'invoiceType',
-            label: '发票类型'
-          },
-          {
-            prop: 'currency',
-            label: '币别 '
-          },
-          {
-            prop: 'remark',
-            label: '备注'
-          },
-          {
-            prop: 'status',
-            label: '单据状态'
-          },
-          {
-            prop: 'invoiceAmount',
-            label: '发票金额'
-          },
-          {
-            prop: 'invoiceQuantity',
-            label: '发票数量'
-          },
-          {
-            prop: 'purchaseorderId',
-            label: '采购订单号'
-          },
-          {
-            prop: 'contractId',
-            label: '合同名称'
-          },
-          {
-            prop: 'supplierId',
-            label: '供应商'
-          },
-        ],
-        invoiceTypeOptions: [{
-          "fullName": "普通增值税发票",
-          "id": "1"
-        }, {
-          "fullName": "专用增值税发票",
-          "id": "2"
-        }, {
-          "fullName": "增值税电子普通发票",
-          "id": "3"
-        }, {
-          "fullName": "增值税电子发票",
-          "id": "4"
-        }],
-        invoiceTypeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "quantity",
+          label: "数量",
         },
-        currencyOptions: [{
-          "fullName": "人民币",
-          "id": "0"
-        }, {
-          "fullName": "美元",
-          "id": "1"
-        }, {
-          "fullName": "英镑",
-          "id": "2"
-        }],
-        currencyProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "invoiceType",
+          label: "发票类型",
         },
-        statusOptions: [{
-          "fullName": "已保存",
-          "id": "0"
-        }, {
-          "fullName": "审批中",
-          "id": "1"
-        }, {
-          "fullName": "已审批",
-          "id": "2"
-        }],
-        statusProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "currency",
+          label: "币别 ",
         },
-      }
+        {
+          prop: "remark",
+          label: "备注",
+        },
+        {
+          prop: "status",
+          label: "单据状态",
+        },
+        {
+          prop: "invoiceAmount",
+          label: "发票金额",
+        },
+        {
+          prop: "invoiceQuantity",
+          label: "发票数量",
+        },
+        {
+          prop: "purchaseorderId",
+          label: "采购订单号",
+        },
+        {
+          prop: "contractId",
+          label: "合同名称",
+        },
+        {
+          prop: "supplierId",
+          label: "供应商",
+        },
+      ],
+      invoiceTypeOptions: [
+        {
+          fullName: "普通增值税发票",
+          id: "1",
+        },
+        {
+          fullName: "专用增值税发票",
+          id: "2",
+        },
+        {
+          fullName: "增值税电子普通发票",
+          id: "3",
+        },
+        {
+          fullName: "增值税电子发票",
+          id: "4",
+        },
+      ],
+      invoiceTypeProps: {
+        label: "fullName",
+        value: "id",
+      },
+      currencyOptions: [
+        {
+          fullName: "人民币",
+          id: "0",
+        },
+        {
+          fullName: "美元",
+          id: "1",
+        },
+        {
+          fullName: "英镑",
+          id: "2",
+        },
+      ],
+      currencyProps: {
+        label: "fullName",
+        value: "id",
+      },
+      statusOptions: [
+        {
+          fullName: "已保存",
+          id: "0",
+        },
+        {
+          fullName: "审批中",
+          id: "1",
+        },
+        {
+          fullName: "已审批",
+          id: "2",
+        },
+      ],
+      statusProps: {
+        label: "fullName",
+        value: "id",
+      },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-invoices-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-invoices-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-invoices-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-invoices-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-invoices-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem(
+      "scm-basicInformation-invoices-query",
+      json_query
+    );
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/invoices/Invoices/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/invoices/Invoices/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/invoices/Invoices/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {});
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/invoices/Invoices/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {})
-      },
-      addOrUpdateHandle(row, isDetail) {
-        var id = undefined;
-        if(row){
-          id = row.id;
-          if(row.status != '0'){
-            this.$message({
-              type: 'error',
-              message: '审批中或已审批无法编辑',
-              duration: 2500,
-            });
-            return
-          }
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/invoices/Invoices/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          });
         })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
+        .catch(() => {});
+    },
+    addOrUpdateHandle(row, isDetail) {
+      var id = undefined;
+      if (row) {
+        id = row.id;
+        if (row.status != "0") {
+          this.$message({
+            type: "error",
+            message: "审批中或已审批无法编辑",
+            duration: 2500,
+          });
+          return;
         }
-        this.search()
       }
-    }
-  }
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/invoices/Invoices/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
index 9e6c6ea3..66cc21b3 100644
--- a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
+++ b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
@@ -1,28 +1,42 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="设备名称">
-              <el-input v-model="query.mName" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.mName"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="区域">
-              <el-select v-model="query.monitoringId" placeholder="请选择区域"
-                         clearable>
-                <el-option v-for="(item, index) in monitoringIdOptions" :key="index"
-                           :label="item.m_name" :value="item.id"
-                           :disabled="item.disabled"></el-option>
+              <el-select
+                v-model="query.monitoringId"
+                placeholder="请选择区域"
+                clearable
+              >
+                <el-option
+                  v-for="(item, index) in monitoringIdOptions"
+                  :key="index"
+                  :label="item.m_name"
+                  :value="item.id"
+                  :disabled="item.disabled"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -30,272 +44,399 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button
+              type="primary"
+              v-has="'btn_add'"
+              icon="el-icon-plus"
+              @click="addOrUpdateHandle()"
+              >新增
             </el-button>
-            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
+            <el-button
+              type="text"
+              v-has="'btn_download'"
+              icon="el-icon-download"
+              @click="exportData()"
+              >导出
             </el-button>
-<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
-<!--            </el-button>-->
-            <el-button type="text"  v-has="'btn_edit'"  icon="el-icon-download" @click="">编辑
+            <!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+            <!--            </el-button>-->
+            <el-button
+              type="text"
+              v-has="'btn_edit'"
+              icon="el-icon-download"
+              @click=""
+              >编辑
             </el-button>
-            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button
+              type="text"
+              v-has="'btn_batchRemove'"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              >批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-                    @selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号"    align="center" />
-          <el-table-column prop="mName" label="设备名称" width="300" align="center" sortable
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          :hasNO="false"
+          @selection-change="handleSelectionChange"
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            type="index"
+            width="50"
+            label="序号"
+            align="center"
+          />
+          <el-table-column
+            prop="mName"
+            label="设备名称"
+            width="300"
+            align="center"
+            sortable
           />
-          <el-table-column prop="serialnumber" label="设备序列号" width="300" align="center" sortable
+          <el-table-column
+            prop="serialnumber"
+            label="设备序列号"
+            width="300"
+            align="center"
+            sortable
           />
-          <el-table-column prop="monitoringId" label="区域" width="200" align="center" sortable
+          <el-table-column
+            prop="monitoringId"
+            label="区域"
+            width="200"
+            align="center"
+            sortable
           />
 
-          <el-table-column label="设备状态" width="200" sortable prop="mStatus" align="center" >
+          <el-table-column
+            label="设备状态"
+            width="200"
+            sortable
+            prop="mStatus"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.mStatus | dynamicText(mStatusOptions) }}
             </template>
           </el-table-column>
 
-          <el-table-column prop="channelNumber" label="设备通道号" width="200" align="center" sortable
+          <el-table-column
+            prop="channelNumber"
+            label="设备通道号"
+            width="200"
+            align="center"
+            sortable
           />
 
-          <el-table-column label="是否显示" width="200" sortable prop="isEnable" align="center" >
+          <el-table-column
+            label="是否显示"
+            width="200"
+            sortable
+            prop="isEnable"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.isEnable | dynamicText(isEnableOptions) }}
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" fixed="right"
-                           width="100">
+          <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text"   v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button
+                type="text"
+                v-has="'btn_edit'"
+                @click="addOrUpdateHandle(scope.row.id)"
+                >编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn"   v-has="'btn_remove'"  @click="handleDel(scope.row.id)">删除
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)"
+                >删除
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: { JNPFForm, ExportBox, Detail },
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          mName: undefined,
-          monitoringId: undefined
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [], total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          { prop: 'mName', label: '设备名称' },
-          { prop: 'serialnumber', label: '设备序列号' },
-          { prop: 'monitoringId', label: '区域' },
-          { prop: 'mStatus', label: '设备状态：' },
-          { prop: 'channelNumber', label: '设备通道号' },
-          { prop: 'isEnable', label: '是否显示' }
-        ],
-        monitoringIdOptions: [],
-        monitoringIdProps: { 'label': 'm_name', 'value': 'id' },
-        mStatusOptions: [{ 'fullName': '在线', 'id': '1' }, { 'fullName': '不在线', 'id': '0' }],
-        mStatusProps: { 'label': 'fullName', 'value': 'id' },
-        isEnableOptions: [{ 'fullName': '显示', 'id': '1' }, { 'fullName': '不显示', 'id': '0' }],
-        isEnableProps: { 'label': 'fullName', 'value': 'id' }
-      }
-    },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      this.initData()
-      this.getmonitoringIdOptions()
-    },
-    methods: {
-      getmonitoringIdOptions() {
-        getDataInterfaceRes('370933183241262469').then(res => {
-          let data = res.data.data
-          this.monitoringIdOptions = data
-        })
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        mName: undefined,
+        monitoringId: undefined,
       },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
       },
-      sortChange({ column, prop, order }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
       },
-      initData() {
-        this.listLoading = true
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "mName", label: "设备名称" },
+        { prop: "serialnumber", label: "设备序列号" },
+        { prop: "monitoringId", label: "区域" },
+        { prop: "mStatus", label: "设备状态：" },
+        { prop: "channelNumber", label: "设备通道号" },
+        { prop: "isEnable", label: "是否显示" },
+      ],
+      monitoringIdOptions: [],
+      monitoringIdProps: { label: "m_name", value: "id" },
+      mStatusOptions: [
+        { fullName: "在线", id: "1" },
+        { fullName: "不在线", id: "0" },
+      ],
+      mStatusProps: { label: "fullName", value: "id" },
+      isEnableOptions: [
+        { fullName: "显示", id: "1" },
+        { fullName: "不显示", id: "0" },
+      ],
+      isEnableProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
+    },
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-monitormanage-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-monitormanage-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-monitormanage-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-monitormanage-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+    this.getmonitoringIdOptions();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-monitormanage-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem(
+      "scm-basicInformation-monitormanage-query",
+      json_query
+    );
+  },
+  methods: {
+    getmonitoringIdOptions() {
+      getDataInterfaceRes("370933183241262469").then((res) => {
+        let data = res.data.data;
+        this.monitoringIdOptions = data;
+      });
+    },
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
+    },
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/Monitoringitem/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          res.data.list[i].creatorTime = res.data.list[i].creatorTime
+            ? res.data.list[i].creatorTime.substring(0, 10)
+            : "";
+          let _data = res.data.list[i];
+          _list.push(_data);
         }
-        request({
-          url: `/api/example/Monitoringitem/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = []
-          for (let i = 0; i < res.data.list.length; i++) {
-            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0, 10) : '';
-            let _data = res.data.list[i]
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/Monitoringitem/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/Monitoringitem/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
-        })
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-        request({
-          url: `/api/example/Monitoringitem/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/Monitoringitem/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery = {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
+      };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue
index e19aae65..60228da5 100644
--- a/SC-web/src/views/scm/basicInformation/payment/index.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/index.vue
@@ -1,42 +1,70 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-              <el-input v-model="query.documentno" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.documentno"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="来源单号">
-              <el-input v-model="query.paymentno" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.paymentno"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人">
-              <el-input v-model="query.applicantName" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.applicantName"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="结算重量">
-              <el-input v-model="query.paymentdocNum" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.paymentdocNum"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="应付日期">
-              <el-date-picker v-model="query.duedate" type="daterange"
-                              value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                              end-placeholder="结束日期">
+              <el-date-picker
+                v-model="query.duedate"
+                type="daterange"
+                value-format="timestamp"
+                format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -46,516 +74,743 @@
           <div>
             <!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button> -->
-            <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'"
+              >批量删除
             </el-button>
-            <el-button type="text" icon="el-icon-check" @click="submitprice()" v-has="'btn_submitprice'">提交
+            <el-button
+              type="text"
+              icon="el-icon-check"
+              @click="submitprice()"
+              v-has="'btn_submitprice'"
+              >提交
             </el-button>
-            <el-button type="text" icon="el-icon-check" @click="confirmprice()" v-has="'btn_confirmprice'">认款
+            <el-button
+              type="text"
+              icon="el-icon-check"
+              @click="confirmprice()"
+              v-has="'btn_confirmprice'"
+              >认款
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
             <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" custom-column border>
-          <el-table-column prop="documentno" label="单据编号"    sortable width="200" align="center"  />
-          <el-table-column prop="paymentno" label="来源单号"    sortable width="200" align="center"  />
-					<el-table-column prop="supplierNm" label="供应商"    sortable width="200" align="center"  />
-<!--          <el-table-column label="单据状态" sortable width="140" prop="status" align="center" >-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column prop="status" label="单据状态" sortable width="140" align="center">
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentno"
+            label="单据编号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="paymentno"
+            label="来源单号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="supplierNm"
+            label="供应商"
+            sortable
+            width="200"
+            align="center"
+          />
+          <!--          <el-table-column label="单据状态" sortable width="140" prop="status" align="center" >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="140"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-              <el-tag type="info" v-else-if="scope.row.status==1">已提交</el-tag>
-              <el-tag type="warning" v-else-if="scope.row.status==2">已认款</el-tag>
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >已提交</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已认款</el-tag
+              >
             </template>
           </el-table-column>
           <!-- <el-table-column prop="suppliername" label="供应商"    sortable width="150" align="center"  /> -->
-          <el-table-column label="币别 " width="80" prop="currency" sortable align="center" >
+          <el-table-column
+            label="币别 "
+            width="80"
+            prop="currency"
+            sortable
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="duedate" label="应付日期" sortable width="140" align="center"  />
-          <el-table-column prop="businessdate" label="实付日期" sortable width="140" align="center"  />
-          <el-table-column prop="paymentamount" label="付款金额" sortable width="140" align="center"  />
-          <el-table-column prop="requestedamount" label="申请金额" sortable width="140" align="center"  />
-          <el-table-column prop="applicantName" label="申请人" sortable width="140" align="center"  />
-          <el-table-column prop="paymentdocNum" label="结算重量" sortable width="140" align="center"  />
-          <el-table-column prop="paymentaccount" label="付款账户" sortable width="140" align="center"  />
-          <el-table-column prop="paymentbank" label="付款银行" sortable width="150" align="center"  />
-          <el-table-column label="付款类型" sortable width="140" prop="paymenttype" align="center" >
+          <el-table-column
+            prop="duedate"
+            label="应付日期"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="businessdate"
+            label="实付日期"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="paymentamount"
+            label="付款金额"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="requestedamount"
+            label="申请金额"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="applicantName"
+            label="申请人"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="paymentdocNum"
+            label="结算重量"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="paymentaccount"
+            label="付款账户"
+            sortable
+            width="140"
+            align="center"
+          />
+          <el-table-column
+            prop="paymentbank"
+            label="付款银行"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            label="付款类型"
+            sortable
+            width="140"
+            prop="paymenttype"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.paymenttype | dynamicText(paymenttypeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column label="结算类型" sortable width="140" prop="settlementtype" align="center" >
+          <el-table-column
+            label="结算类型"
+            sortable
+            width="140"
+            prop="settlementtype"
+            align="center"
+          >
             <template slot-scope="scope">
-              {{ scope.row.settlementtype | dynamicText(settlementtypeOptions) }}
+              {{
+                scope.row.settlementtype | dynamicText(settlementtypeOptions)
+              }}
             </template>
           </el-table-column>
-					<el-table-column prop="accountingPeriod" label="账期(日)" sortable width="150" align="center"  />
-					<el-table-column prop="paymentDate" label="应回日期" sortable width="150" align="center"  />
-					<el-table-column prop="advanceAmount" label="垫资金额" sortable width="150" align="center"  />
-					<el-table-column prop="overdueInterest" label="逾期利息" sortable width="150" align="center"  />
-          <el-table-column label="操作" fixed="right"  width="150" align="center" >
+          <el-table-column
+            prop="accountingPeriod"
+            label="账期(日)"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="paymentDate"
+            label="应回日期"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="advanceAmount"
+            label="垫资金额"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            prop="overdueInterest"
+            label="逾期利息"
+            sortable
+            width="150"
+            align="center"
+          />
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
+              <el-button
+                v-if="scope.row.status == 0"
+                type="text"
+                @click="addOrUpdateHandle(scope.row.id)"
+                v-has="'btn_edit'"
+                >编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'">删除
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                @click="handleDel(scope.row)"
+                v-has="'btn_remove'"
+                >删除
               </el-button>
-              <el-button type="text" @click="goDetail(scope.row.id)" v-has="'btn_detail'">详情
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
-	<RenkuanForm v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2" />
+    <RenkuanForm v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import RenkuanForm from './RenkuanForm'
-  import ExportBox from './ExportBox'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import RenkuanForm from "./RenkuanForm";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {
-      JNPFForm,
-	  RenkuanForm,
-      ExportBox,
-      Detail
-    },
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          documentno: undefined,
+export default {
+  components: {
+    JNPFForm,
+    RenkuanForm,
+    ExportBox,
+    Detail,
+  },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        documentno: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      multipleSelectionItem: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "businessdate",
+      },
+      formVisible: false,
+      formVisible2: false,
+      exportBoxVisible: false,
+      columnList: [
+        {
+          prop: "paymentno",
+          label: "来源单号",
         },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+        {
+          prop: "documentno",
+          label: "单据编号",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        multipleSelectionItem: [],
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "businessdate",
+        {
+          prop: "suppliername",
+          label: "供应商",
         },
-        formVisible: false,
-		formVisible2: false,
-        exportBoxVisible: false,
-        columnList: [{
-            prop: 'paymentno',
-            label: '来源单号'
-          },
-          {
-            prop: 'documentno',
-            label: '单据编号'
-          },
-          {
-            prop: 'suppliername',
-            label: '供应商'
-          },
-          {
-            prop: 'currency',
-            label: '币别 '
-          },
-          {
-            prop: 'paymentamount',
-            label: '付款金额'
-          },
-          {
-            prop: 'requestedamount',
-            label: '申请金额'
-          },
-          {
-            prop: 'paymentaccount',
-            label: '付款账户'
-          },
-          {
-            prop: 'paymentbank',
-            label: '付款银行'
-          },
-          {
-            prop: 'paymenttype',
-            label: '付款类型'
-          },
-          {
-            prop: 'settlementtype',
-            label: '结算类型'
-          },
-          {
-            prop: 'status',
-            label: '单据状态'
-          },
-        ],
-        paymenttypeOptions: [{
-          "fullName": "货款",
-          "id": "0"
-        }, {
-          "fullName": "运费",
-          "id": "1"
-        }, {
-          "fullName": "仓储",
-          "id": "2"
-        }],
-        paymenttypeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "currency",
+          label: "币别 ",
         },
-        currencyOptions: [{
-          "fullName": "人民币",
-          "id": "0"
-        }, {
-          "fullName": "美元",
-          "id": "1"
-        }, {
-          "fullName": "英镑",
-          "id": "2"
-        }],
-        currencyProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "paymentamount",
+          label: "付款金额",
         },
-        settlementtypeOptions: [{
-          "fullName": "现金",
-          "id": "0"
-        }, {
-          "fullName": "赊购",
-          "id": "1"
-        }, {
-          "fullName": "网银",
-          "id": "2"
-        }, {
-          "fullName": "银企直连",
-          "id": "3"
-        }, {
-          "fullName": "银票",
-          "id": "4"
-        }, {
-          "fullName": "商票",
-          "id": "5"
-        }],
-        settlementtypeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "requestedamount",
+          label: "申请金额",
         },
-        statusOptions: [{
-          "fullName": "已保存",
-          "id": "0"
-        }, {
-          "fullName": "已提交",
-          "id": "1"
-        }, {
-          "fullName": "已认款",
-          "id": "2"
-        }],
-        statusProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "paymentaccount",
+          label: "付款账户",
         },
-      }
+        {
+          prop: "paymentbank",
+          label: "付款银行",
+        },
+        {
+          prop: "paymenttype",
+          label: "付款类型",
+        },
+        {
+          prop: "settlementtype",
+          label: "结算类型",
+        },
+        {
+          prop: "status",
+          label: "单据状态",
+        },
+      ],
+      paymenttypeOptions: [
+        {
+          fullName: "货款",
+          id: "0",
+        },
+        {
+          fullName: "运费",
+          id: "1",
+        },
+        {
+          fullName: "仓储",
+          id: "2",
+        },
+      ],
+      paymenttypeProps: {
+        label: "fullName",
+        value: "id",
+      },
+      currencyOptions: [
+        {
+          fullName: "人民币",
+          id: "0",
+        },
+        {
+          fullName: "美元",
+          id: "1",
+        },
+        {
+          fullName: "英镑",
+          id: "2",
+        },
+      ],
+      currencyProps: {
+        label: "fullName",
+        value: "id",
+      },
+      settlementtypeOptions: [
+        {
+          fullName: "现金",
+          id: "0",
+        },
+        {
+          fullName: "赊购",
+          id: "1",
+        },
+        {
+          fullName: "网银",
+          id: "2",
+        },
+        {
+          fullName: "银企直连",
+          id: "3",
+        },
+        {
+          fullName: "银票",
+          id: "4",
+        },
+        {
+          fullName: "商票",
+          id: "5",
+        },
+      ],
+      settlementtypeProps: {
+        label: "fullName",
+        value: "id",
+      },
+      statusOptions: [
+        {
+          fullName: "已保存",
+          id: "0",
+        },
+        {
+          fullName: "已提交",
+          id: "1",
+        },
+        {
+          fullName: "已认款",
+          id: "2",
+        },
+      ],
+      statusProps: {
+        label: "fullName",
+        value: "id",
+      },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-payment-pageSize") !== null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-payment-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-payment-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-payment-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-payment-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-payment-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/payment/Payment/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          debugger
-          this.total = res.data.pagination.total
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/payment/Payment/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(row) {
-		if(row.status != '0'){
-			this.$message({
-			  type: 'error',
-			  message: '已提交或认款的付款单无法删除',
-			  duration: 2500,
-			})
-			return
-		}
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(row) {
+      if (row.status != "0") {
+        this.$message({
+          type: "error",
+          message: "已提交或认款的付款单无法删除",
+          duration: 2500,
+        });
+        return;
+      }
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/payment/Payment/${row.id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {});
-      },
-      handleSelectionChange(val) {
-        this.multipleSelectionItem = val
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      this.multipleSelectionItem = val;
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/payment/Payment/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {})
-      },
-      submitprice(){
-        if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length > 1) {
-        	this.$message({
-        		type: 'error',
-        		message: '请选择一条数据',
-        		duration: 2500,
-        	})
-        	return
-        }
-        if(this.multipleSelectionItem[0].status == 1){
-          this.$message({
-          	type: 'error',
-          	message: '已提交，无需再次提交',
-          	duration: 2500,
-          })
-          return
-        }
-        if(this.multipleSelectionItem[0].status == 2){
-          this.$message({
-          	type: 'error',
-          	message: '已认款，无需再次提交',
-          	duration: 2500,
-          })
-          return
-        }
-        if(this.multipleSelectionItem[0].paymentamount <= 0){
-          this.$message({
-          	type: 'error',
-          	message: '请先输入付款金额',
-          	duration: 2500,
-          })
-          return
-        }
+          });
+        })
+        .catch(() => {});
+    },
+    submitprice() {
+      if (
+        !this.multipleSelectionItem.length ||
+        this.multipleSelectionItem.length > 1
+      ) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelectionItem[0].status == 1) {
+        this.$message({
+          type: "error",
+          message: "已提交，无需再次提交",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelectionItem[0].status == 2) {
+        this.$message({
+          type: "error",
+          message: "已认款，无需再次提交",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelectionItem[0].paymentamount <= 0) {
+        this.$message({
+          type: "error",
+          message: "请先输入付款金额",
+          duration: 2500,
+        });
+        return;
+      }
+      let param = {};
+      param.id = this.multipleSelectionItem[0].id;
+      request({
+        url: `/api/payment/Payment/submitprice`,
+        method: "POST",
+        data: param,
+      }).then((res) => {
+        this.$message({
+          type: "success",
+          message: res.msg,
+          onClose: () => {
+            this.initData();
+          },
+        });
+      });
+    },
+    confirmprice() {
+      if (
+        !this.multipleSelectionItem.length ||
+        this.multipleSelectionItem.length > 1
+      ) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelectionItem[0].status == 0) {
+        this.$message({
+          type: "error",
+          message: "付款提交中",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelectionItem[0].status == 2) {
+        this.$message({
+          type: "error",
+          message: "已认款",
+          duration: 2500,
+        });
+        return;
+      }
+      if (this.multipleSelectionItem[0].paymentamount <= 0) {
+        this.$message({
+          type: "error",
+          message: "请先输入付款金额",
+          duration: 2500,
+        });
+        return;
+      }
+      this.formVisible2 = true;
+      if (this.multipleSelectionItem[0].advanceAmount > 0) {
+        this.$nextTick(() => {
+          this.$refs.JNPFForm2.init(this.multipleSelectionItem[0].id);
+        });
+      } else {
         let param = {};
-        param.id= this.multipleSelectionItem[0].id;
+        param.id = this.multipleSelectionItem[0].id;
         request({
-          url: `/api/payment/Payment/submitprice`,
-          method: 'POST',
-          data: param
-        }).then(res => {
+          url: `/api/payment/Payment/confirmprice`,
+          method: "POST",
+          data: param,
+        }).then((res) => {
           this.$message({
-            type: 'success',
+            type: "success",
             message: res.msg,
             onClose: () => {
-              this.initData()
-            }
+              this.initData();
+            },
           });
-        })
-      },
-      confirmprice() {
-        if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length > 1) {
-        	this.$message({
-        		type: 'error',
-        		message: '请选择一条数据',
-        		duration: 2500,
-        	})
-        	return
-        }
-        if(this.multipleSelectionItem[0].status == 0){
-          this.$message({
-          	type: 'error',
-          	message: '付款提交中',
-          	duration: 2500,
-          })
-          return
-        }
-        if(this.multipleSelectionItem[0].status == 2){
-          this.$message({
-          	type: 'error',
-          	message: '已认款',
-          	duration: 2500,
-          })
-          return
-        }
-        if(this.multipleSelectionItem[0].paymentamount <= 0){
-          this.$message({
-          	type: 'error',
-          	message: '请先输入付款金额',
-          	duration: 2500,
-          })
-          return
-        }
-		this.formVisible2 = true
-		if(this.multipleSelectionItem[0].advanceAmount > 0){
-			this.$nextTick(() => {
-			  this.$refs.JNPFForm2.init(this.multipleSelectionItem[0].id)
-			})
-		}else{
-			let param = {};
-			param.id= this.multipleSelectionItem[0].id;
-			request({
-			  url: `/api/payment/Payment/confirmprice`,
-			  method: 'POST',
-			  data: param
-			}).then(res => {
-			  this.$message({
-			    type: 'success',
-			    message: res.msg,
-			    onClose: () => {
-			      this.initData()
-			    }
-			  });
-			})
-		}
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/payment/Payment/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-	  refresh2(isrRefresh) {
-	    this.formVisible2 = false
-	    if (isrRefresh) this.reset()
-	  },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        });
       }
-    }
-  }
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/payment/Payment/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "creatorTime",
+      // }
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh2(isrRefresh) {
+      this.formVisible2 = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
index 5b7bb15f..a3d23ba2 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
@@ -95,6 +95,7 @@
           custom-column
           border
         >
+          <el-table-column type="index" fixed="left" width="1" />
           <el-table-column
             prop="documentNo"
             label="单据编号"
@@ -549,8 +550,37 @@ export default {
     },
   },
   created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-paymentdoc-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-paymentdoc-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-paymentdoc-query") !==
+      null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-paymentdoc-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
     this.initData();
   },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-paymentdoc-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem(
+      "scm-basicInformation-paymentdoc-query",
+      json_query
+    );
+  },
   methods: {
     stopPayment() {
       if (!this.multipleSelectionItem.length) {
@@ -779,12 +809,13 @@ export default {
       });
     },
     search() {
-      this.listQuery = {
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      };
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "",
+      // };
       this.initData();
     },
     colseFlow(isrRefresh) {
diff --git a/SC-web/src/views/scm/basicInformation/purchaseback/index.vue b/SC-web/src/views/scm/basicInformation/purchaseback/index.vue
index 5d3d694f..44fe5cb8 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseback/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseback/index.vue
@@ -68,6 +68,7 @@
           custom-column
           border
         >
+          <el-table-column type="index" fixed="left" width="1" />
           <el-table-column
             prop="documentNo"
             label="单据编号"
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index 05333403..259243ea 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -181,6 +181,7 @@
           show-summary
           :summary-method="getSummaries"
         >
+          <el-table-column type="index" fixed="left" width="1" />
           <el-table-column
             prop="documentNo"
             label="单据编号"
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/index.vue b/SC-web/src/views/scm/basicInformation/receiptin/index.vue
index ecd58b57..05f514cd 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/index.vue
@@ -1,50 +1,92 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-              <el-input v-model="query.documentno" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.documentno"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="来源单号">
-                <el-input v-model="query.souceno" placeholder="请输入" clearable> </el-input>
+                <el-input
+                  v-model="query.souceno"
+                  placeholder="请输入"
+                  clearable
+                >
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="供应商">
-                <el-input v-model="query.supplierName" placeholder="请输入" clearable></el-input>
+                <el-input
+                  v-model="query.supplierName"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <el-date-picker v-model="query.creatorTime" type="daterange"
-                                value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                                end-placeholder="结束日期">
+                <el-date-picker
+                  v-model="query.creatorTime"
+                  type="daterange"
+                  value-format="timestamp"
+                  format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="单据状态">
-                <el-select v-model="query.status" placeholder="请选择单据状态" clearable>
-                  <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
-                    :disabled="item.disabled"></el-option>
+                <el-select
+                  v-model="query.status"
+                  placeholder="请选择单据状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in statusOptions"
+                    :key="index"
+                    :label="item.fullName"
+                    :value="item.id"
+                    :disabled="item.disabled"
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </template>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">展开</el-button>
-              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                收起</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-down"
+                @click="showAll = true"
+                v-if="!showAll"
+                >展开</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-up"
+                @click="showAll = false"
+                v-else
+              >
+                收起</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -54,372 +96,527 @@
           <div>
             <!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button> -->
-            <el-button type="text" icon="el-icon-download" @click="exportData()"v-has="'btn_download'">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
             </el-button>
             <!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
             <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c 
-          @selection-change="handleSelectionChange" custom-column border>
-          <el-table-column prop="documentno" label="单据编号" sortable width="200" align="center"    />
-          <el-table-column prop="supplier" label="供应商" sortable width="220" align="center"    />
-          <el-table-column prop="receiptamount" label="入库金额" sortable width="120" align="center" />
-          <el-table-column prop="receiptnum" label="入库数量" sortable width="120" align="center" />
-          <el-table-column prop="currency" label="币别" sortable width="80" align="center">
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentno"
+            label="单据编号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="supplier"
+            label="供应商"
+            sortable
+            width="220"
+            align="center"
+          />
+          <el-table-column
+            prop="receiptamount"
+            label="入库金额"
+            sortable
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            prop="receiptnum"
+            label="入库数量"
+            sortable
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            prop="currency"
+            label="币别"
+            sortable
+            width="80"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="warehousingdate" sortable label="入库日期" width="120" align="center" />
-          <el-table-column prop="purchaseorderSouceno" sortable label="来源单号" width="200" align="center" />
-          <el-table-column prop="type" sortable label="业务类型" width="120" align="center">
+          <el-table-column
+            prop="warehousingdate"
+            sortable
+            label="入库日期"
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            prop="purchaseorderSouceno"
+            sortable
+            label="来源单号"
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="type"
+            sortable
+            label="业务类型"
+            width="120"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.type | dynamicText(typeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="remark" sortable label="备注" width="120" align="center" />
-<!--          <el-table-column prop="status" sortable label="单据状态" width="120" align="center">-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column prop="status" label="单据状态" sortable width="120" align="center">
+          <el-table-column
+            prop="remark"
+            sortable
+            label="备注"
+            width="120"
+            align="center"
+          />
+          <!--          <el-table-column prop="status" sortable label="单据状态" width="120" align="center">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="120"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-              <el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
-              <el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >审批中</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已审批</el-tag
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="creatorTime" sortable label="创建日期" width="120" align="center" />
-          <el-table-column prop="creatorUserName" sortable label="创建人" width="120" align="center" />
-          <el-table-column label="操作" fixed="right"  width="150" align="center">
+          <el-table-column
+            prop="creatorTime"
+            sortable
+            label="创建日期"
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            prop="creatorUserName"
+            sortable
+            label="创建人"
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            label="操作"
+            fixed="right"
+            width="150"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-button type="text" @click="addOrUpdateHandle(scope.row)"v-has="'btn_edit'">编辑
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
               </el-button>
               <!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button> -->
-              <el-button type="text" @click="goDetail(scope.row.id)"v-has="'btn_detail'">详情
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {
-      JNPFForm,
-      ExportBox,
-      Detail
-    },
-    data() {
-      return {
-        showAll: false,
-        detailVisible: false,
-        query: {
-          documentno: undefined,
-          status: undefined,
+export default {
+  components: {
+    JNPFForm,
+    ExportBox,
+    Detail,
+  },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        documentno: undefined,
+        status: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        {
+          prop: "documentno",
+          label: "单据编号",
         },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+        {
+          prop: "supplier",
+          label: "供应商名称",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
+        {
+          prop: "receiptamount",
+          label: "入库金额",
         },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [{
-            prop: 'documentno',
-            label: '单据编号'
-          },
-          {
-            prop: 'supplier',
-            label: '供应商名称'
-          },
-          {
-            prop: 'receiptamount',
-            label: '入库金额'
-          },
-          {
-            prop: 'receiptnum',
-            label: '入库数量'
-          },
-          {
-            prop: 'currency',
-            label: '币别'
-          },
-          {
-            prop: 'warehousingdate',
-            label: '入库日期'
-          },
-          {
-            prop: 'purchaseorderSouceno',
-            label: '来源单号'
-          },
-          {
-            prop: 'type',
-            label: '业务类型'
-          },
-          {
-            prop: 'remark',
-            label: '备注'
-          },
-          {
-            prop: 'status',
-            label: '单据状态'
-          },
-          {
-            prop: 'creatorTime',
-            label: '创建日期'
-          },
-          {
-            prop: 'creatorUserName',
-            label: '创建人'
-          },
-        ],
-        typeOptions: [{
-          "fullName": "采购入库",
-          "id": "0"
-        }, {
-          "fullName": "购销入库",
-          "id": "1"
-        }],
-        typeProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "receiptnum",
+          label: "入库数量",
         },
-        currencyOptions: [{
-          "fullName": "人民币",
-          "id": "0"
-        }, {
-          "fullName": "美元",
-          "id": "1"
-        }, {
-          "fullName": "英镑",
-          "id": "2"
-        }],
-        currencyProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "currency",
+          label: "币别",
         },
-        statusOptions: [{
-          "fullName": "已保存",
-          "id": "0"
-        }, {
-          "fullName": "审批中",
-          "id": "1"
-        }, {
-          "fullName": "已审批",
-          "id": "2"
-        }],
-        statusProps: {
-          "label": "fullName",
-          "value": "id"
+        {
+          prop: "warehousingdate",
+          label: "入库日期",
         },
-      }
+        {
+          prop: "purchaseorderSouceno",
+          label: "来源单号",
+        },
+        {
+          prop: "type",
+          label: "业务类型",
+        },
+        {
+          prop: "remark",
+          label: "备注",
+        },
+        {
+          prop: "status",
+          label: "单据状态",
+        },
+        {
+          prop: "creatorTime",
+          label: "创建日期",
+        },
+        {
+          prop: "creatorUserName",
+          label: "创建人",
+        },
+      ],
+      typeOptions: [
+        {
+          fullName: "采购入库",
+          id: "0",
+        },
+        {
+          fullName: "购销入库",
+          id: "1",
+        },
+      ],
+      typeProps: {
+        label: "fullName",
+        value: "id",
+      },
+      currencyOptions: [
+        {
+          fullName: "人民币",
+          id: "0",
+        },
+        {
+          fullName: "美元",
+          id: "1",
+        },
+        {
+          fullName: "英镑",
+          id: "2",
+        },
+      ],
+      currencyProps: {
+        label: "fullName",
+        value: "id",
+      },
+      statusOptions: [
+        {
+          fullName: "已保存",
+          id: "0",
+        },
+        {
+          fullName: "审批中",
+          id: "1",
+        },
+        {
+          fullName: "已审批",
+          id: "2",
+        },
+      ],
+      statusProps: {
+        label: "fullName",
+        value: "id",
+      },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-receiptin-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-receiptin-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-receiptin-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-receiptin-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-receiptin-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem(
+      "scm-basicInformation-receiptin-query",
+      json_query
+    );
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/receiptin/Receiptin/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-              10) : '';
-            res.data.list[i].warehousingdate = res.data.list[i].warehousingdate ? res.data.list[i].warehousingdate
-              .substring(0, 10) : '';
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/receiptin/Receiptin/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          res.data.list[i].creatorTime = res.data.list[i].creatorTime
+            ? res.data.list[i].creatorTime.substring(0, 10)
+            : "";
+          res.data.list[i].warehousingdate = res.data.list[i].warehousingdate
+            ? res.data.list[i].warehousingdate.substring(0, 10)
+            : "";
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/receiptin/Receiptin/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {});
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/receiptin/Receiptin/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {})
-      },
-      addOrUpdateHandle(row, isDetail) {
-        var id = undefined;
-        if(row){
-          id = row.id;
-          if(row.status != '0'){
-            this.$message({
-              type: 'error',
-              message: '审批中或已审批无法编辑',
-              duration: 2500,
-            });
-            return
-          }
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
-        request({
-          url: `/api/receiptin/Receiptin/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          });
         })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "creatorTime",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
+        .catch(() => {});
+    },
+    addOrUpdateHandle(row, isDetail) {
+      var id = undefined;
+      if (row) {
+        id = row.id;
+        if (row.status != "0") {
+          this.$message({
+            type: "error",
+            message: "审批中或已审批无法编辑",
+            duration: 2500,
+          });
+          return;
         }
-        this.search()
       }
-    }
-  }
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/receiptin/Receiptin/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "creatorTime",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
index 36e35fb6..12ed663f 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
@@ -1,345 +1,527 @@
 <template>
   <div class="JNPF-common-layout">
-<!--    测试-->
-      <div class="JNPF-common-layout-center">
-        <el-row class="JNPF-common-search-box" :gutter="16">
-          <el-form @submit.native.prevent>
-            <el-col :span="6">
-              <el-form-item label="单据编号">
-                <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <template v-if="showAll">
+    <!--    测试-->
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="单据编号">
+              <el-input
+                v-model="query.documentNo"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="来源单号">
-                <el-input v-model="query.sourceOrderNo" placeholder="请输入" clearable></el-input>
+                <el-input
+                  v-model="query.sourceOrderNo"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="客户名称">
-                <el-input v-model="query.customerNm" placeholder="请输入" clearable></el-input>
+                <el-input
+                  v-model="query.customerNm"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务类型">
-                <el-select v-model="query.type" placeholder="请选择"
-                           clearable>
-                  <el-option v-for="(item, index) in typeOptions" :key="index"
-                             :label="item.fullName" :value="item.id"
-                             :disabled="item.disabled"></el-option>
+                <el-select v-model="query.type" placeholder="请选择" clearable>
+                  <el-option
+                    v-for="(item, index) in typeOptions"
+                    :key="index"
+                    :label="item.fullName"
+                    :value="item.id"
+                    :disabled="item.disabled"
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-            <el-form-item label="制单日期">
-              <el-date-picker v-model="query.creatorTime" type="daterange"
-                              value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                              end-placeholder="结束日期" >
-              </el-date-picker>
-            </el-form-item>
-            </el-col>
-            </template>
-            <el-col :span="6">
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
-                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                  v-if="!showAll">展开</el-button>
-                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                  收起</el-button>
+              <el-form-item label="制单日期">
+                <el-date-picker
+                  v-model="query.creatorTime"
+                  type="daterange"
+                  value-format="timestamp"
+                  format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
-          </el-form>
-        </el-row>
-        <div class="JNPF-common-layout-main JNPF-flex-main">
-          <div class="JNPF-common-head">
-            <div>
-<!--              <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
-<!--              </el-button>-->
-              <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
-              </el-button>
-<!--              <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+          </template>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-down"
+                @click="showAll = true"
+                v-if="!showAll"
+                >展开</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-up"
+                @click="showAll = false"
+                v-else
+              >
+                收起</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <!--              <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+            <!--              </el-button>-->
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
+            </el-button>
+            <!--              <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
               </el-button> -->
-            </div>
-            <div class="JNPF-common-head-right">
-              <el-tooltip effect="dark" content="刷新" placement="top">
-                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                         @click="reset()"/>
-              </el-tooltip>
-              <screenfull isContainer/>
-            </div>
           </div>
-          <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-                      @selection-change="handleSelectionChange" custom-column border>
-            <el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center"
-            />
-            <el-table-column prop="customerNm" label="客户名称" sortable width="200" align="center"
-            />
-            <el-table-column prop="amount" label="出库金额" sortable width="120" align="center"
-            />
-            <el-table-column prop="num" label="出库数量" sortable width="120" align="center"
-            />
-            <el-table-column label="币别"  prop="currency" sortable width="120" align="center"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.currency | dynamicText(currencyOptions) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="issueDate" label="出库日期"  width="120" align="center"
-                             sortable="custom"/>
-            <el-table-column prop="sourceOrderNo" label="来源单号" sortable width="200" align="center"
-            />
-            <el-table-column label="业务类型"  prop="type" sortable width="120" align="center"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.type | dynamicText(typeOptions) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="remark" label="备注" sortable width="120" align="center"
-            />
-<!--            <el-table-column label="单据状态" width="0" prop="status" algin="left"-->
-<!--            >-->
-<!--              <template slot-scope="scope">-->
-<!--                {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-            <el-table-column prop="status" label="单据状态" sortable width="120" align="center">
-              <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-                <el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
-                <el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="creatorTime" label="创建时间" sortable width="120" align="center"
-            />
-            <el-table-column prop="creatorUserName" label="创建人名称" sortable width="120" align="center"
-            />
-            <el-table-column label="操作" fixed="right"
-                             width="150">
-              <template slot-scope="scope">
-                <el-button type="text"  @click="addOrUpdateHandle(scope.row.id)"v-has="'btn_edit'">编辑
-                </el-button>
-<!--                <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
-                </el-button> -->
-                <el-button type="text"  @click="goDetail(scope.row.id)"v-has="'btn_detail'">详情
-                </el-button>
-              </template>
-            </el-table-column>
-          </JNPF-table>
-          <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                      @pagination="initData"/>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
+            </el-tooltip>
+            <screenfull isContainer />
+          </div>
         </div>
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentNo"
+            label="单据编号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="customerNm"
+            label="客户名称"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="amount"
+            label="出库金额"
+            sortable
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            prop="num"
+            label="出库数量"
+            sortable
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            label="币别"
+            prop="currency"
+            sortable
+            width="120"
+            align="center"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.currency | dynamicText(currencyOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="issueDate"
+            label="出库日期"
+            width="120"
+            align="center"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="sourceOrderNo"
+            label="来源单号"
+            sortable
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            label="业务类型"
+            prop="type"
+            sortable
+            width="120"
+            align="center"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.type | dynamicText(typeOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remark"
+            label="备注"
+            sortable
+            width="120"
+            align="center"
+          />
+          <!--            <el-table-column label="单据状态" width="0" prop="status" algin="left"-->
+          <!--            >-->
+          <!--              <template slot-scope="scope">-->
+          <!--                {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--              </template>-->
+          <!--            </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="120"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >审批中</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已审批</el-tag
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="creatorTime"
+            label="创建时间"
+            sortable
+            width="120"
+            align="center"
+          />
+          <el-table-column
+            prop="creatorUserName"
+            label="创建人名称"
+            sortable
+            width="120"
+            align="center"
+          />
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row.id)"
+                v-has="'btn_edit'"
+                >编辑
+              </el-button>
+              <!--                <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+                </el-button> -->
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
-      <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-      <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-      <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
-
     </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
+  </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {JNPFForm, ExportBox, Detail},
-    data() {
-      return {
-        showAll: false,
-        detailVisible: false,
-        query: {
-          documentNo: undefined,
-          type: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [], total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          {prop: 'documentNo', label: '单据编号'},
-          {prop: 'customerNm', label: '客户名称'},
-          {prop: 'amount', label: '出库金额'},
-          {prop: 'num', label: '出库数量'},
-          {prop: 'currency', label: '币别'},
-          {prop: 'issueDate', label: '出库日期'},
-          {prop: 'sourceOrderNo', label: '来源单号'},
-          {prop: 'type', label: '业务类型'},
-          {prop: 'remark', label: '备注'},
-          {prop: 'status', label: '单据状态'},
-          {prop: 'creatorTime', label: '创建时间'},
-          {prop: 'creatorUserName', label: '创建人名称'},
-        ],
-        typeOptions: [{"fullName": "销售出库", "id": "0"}, {"fullName": "购销出库", "id": "1"}],
-        typeProps: {"label": "fullName", "value": "id"},
-        currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
-        currencyProps: {"label": "fullName", "value": "id"},
-        statusOptions: [{"fullName": "已保存", "id": "0"}, {"fullName": "审批中", "id": "1"}, {"fullName": "已审批", "id": "2"}],
-        statusProps: {"label": "fullName", "value": "id"},
-      }
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        documentNo: undefined,
+        type: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "documentNo", label: "单据编号" },
+        { prop: "customerNm", label: "客户名称" },
+        { prop: "amount", label: "出库金额" },
+        { prop: "num", label: "出库数量" },
+        { prop: "currency", label: "币别" },
+        { prop: "issueDate", label: "出库日期" },
+        { prop: "sourceOrderNo", label: "来源单号" },
+        { prop: "type", label: "业务类型" },
+        { prop: "remark", label: "备注" },
+        { prop: "status", label: "单据状态" },
+        { prop: "creatorTime", label: "创建时间" },
+        { prop: "creatorUserName", label: "创建人名称" },
+      ],
+      typeOptions: [
+        { fullName: "销售出库", id: "0" },
+        { fullName: "购销出库", id: "1" },
+      ],
+      typeProps: { label: "fullName", value: "id" },
+      currencyOptions: [
+        { fullName: "人民币", id: "0" },
+        { fullName: "美元", id: "1" },
+        { fullName: "英镑", id: "2" },
+      ],
+      currencyProps: { label: "fullName", value: "id" },
+      statusOptions: [
+        { fullName: "已保存", id: "0" },
+        { fullName: "审批中", id: "1" },
+        { fullName: "已审批", id: "2" },
+      ],
+      statusProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-receiptout-pageSize") !== null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-receiptout-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-receiptout-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-receiptout-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-receiptout-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-receiptout-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({column, prop, order}) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/receipout/Receiptout/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            let format = "YYYY-MM-DD"
-            _data.creatorTime = this.jnpf.dateFormat(res.data.list[i].creatorTime,format)
-            _data.issueDate = this.jnpf.dateFormat(res.data.list[i].issueDate,format)
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/receipout/Receiptout/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          let format = "YYYY-MM-DD";
+          _data.creatorTime = this.jnpf.dateFormat(
+            res.data.list[i].creatorTime,
+            format
+          );
+          _data.issueDate = this.jnpf.dateFormat(
+            res.data.list[i].issueDate,
+            format
+          );
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/receipout/Receiptout/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
         });
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/receipout/Receiptout/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {
-        })
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
-        request({
-          url: `/api/receipout/Receiptout/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          });
         })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/receipout/Receiptout/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
index 0dc4c533..eda6f5ef 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
@@ -1,23 +1,34 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="库区编码">
-              <el-input v-model="query.areacode" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.areacode"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="库区名称">
-              <el-input v-model="query.areaname" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.areaname"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -25,259 +36,379 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button
+              type="primary"
+              v-has="'btn_add'"
+              icon="el-icon-plus"
+              @click="addOrUpdateHandle()"
+              >新增
             </el-button>
-            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
+            <el-button
+              type="text"
+              v-has="'btn_download'"
+              icon="el-icon-download"
+              @click="exportData()"
+              >导出
             </el-button>
 
-<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
-<!--            </el-button>-->
+            <!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+            <!--            </el-button>-->
 
-            <el-button type="text" v-has="'btn_batchRemove'"  icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            <el-button
+              type="text"
+              v-has="'btn_batchRemove'"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              >批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-                    @selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号"    align="center" />
-          <el-table-column prop="areacode" label="库区编码" width="250" align="center" sortable
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          :hasNO="false"
+          @selection-change="handleSelectionChange"
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            type="index"
+            width="50"
+            label="序号"
+            align="center"
+          />
+          <el-table-column
+            prop="areacode"
+            label="库区编码"
+            width="250"
+            align="center"
+            sortable
           />
-          <el-table-column prop="areaname" label="库区名称" width="250" align="center" sortable
+          <el-table-column
+            prop="areaname"
+            label="库区名称"
+            width="250"
+            align="center"
+            sortable
           />
-          <el-table-column prop="maximum" label="最高库存" width="200" align="center" sortable
+          <el-table-column
+            prop="maximum"
+            label="最高库存"
+            width="200"
+            align="center"
+            sortable
           />
-          <el-table-column prop="safety" label="安全库存" width="200" align="center" sortable
+          <el-table-column
+            prop="safety"
+            label="安全库存"
+            width="200"
+            align="center"
+            sortable
           />
-          <el-table-column prop="minimum" label="最低库存" width="200" align="center" sortable
+          <el-table-column
+            prop="minimum"
+            label="最低库存"
+            width="200"
+            align="center"
+            sortable
           />
 
-          <el-table-column label="计量单位" width="120" sortable prop="unit" align="center" >
+          <el-table-column
+            label="计量单位"
+            width="120"
+            sortable
+            prop="unit"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.unit | dynamicText(unitOptions) }}
             </template>
           </el-table-column>
 
-          <el-table-column prop="warehouseId" label="仓库" width="200" align="center" sortable
+          <el-table-column
+            prop="warehouseId"
+            label="仓库"
+            width="200"
+            align="center"
+            sortable
           />
-          <el-table-column label="操作" fixed="right"
-                           width="100">
+          <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button
+                type="text"
+                v-has="'btn_edit'"
+                @click="addOrUpdateHandle(scope.row.id)"
+                >编辑
               </el-button>
-              <el-button type="text"  v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button
+                type="text"
+                v-has="'btn_remove'"
+                class="JNPF-table-delBtn"
+                @click="handleDel(scope.row.id)"
+                >删除
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: { JNPFForm, ExportBox, Detail },
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          areacode: undefined,
-          areaname: undefined
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [], total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          { prop: 'areacode', label: '库区编码' },
-          { prop: 'areaname', label: '库区名称' },
-          { prop: 'maximum', label: '最高库存' },
-          { prop: 'safety', label: '安全库存' },
-          { prop: 'minimum', label: '最低库存' },
-          { prop: 'unit', label: '计量单位' },
-          { prop: 'warehouseId', label: '仓库' }
-        ],
-        unitOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }],
-        unitProps: { 'label': 'fullName', 'value': 'id' }
-      }
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        areacode: undefined,
+        areaname: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "areacode", label: "库区编码" },
+        { prop: "areaname", label: "库区名称" },
+        { prop: "maximum", label: "最高库存" },
+        { prop: "safety", label: "安全库存" },
+        { prop: "minimum", label: "最低库存" },
+        { prop: "unit", label: "计量单位" },
+        { prop: "warehouseId", label: "仓库" },
+      ],
+      unitOptions: [
+        { fullName: "吨", id: "0" },
+        { fullName: "千克", id: "1" },
+      ],
+      unitProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-reservoirarea-pageSize") !== null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-reservoirarea-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-reservoirarea-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-reservoirarea-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-reservoirarea-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-reservoirarea-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({ column, prop, order }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/Reservoirarea/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          res.data.list[i].creatorTime = res.data.list[i].creatorTime
+            ? res.data.list[i].creatorTime.substring(0, 10)
+            : "";
+          let _data = res.data.list[i];
+          _list.push(_data);
         }
-        request({
-          url: `/api/example/Reservoirarea/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = []
-          for (let i = 0; i < res.data.list.length; i++) {
-            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0, 10) : '';
-            let _data = res.data.list[i]
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/Reservoirarea/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/Reservoirarea/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-        request({
-          url: `/api/example/Reservoirarea/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/Reservoirarea/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "creatorTime",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/saleback/index.vue b/SC-web/src/views/scm/basicInformation/saleback/index.vue
index 277d4a9b..bbed8d46 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/index.vue
@@ -1,41 +1,57 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.documentNo"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="来源销售单号">
-              <el-input v-model="query.saledocumentNo" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.saledocumentNo"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="6">-->
-<!--            <el-form-item label="单据状态 ">-->
-<!--              <el-select v-model="query.status" placeholder="请选择"-->
-<!--                         clearable>-->
-<!--                <el-option v-for="(item, index) in statusOptions" :key="index"-->
-<!--                           :label="item.fullName" :value="item.id"-->
-<!--                           :disabled="item.disabled"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="6">-->
+          <!--            <el-form-item label="单据状态 ">-->
+          <!--              <el-select v-model="query.status" placeholder="请选择"-->
+          <!--                         clearable>-->
+          <!--                <el-option v-for="(item, index) in statusOptions" :key="index"-->
+          <!--                           :label="item.fullName" :value="item.id"-->
+          <!--                           :disabled="item.disabled"></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="6">
             <el-form-item label="制单日期">
-              <el-date-picker v-model="query.creatorTime" type="daterange"
-                              value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                              end-placeholder="结束日期">
+              <el-date-picker
+                v-model="query.creatorTime"
+                type="daterange"
+                value-format="timestamp"
+                format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -43,291 +59,435 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text"  icon="el-icon-plus" @click="addOrUpdateHandle()" v-has="'btn_add'">新增
+            <el-button
+              type="text"
+              icon="el-icon-plus"
+              @click="addOrUpdateHandle()"
+              v-has="'btn_add'"
+              >新增
             </el-button>
-            <el-button type="text"  icon="el-icon-download" @click="exportData()"v-has="'btn_download'">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
             </el-button>
-            <el-button type="text"  icon="el-icon-delete" @click="handleBatchRemoveDel()"v-has="'btn_batchRemove'">批量删除
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'"
+              >批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-                    @selection-change="handleSelectionChange" custom-column border>
-          <el-table-column prop="documentNo" label="单据编号" width="200" align="center" sortable
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentNo"
+            label="单据编号"
+            width="200"
+            align="center"
+            sortable
           />
-          <el-table-column prop="saledocumentNo" label="销售订单" width="200" align="center"sortable
+          <el-table-column
+            prop="saledocumentNo"
+            label="销售订单"
+            width="200"
+            align="center"
+            sortable
           />
-<!--          <el-table-column prop="jg_salesorder.contractName" label="合同名称" width="120"sortable align="center"-->
-<!--          />-->
-<!--          <el-table-column prop="jg_salesorder.costomerName" label="客户名称" width="200" sortable align="center"-->
-<!--          />-->
-          <el-table-column prop="refundAmount" label="退款金额" width="120" align="center" sortable
+          <!--          <el-table-column prop="jg_salesorder.contractName" label="合同名称" width="120"sortable align="center"-->
+          <!--          />-->
+          <!--          <el-table-column prop="jg_salesorder.costomerName" label="客户名称" width="200" sortable align="center"-->
+          <!--          />-->
+          <el-table-column
+            prop="refundAmount"
+            label="退款金额"
+            width="120"
+            align="center"
+            sortable
           />
-          <el-table-column prop="actualAmount" label="实退金额" width="120" align="center" sortable
+          <el-table-column
+            prop="actualAmount"
+            label="实退金额"
+            width="120"
+            align="center"
+            sortable
           />
 
-          <el-table-column label="币别" width="120" sortable prop="currency" align="center" >
+          <el-table-column
+            label="币别"
+            width="120"
+            sortable
+            prop="currency"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
 
-          <el-table-column prop="refundNum" label="退货数量" width="120" align="center" sortable
+          <el-table-column
+            prop="refundNum"
+            label="退货数量"
+            width="120"
+            align="center"
+            sortable
           />
 
-<!--          <el-table-column label="单据状态" width="120" sortable prop="status" align="center" >-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column prop="status" label="单据状态" sortable width="120" align="center">
+          <!--          <el-table-column label="单据状态" width="120" sortable prop="status" align="center" >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="120"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status==0">已保存</el-tag>
-              <el-tag type="info" v-else-if="scope.row.status==1">审批中</el-tag>
-              <el-tag type="warning" v-else-if="scope.row.status==2">已审批</el-tag>
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >已保存</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >审批中</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >已审批</el-tag
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" width="120" align="center" sortable
+          <el-table-column
+            prop="creatorTime"
+            label="创建时间"
+            width="120"
+            align="center"
+            sortable
           />
-          <el-table-column prop="creatorUserName" label="创建人" width="120" align="center" sortable
+          <el-table-column
+            prop="creatorUserName"
+            label="创建人"
+            width="120"
+            align="center"
+            sortable
           />
-          <el-table-column prop="remark" label="备注" width="120" align="center"  sortable
+          <el-table-column
+            prop="remark"
+            label="备注"
+            width="120"
+            align="center"
+            sortable
           />
-          <el-table-column label="操作" fixed="right"
-                           width="150">
+          <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button
+                type="text"
+                v-has="'btn_edit'"
+                @click="addOrUpdateHandle(scope.row.id)"
+                >编辑
               </el-button>
-              <el-button type="text"  v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button
+                type="text"
+                v-has="'btn_remove'"
+                class="JNPF-table-delBtn"
+                @click="handleDel(scope.row.id)"
+                >删除
               </el-button>
-              <el-button type="text"  v-has="'btn_detail'"
-                         @click="goDetail(scope.row.id)">详情
+              <el-button
+                type="text"
+                v-has="'btn_detail'"
+                @click="goDetail(scope.row.id)"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: { JNPFForm, ExportBox, Detail },
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          documentNo: undefined
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        documentNo: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "documentNo", label: "单据编号" },
+        { prop: "saledocumentNo", label: "销售订单" },
+        // { prop: 'jg_salesorder.contractName', label: '合同名称' },
+        // { prop: 'jg_salesorder.costomerName', label: '客户名称' },
+        { prop: "refundAmount", label: "退款金额" },
+        { prop: "actualAmount", label: "实退金额" },
+        { prop: "currency", label: "币别" },
+        { prop: "refundNum", label: "退货数量" },
+        { prop: "status", label: "单据状态 " },
+        { prop: "creatorTime", label: "创建时间" },
+        { prop: "creatorUserName", label: "创建人" },
+        { prop: "remark", label: "备注" },
+      ],
+      currencyOptions: [
+        { fullName: "人民币", id: "0" },
+        { fullName: "美元", id: "1" },
+        {
+          fullName: "英镑",
+          id: "2",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [], total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: ''
+      ],
+      currencyProps: { label: "fullName", value: "id" },
+      statusOptions: [
+        { fullName: "已保存", id: "0" },
+        { fullName: "审批中", id: "1" },
+        {
+          fullName: "已审批",
+          id: "2",
         },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          { prop: 'documentNo', label: '单据编号' },
-          { prop: 'saledocumentNo', label: '销售订单' },
-          // { prop: 'jg_salesorder.contractName', label: '合同名称' },
-          // { prop: 'jg_salesorder.costomerName', label: '客户名称' },
-          { prop: 'refundAmount', label: '退款金额' },
-          { prop: 'actualAmount', label: '实退金额' },
-          { prop: 'currency', label: '币别' },
-          { prop: 'refundNum', label: '退货数量' },
-          { prop: 'status', label: '单据状态 ' },
-          { prop: 'creatorTime', label: '创建时间' },
-          { prop: 'creatorUserName', label: '创建人' },
-          { prop: 'remark', label: '备注' }
-        ],
-        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
-          'fullName': '英镑',
-          'id': '2'
-        }],
-        currencyProps: { 'label': 'fullName', 'value': 'id' },
-        statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '审批中', 'id': '1' }, {
-          'fullName': '已审批',
-          'id': '2'
-        }],
-        statusProps: { 'label': 'fullName', 'value': 'id' }
-      }
+      ],
+      statusProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-saleback-pageSize") !== null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-saleback-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-saleback-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-saleback-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-saleback-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-saleback-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({ column, prop, order }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/saleback/Saleback/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          res.data.list[i].creatorTime = res.data.list[i].creatorTime
+            ? res.data.list[i].creatorTime.substring(0, 10)
+            : "";
+          let _data = res.data.list[i];
+          _list.push(_data);
         }
-        request({
-          url: `/api/saleback/Saleback/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = []
-          for (let i = 0; i < res.data.list.length; i++) {
-            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-              10) : '';
-            let _data = res.data.list[i]
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/saleback/Saleback/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 1500
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 1500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/saleback/Saleback/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-        request({
-          url: `/api/saleback/Saleback/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: ''
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/saleback/Saleback/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: 'desc',
+      //   sidx: ''
+      // }
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index 4194e8d2..3d6627c8 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -6,47 +6,86 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.documentNo"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
-          <el-col :span="6">
-            <el-form-item label="合同名称">
-              <el-input v-model="query.contractName" placeholder="请输入" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户">
-              <el-input v-model="query.customerName" placeholder="请输入" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单据状态 ">
-              <el-select v-model="query.status" placeholder="请选择"
-                         clearable>
-                <el-option v-for="(item, index) in statusOptions" :key="index"
-                           :label="item.fullName" :value="item.id"
-                           :disabled="item.disabled"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单日期">
-              <el-date-picker v-model="query.creatorTime" type="daterange"
-                              value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
-                              end-placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+            <el-col :span="6">
+              <el-form-item label="合同名称">
+                <el-input
+                  v-model="query.contractName"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="客户">
+                <el-input
+                  v-model="query.customerName"
+                  placeholder="请输入"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单据状态 ">
+                <el-select
+                  v-model="query.status"
+                  placeholder="请选择"
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in statusOptions"
+                    :key="index"
+                    :label="item.fullName"
+                    :value="item.id"
+                    :disabled="item.disabled"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="制单日期">
+                <el-date-picker
+                  v-model="query.creatorTime"
+                  type="daterange"
+                  value-format="timestamp"
+                  format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </template>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">展开</el-button>
-              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                收起</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-down"
+                @click="showAll = true"
+                v-if="!showAll"
+                >展开</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-up"
+                @click="showAll = false"
+                v-else
+              >
+                收起</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -56,561 +95,761 @@
           <div>
             <!--  <el-button type="text" icon="el-icon-plus"  @click="addOrUpdateHandle()"v-has="'btn_add'">新增-->
             <!--                                    </el-button>-->
-            <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'"
+              >批量删除
             </el-button>
-            <el-button type="text" icon="el-icon-shopping-cart-2" @click="delivery()" v-has="'btn_delivery'">发货
+            <el-button
+              type="text"
+              icon="el-icon-shopping-cart-2"
+              @click="delivery()"
+              v-has="'btn_delivery'"
+              >发货
             </el-button>
-            <el-button type="text" icon="el-icon-tickets" @click="invoicesEntry()" v-has="'btn_invoicesEntry'">发票录入
+            <el-button
+              type="text"
+              icon="el-icon-tickets"
+              @click="invoicesEntry()"
+              v-has="'btn_invoicesEntry'"
+              >发票录入
             </el-button>
-<!--            <el-button type="text" icon="el-icon-delete" @click="collection()">回款
+            <!--            <el-button type="text" icon="el-icon-delete" @click="collection()">回款
             </el-button>-->
-            <el-button type="text" icon="el-icon-check" @click="archive()" v-has="'btn_archive'">归档
+            <el-button
+              type="text"
+              icon="el-icon-check"
+              @click="archive()"
+              v-has="'btn_archive'"
+              >归档
             </el-button>
-            <el-button type="text" icon="el-icon-truck" @click="materialBack()" v-has="'btn_materialBack'">退货
+            <el-button
+              type="text"
+              icon="el-icon-truck"
+              @click="materialBack()"
+              v-has="'btn_materialBack'"
+              >退货
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-                    @selection-change="handleSelectionChange" custom-column border>
-          <el-table-column prop="documentNo" label="单据编号" sortable width="150" align="center"
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          @selection-change="handleSelectionChange"
+          custom-column
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            prop="documentNo"
+            label="单据编号"
+            sortable
+            width="150"
+            align="center"
           />
           <!--                            <el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"-->
           <!--/>-->
-          <el-table-column prop="contractName" label="合同名称" sortable width="200" align="center"
+          <el-table-column
+            prop="contractName"
+            label="合同名称"
+            sortable
+            width="200"
+            align="center"
           />
-          <el-table-column prop="customerName" label="客户名称" sortable width="170" align="center"
+          <el-table-column
+            prop="customerName"
+            label="客户名称"
+            sortable
+            width="170"
+            align="center"
           />
-          <el-table-column prop="bidSection" label="所属标段" sortable width="130" align="center"
+          <el-table-column
+            prop="bidSection"
+            label="所属标段"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column prop="num" label="重量" sortable width="0" align="center"
+          <el-table-column
+            prop="num"
+            label="重量"
+            sortable
+            width="0"
+            align="center"
           />
-          <el-table-column prop="price" label="金额" sortable width="130" align="center"
+          <el-table-column
+            prop="price"
+            label="金额"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column label="币别" width="0" prop="currency" algin="center" sortable
+          <el-table-column
+            label="币别"
+            width="0"
+            prop="currency"
+            algin="center"
+            sortable
           >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="assessmentPirce" label="考核金额" sortable width="130" align="center"
+          <el-table-column
+            prop="assessmentPirce"
+            label="考核金额"
+            sortable
+            width="130"
+            align="center"
           />
 
-
-          <el-table-column prop="invoiceNum" label="发票数量" sortable width="130" align="center"
+          <el-table-column
+            prop="invoiceNum"
+            label="发票数量"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column prop="invoiceAmount" label="发票金额" sortable width="130" align="center"
+          <el-table-column
+            prop="invoiceAmount"
+            label="发票金额"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column prop="advanceAmount" label="垫资金额" sortable width="130" align="center"
+          <el-table-column
+            prop="advanceAmount"
+            label="垫资金额"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column prop="amountCollected" label="已回款金额" sortable width="130" align="center"
+          <el-table-column
+            prop="amountCollected"
+            label="已回款金额"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column prop="creatorTime" label="制单时间" sortable width="140" align="center"
+          <el-table-column
+            prop="creatorTime"
+            label="制单时间"
+            sortable
+            width="140"
+            align="center"
           />
 
-<!--          <el-table-column label="单据状态 " width="0" prop="status" algin="center"-->
-<!--          >-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column prop="status" label="单据状态" sortable width="130" align="center">
+          <!--          <el-table-column label="单据状态 " width="0" prop="status" algin="center"-->
+          <!--          >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.status | dynamicText(statusOptions) }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            prop="status"
+            label="单据状态"
+            sortable
+            width="130"
+            align="center"
+          >
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status==0">待发货</el-tag>
-              <el-tag type="info" v-else-if="scope.row.status==1">待开票</el-tag>
-              <el-tag type="warning" v-else-if="scope.row.status==2">待回款</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status==3">归档</el-tag>
+              <el-tag type="success" v-if="scope.row.status == 0"
+                >待发货</el-tag
+              >
+              <el-tag type="info" v-else-if="scope.row.status == 1"
+                >待开票</el-tag
+              >
+              <el-tag type="warning" v-else-if="scope.row.status == 2"
+                >待回款</el-tag
+              >
+              <el-tag type="danger" v-else-if="scope.row.status == 3"
+                >归档</el-tag
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="creatorUserName" label="制单人" sortable width="130" align="center"
+          <el-table-column
+            prop="creatorUserName"
+            label="制单人"
+            sortable
+            width="130"
+            align="center"
           />
-          <el-table-column label="操作" fixed="right"  algin="center"
-                           width="150">
+          <el-table-column
+            label="操作"
+            fixed="right"
+            algin="center"
+            width="150"
+          >
             <template slot-scope="scope">
-              <el-button type="text"
-                         @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'">删除
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                @click="handleDel(scope.row)"
+                v-has="'btn_remove'"
+                >删除
               </el-button>
-              <el-button type="text"
-                         @click="goDetail(scope.row.id)" v-has="'btn_detail'">详情
+              <el-button
+                type="text"
+                @click="goDetail(scope.row.id)"
+                v-has="'btn_detail'"
+                >详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <JNPF-Form2 v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2"/>
-    <JNPF-Form3 v-if="formVisible3" ref="JNPFForm3" @refresh="refresh3"/>
-    <JNPF-Form4 v-if="formVisible4" ref="JNPFForm4" @refresh="refresh4"/>
-    <JNPF-Form5 v-if="formVisible5" ref="JNPFForm5" @refresh="refresh5"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <JNPF-Form2 v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2" />
+    <JNPF-Form3 v-if="formVisible3" ref="JNPFForm3" @refresh="refresh3" />
+    <JNPF-Form4 v-if="formVisible4" ref="JNPFForm4" @refresh="refresh4" />
+    <JNPF-Form5 v-if="formVisible5" ref="JNPFForm5" @refresh="refresh5" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import JNPFForm2 from './arinvoicesForm'
-  import JNPFForm3 from './receiptoutForm'
-  import JNPFForm4 from './salebackForm'
-  import JNPFForm5 from './collectionForm'
-  import ExportBox from './ExportBox'
-  import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import JNPFForm2 from "./arinvoicesForm";
+import JNPFForm3 from "./receiptoutForm";
+import JNPFForm4 from "./salebackForm";
+import JNPFForm5 from "./collectionForm";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: {JNPFForm, JNPFForm2, JNPFForm3, JNPFForm4, JNPFForm5, ExportBox, Detail},
-    data() {
-      return {
-        showAll: false,
-        detailVisible: false,
-        query: {
-          documentNo: undefined,
-          status: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        multipleSelectionItem: [],
-        total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
+export default {
+  components: {
+    JNPFForm,
+    JNPFForm2,
+    JNPFForm3,
+    JNPFForm4,
+    JNPFForm5,
+    ExportBox,
+    Detail,
+  },
+  data() {
+    return {
+      showAll: false,
+      detailVisible: false,
+      query: {
+        documentNo: undefined,
+        status: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      multipleSelectionItem: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      formVisible2: false,
+      formVisible3: false,
+      formVisible4: false,
+      formVisible5: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "documentNo", label: "单据编号" },
+        { prop: "erpNo", label: "ERP订单号" },
+        { prop: "contractName", label: "合同名称" },
+        { prop: "customerName", label: "客户名称" },
+        { prop: "price", label: "金额" },
+        { prop: "num", label: "重量" },
+        { prop: "currency", label: "币别" },
+        { prop: "amountCollected", label: "已回款金额" },
+        { prop: "invoiceNum", label: "发票数量" },
+        { prop: "invoiceAmount", label: "发票金额" },
+        { prop: "advanceAmount", label: "垫资金额" },
+        { prop: "creatorTime", label: "制单时间" },
+        { prop: "assessmentPirce", label: "考核金额" },
+        { prop: "bidSection", label: "所属标段" },
+        { prop: "status", label: "单据状态 " },
+        { prop: "creatorUserName", label: "制单人" },
+      ],
+      currencyOptions: [
+        { fullName: "人民币", id: "0" },
+        { fullName: "美元", id: "1" },
+        { fullName: "英镑", id: "2" },
+      ],
+      currencyProps: { label: "fullName", value: "id" },
+      statusOptions: [
+        { fullName: "待发货", id: "0" },
+        { fullName: "待开票", id: "1" },
+        {
+          fullName: "待回款",
+          id: "2",
         },
-        formVisible: false,
-        formVisible2: false,
-        formVisible3: false,
-        formVisible4: false,
-        formVisible5: false,
-        exportBoxVisible: false,
-        columnList: [
-          {prop: 'documentNo', label: '单据编号'},
-          {prop: 'erpNo', label: 'ERP订单号'},
-          {prop: 'contractName', label: '合同名称'},
-          {prop: 'customerName', label: '客户名称'},
-          {prop: 'price', label: '金额'},
-          {prop: 'num', label: '重量'},
-          {prop: 'currency', label: '币别'},
-          {prop: 'amountCollected', label: '已回款金额'},
-          {prop: 'invoiceNum', label: '发票数量'},
-          {prop: 'invoiceAmount', label: '发票金额'},
-          {prop: 'advanceAmount', label: '垫资金额'},
-          {prop: 'creatorTime', label: '制单时间'},
-          {prop: 'assessmentPirce', label: '考核金额'},
-          {prop: 'bidSection', label: '所属标段'},
-          {prop: 'status', label: '单据状态 '},
-          {prop: 'creatorUserName', label: '制单人'},
-        ],
-        currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
-        currencyProps: {"label": "fullName", "value": "id"},
-        statusOptions: [{"fullName": "待发货", "id": "0"}, {"fullName": "待开票", "id": "1"}, {
-          "fullName": "待回款",
-          "id": "2"
-        }, {"fullName": "归档", "id": "3"}],
-        statusProps: {"label": "fullName", "value": "id"},
-      }
+        { fullName: "归档", id: "3" },
+      ],
+      statusProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-saleorder-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-saleorder-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-saleorder-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-saleorder-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-saleorder-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem(
+      "scm-basicInformation-saleorder-query",
+      json_query
+    );
+  },
+  methods: {
+    delivery() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
       }
-    },
-    created() {
-      this.initData()
-    },
-    methods: {
-      delivery() {
-        if (!this.multipleSelection.length) {
+      const ids = this.multipleSelection.join();
+      request({
+        url: `/api/saleorder/Saleorderitem/delivery/${ids}`,
+        method: "post",
+      }).then((res) => {
+        debugger;
+        const list = [];
+        for (let i = 0; i < res.data.length; i++) {
+          let _data = res.data[i];
+          list.push(_data);
+          debugger;
+        }
+        if (list.length > 0) {
+          this.formVisible3 = true;
+          this.$nextTick(() => {
+            this.$refs.JNPFForm3.init(list);
+          });
+        } else {
           this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
+            message: "未找到符合条件数据",
+            type: "error",
+            duration: 1000,
+          });
         }
-        const ids = this.multipleSelection.join()
-        request({
-          url: `/api/saleorder/Saleorderitem/delivery/${ids}`,
-          method: 'post'
-        }).then(res => {
-          debugger
+      });
+    },
+    invoicesEntry() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      request({
+        url: `/api/saleorder/Saleorderitem/invoiceentry/${ids}`,
+        method: "post",
+      }).then((res) => {
+        if (res.data instanceof Array) {
           const list = [];
           for (let i = 0; i < res.data.length; i++) {
-            let _data = res.data[i]
-            list.push(_data)
-            debugger
+            // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+            //   10) : '';
+            let _data = res.data[i];
+            list.push(_data);
           }
           if (list.length > 0) {
-            this.formVisible3 = true
+            this.formVisible2 = true;
             this.$nextTick(() => {
-              this.$refs.JNPFForm3.init(list)
-            })
+              this.$refs.JNPFForm2.init(list);
+            });
           } else {
             this.$message({
-              message: '未找到符合条件数据',
-              type: 'error',
-              duration: 1000
-            })
-          }
-        })
-      },
-      invoicesEntry() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        request({
-          url: `/api/saleorder/Saleorderitem/invoiceentry/${ids}`,
-          method: 'post'
-        }).then(res => {
-          if (res.data instanceof Array) {
-            const list = [];
-            for (let i = 0; i < res.data.length; i++) {
-              // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-              //   10) : '';
-              let _data = res.data[i]
-              list.push(_data)
-            }
-            if (list.length > 0) {
-              this.formVisible2 = true
-              this.$nextTick(() => {
-                this.$refs.JNPFForm2.init(list)
-              })
-            } else {
-              this.$message({
-                message: '未找到符合条件数据',
-                type: 'error',
-                duration: 1000
-              })
-            }
-          } else if (res.data instanceof Object) {
-            debugger
-            let list2 = {};
-            list2 = res.data
-            debugger
-            if (list2 != null) {
-              this.formVisible2 = true
-              this.$nextTick(() => {
-                this.$refs.JNPFForm2.init2(list2)
-                debugger
-              })
-            } else {
-              this.$message({
-                message: '未找到符合条件数据',
-                type: 'error',
-                duration: 1000
-              })
-            }
-          }
-        })
-      },
-      collection() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        request({
-          url: `/api/saleorder/Saleorderitem/collection/${ids}`,
-          method: 'post'
-        }).then(res => {
-          const list = [];
-          for (let i = 0; i < res.data.length; i++) {
-            // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-            //   10) : '';
-            let _data = res.data[i]
-            list.push(_data)
-            debugger
+              message: "未找到符合条件数据",
+              type: "error",
+              duration: 1000,
+            });
           }
-          if (list.length > 0) {
-            this.formVisible5 = true
+        } else if (res.data instanceof Object) {
+          debugger;
+          let list2 = {};
+          list2 = res.data;
+          debugger;
+          if (list2 != null) {
+            this.formVisible2 = true;
             this.$nextTick(() => {
-              this.$refs.JNPFForm5.init(list)
-            })
+              this.$refs.JNPFForm2.init2(list2);
+              debugger;
+            });
           } else {
             this.$message({
-              message: '未找到符合条件数据',
-              type: 'error',
-              duration: 1000
-            })
+              message: "未找到符合条件数据",
+              type: "error",
+              duration: 1000,
+            });
           }
-        })
-      },
-      archive() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
         }
-        const ids = this.multipleSelection.join()
-        request({
-          url: `/api/saleorder/Saleorderitem/archive/${ids}`,
-          method: 'post'
-        }).then(res => {
+      });
+    },
+    collection() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      request({
+        url: `/api/saleorder/Saleorderitem/collection/${ids}`,
+        method: "post",
+      }).then((res) => {
+        const list = [];
+        for (let i = 0; i < res.data.length; i++) {
+          // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+          //   10) : '';
+          let _data = res.data[i];
+          list.push(_data);
+          debugger;
+        }
+        if (list.length > 0) {
+          this.formVisible5 = true;
+          this.$nextTick(() => {
+            this.$refs.JNPFForm5.init(list);
+          });
+        } else {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+            message: "未找到符合条件数据",
+            type: "error",
+            duration: 1000,
           });
-        })
-      },
-      materialBack() {
-        if (!this.multipleSelection.length) {
+        }
+      });
+    },
+    archive() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      request({
+        url: `/api/saleorder/Saleorderitem/archive/${ids}`,
+        method: "post",
+      }).then((res) => {
+        this.$message({
+          type: "success",
+          message: res.msg,
+          onClose: () => {
+            this.initData();
+          },
+        });
+      });
+    },
+    materialBack() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      request({
+        url: `/api/saleorder/Saleorderitem/materialback/${ids}`,
+        method: "post",
+      }).then((res) => {
+        const list = [];
+        for (let i = 0; i < res.data.length; i++) {
+          // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+          //   10) : '';
+          let _data = res.data[i];
+          list.push(_data);
+          debugger;
+        }
+        if (list.length > 0) {
+          this.formVisible4 = true;
+          this.$nextTick(() => {
+            this.$refs.JNPFForm4.init(list);
+          });
+        } else {
           this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
+            message: "未找到符合条件数据",
+            type: "error",
+            duration: 1000,
+          });
         }
-        const ids = this.multipleSelection.join()
-        request({
-          url: `/api/saleorder/Saleorderitem/materialback/${ids}`,
-          method: 'post'
-        }).then(res => {
-          const list = [];
-          for (let i = 0; i < res.data.length; i++) {
-            // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-            //   10) : '';
-            let _data = res.data[i]
-            list.push(_data)
-            debugger
-          }
-          if (list.length > 0) {
-            this.formVisible4 = true
-            this.$nextTick(() => {
-              this.$refs.JNPFForm4.init(list)
-            })
-          } else {
-            this.$message({
-              message: '未找到符合条件数据',
-              type: 'error',
-              duration: 1000
-            })
-          }
-        })
-      },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({column, prop, order}) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        };
-        request({
-          url: `/api/saleorder/Saleorderitem/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = [];
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i];
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+      });
+    },
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
+    },
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
+    },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/saleorder/Saleorderitem/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
+        }
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(row) {
-          if (row.status == '2' || row.status == '3') {
-            this.$message({
-              type: 'error',
-              message: '发票录入后无法删除',
-              duration: 2500
-            });
-            return
-          }
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(row) {
+      if (row.status == "2" || row.status == "3") {
+        this.$message({
+          type: "error",
+          message: "发票录入后无法删除",
+          duration: 2500,
+        });
+        return;
+      }
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/saleorder/Saleorderitem/${row.id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
+                this.initData();
+              },
             });
-          })
-        }).catch(() => {
+          });
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      this.multipleSelectionItem = val;
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
         });
-      },
-      handleSelectionChange(val) {
-        this.multipleSelectionItem = val
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500,
-          })
-          return
+        return;
+      }
+      var statusFlag = true;
+      this.multipleSelectionItem.forEach((item, index) => {
+        if (item.status == "2" || item.status == "3") {
+          statusFlag = false;
         }
-        var statusFlag = true;
-          this.multipleSelectionItem.forEach((item, index)=>{
-            if(item.status == '2' || item.status == '3'){
-              statusFlag = false;
-            }
-          });
-          if(!statusFlag){
-            this.$message({
-            	type: 'error',
-            	message: '发票录入后无法删除',
-              duration: 1000
-            });
-            return
-          }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+      });
+      if (!statusFlag) {
+        this.$message({
+          type: "error",
+          message: "发票录入后无法删除",
+          duration: 1000,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/saleorder/Saleorderitem/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            });
-          })
-        }).catch(() => {
-        })
-      },
-      addOrUpdateHandle(row, isDetail) {
-        var id = undefined;
-        if (row) {
-          id = row.id;
-          if (row.status != '0') {
-            this.$message({
-              type: 'error',
-              message: '发货后无法编辑',
-              duration: 2500
+                this.initData();
+              },
             });
-            return
-          }
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
-        request({
-          url: `/api/saleorder/Saleorderitem/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          });
         })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      refresh2(isrRefresh) {
-        this.formVisible2 = false
-        if (isrRefresh) this.reset()
-      },
-      refresh3(isrRefresh) {
-        this.formVisible3 = false
-        if (isrRefresh) this.reset()
-      },
-      refresh4(isrRefresh) {
-        this.formVisible4 = false
-        if (isrRefresh) this.reset()
-      },
-      refresh5(isrRefresh) {
-        this.formVisible5 = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        // for (let key in this.query) {
-        //   this.query[key] = undefined
-        // }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
+        .catch(() => {});
+    },
+    addOrUpdateHandle(row, isDetail) {
+      var id = undefined;
+      if (row) {
+        id = row.id;
+        if (row.status != "0") {
+          this.$message({
+            type: "error",
+            message: "发货后无法编辑",
+            duration: 2500,
+          });
+          return;
         }
-        this.search()
       }
-    }
-  }
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/saleorder/Saleorderitem/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh2(isrRefresh) {
+      this.formVisible2 = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh3(isrRefresh) {
+      this.formVisible3 = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh4(isrRefresh) {
+      this.formVisible4 = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh5(isrRefresh) {
+      this.formVisible5 = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
index c890d7a2..e6abc72d 100644
--- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue
+++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
@@ -1,23 +1,34 @@
 <template>
   <div class="JNPF-common-layout">
-
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="仓库编码">
-              <el-input v-model="query.code" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.code"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="仓库名称">
-              <el-input v-model="query.name" placeholder="请输入" clearable></el-input>
+              <el-input
+                v-model="query.name"
+                placeholder="请输入"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="resetAll()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -25,277 +36,415 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-              <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-              </el-button>
-              <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
-              </el-button>
-<!--              <el-button type="text" v-has="'btn_upload'"  icon="el-icon-download" @click="">导入-->
-<!--              </el-button>-->
-              <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
-              </el-button>
+            <el-button
+              type="primary"
+              v-has="'btn_add'"
+              icon="el-icon-plus"
+              @click="addOrUpdateHandle()"
+              >新增
+            </el-button>
+            <el-button
+              type="text"
+              v-has="'btn_download'"
+              icon="el-icon-download"
+              @click="exportData()"
+              >导出
+            </el-button>
+            <!--              <el-button type="text" v-has="'btn_upload'"  icon="el-icon-download" @click="">导入-->
+            <!--              </el-button>-->
+            <el-button
+              type="text"
+              v-has="'btn_batchRemove'"
+              icon="el-icon-delete"
+              @click="handleBatchRemoveDel()"
+              >批量删除
+            </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                       @click="reset()"/>
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="reset()"
+              />
             </el-tooltip>
-            <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-                    @selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号"    align="center" />
-          <el-table-column prop="code" label="仓库编码" width="200" align="center" sortable
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          has-c
+          :hasNO="false"
+          @selection-change="handleSelectionChange"
+          border
+        >
+          <el-table-column type="index" fixed="left" width="1" />
+          <el-table-column
+            type="index"
+            width="50"
+            label="序号"
+            align="center"
           />
-          <el-table-column prop="name" label="仓库名称" width="200" align="center" sortable
+          <el-table-column
+            prop="code"
+            label="仓库编码"
+            width="200"
+            align="center"
+            sortable
           />
-          <el-table-column prop="companyCode" label="公司" width="200" align="center" sortable
+          <el-table-column
+            prop="name"
+            label="仓库名称"
+            width="200"
+            align="center"
+            sortable
           />
-          <el-table-column prop="location" label="仓库位置" width="200" align="center" sortable
+          <el-table-column
+            prop="companyCode"
+            label="公司"
+            width="200"
+            align="center"
+            sortable
+          />
+          <el-table-column
+            prop="location"
+            label="仓库位置"
+            width="200"
+            align="center"
+            sortable
           />
 
-          <el-table-column label="仓库类型" width="120" sortable prop="type" align="center" >
+          <el-table-column
+            label="仓库类型"
+            width="120"
+            sortable
+            prop="type"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.type | dynamicText(typeOptions) }}
             </template>
           </el-table-column>
 
-
-          <el-table-column prop="sublibrary" label="ERP子库" width="200" align="center" sortable
+          <el-table-column
+            prop="sublibrary"
+            label="ERP子库"
+            width="200"
+            align="center"
+            sortable
           />
 
-          <el-table-column label="激活状态" width="120" sortable prop="activestate" align="center" >
+          <el-table-column
+            label="激活状态"
+            width="120"
+            sortable
+            prop="activestate"
+            align="center"
+          >
             <template slot-scope="scope">
               {{ scope.row.activestate | dynamicText(activestateOptions) }}
             </template>
           </el-table-column>
 
-          <el-table-column prop="remark" label="备注" width="0" align="center" sortable
+          <el-table-column
+            prop="remark"
+            label="备注"
+            width="0"
+            align="center"
+            sortable
           />
-          <el-table-column label="操作" fixed="right"
-                           width="100">
+          <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button
+                type="text"
+                v-has="'btn_edit'"
+                @click="addOrUpdateHandle(scope.row.id)"
+                >编辑
               </el-button>
-              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button
+                type="text"
+                v-has="'btn_remove'"
+                class="JNPF-table-delBtn"
+                @click="handleDel(scope.row.id)"
+                >删除
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
       </div>
     </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail
+      v-if="detailVisible"
+      ref="Detail"
+      @refresh="detailVisible = false"
+    />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-  import JNPFForm from './Form'
-  import ExportBox from './ExportBox'
-  import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-  import Detail from './Detail'
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import JNPFForm from "./Form";
+import ExportBox from "./ExportBox";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import Detail from "./Detail";
 
-  export default {
-    components: { JNPFForm, ExportBox, Detail },
-    data() {
-      return {
-        detailVisible: false,
-        query: {
-          code: undefined,
-          name: undefined
+export default {
+  components: { JNPFForm, ExportBox, Detail },
+  data() {
+    return {
+      detailVisible: false,
+      query: {
+        code: undefined,
+        name: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "creatorTime",
+      },
+      formVisible: false,
+      exportBoxVisible: false,
+      columnList: [
+        { prop: "code", label: "仓库编码" },
+        { prop: "name", label: "仓库名称" },
+        { prop: "companyCode", label: "公司" },
+        { prop: "location", label: "仓库位置" },
+        { prop: "type", label: "仓库类型" },
+        { prop: "sublibrary", label: "ERP子库" },
+        { prop: "activestate", label: "激活状态 " },
+        { prop: "remark", label: "备注" },
+      ],
+      typeOptions: [
+        { fullName: "原料库", id: "0" },
+        { fullName: "中间库", id: "1" },
+        {
+          fullName: "成品库",
+          id: "2",
         },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id'
+        { fullName: "副产品库", id: "3" },
+        { fullName: "废次品库", id: "4" },
+        {
+          fullName: "备件辅材库",
+          id: "5",
         },
-        list: [],
-        listLoading: true,
-        multipleSelection: [], total: 0,
-        listQuery: {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
+        { fullName: "贸易虚拟库", id: "6" },
+        { fullName: "仓储库", id: "7" },
+        {
+          fullName: "能源库",
+          id: "8",
         },
-        formVisible: false,
-        exportBoxVisible: false,
-        columnList: [
-          { prop: 'code', label: '仓库编码' },
-          { prop: 'name', label: '仓库名称' },
-          { prop: 'companyCode', label: '公司' },
-          { prop: 'location', label: '仓库位置' },
-          { prop: 'type', label: '仓库类型' },
-          { prop: 'sublibrary', label: 'ERP子库' },
-          { prop: 'activestate', label: '激活状态 ' },
-          { prop: 'remark', label: '备注' }
-        ],
-        typeOptions: [{ 'fullName': '原料库', 'id': '0' }, { 'fullName': '中间库', 'id': '1' }, {
-          'fullName': '成品库',
-          'id': '2'
-        }, { 'fullName': '副产品库', 'id': '3' }, { 'fullName': '废次品库', 'id': '4' }, {
-          'fullName': '备件辅材库',
-          'id': '5'
-        }, { 'fullName': '贸易虚拟库', 'id': '6' }, { 'fullName': '仓储库', 'id': '7' }, {
-          'fullName': '能源库',
-          'id': '8'
-        }, { 'fullName': '其他库', 'id': '9' }, { 'fullName': '帐外库', 'id': '10' }],
-        typeProps: { 'label': 'fullName', 'value': 'id' },
-        activestateOptions: [{ 'fullName': '激活', 'id': '1' }, { 'fullName': '未激活', 'id': '0' }],
-        activestateProps: { 'label': 'fullName', 'value': 'id' }
-      }
+        { fullName: "其他库", id: "9" },
+        { fullName: "帐外库", id: "10" },
+      ],
+      typeProps: { label: "fullName", value: "id" },
+      activestateOptions: [
+        { fullName: "激活", id: "1" },
+        { fullName: "未激活", id: "0" },
+      ],
+      activestateProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {
+    menuId() {
+      return this.$route.meta.modelId || "";
     },
-    computed: {
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
+  },
+  created() {
+    if (
+      sessionStorage.getItem("scm-basicInformation-warehouse-pageSize") !==
+      null
+    ) {
+      this.listQuery.pageSize = parseInt(
+        sessionStorage.getItem("scm-basicInformation-warehouse-pageSize")
+      );
+    }
+    if (
+      sessionStorage.getItem("scm-basicInformation-warehouse-query") !== null
+    ) {
+      let json_query = sessionStorage.getItem(
+        "scm-basicInformation-warehouse-query"
+      );
+      let obj_query = JSON.parse(json_query);
+      this.query = obj_query;
+    }
+    this.initData();
+  },
+  beforeDestroy() {
+    sessionStorage.setItem(
+      "scm-basicInformation-warehouse-pageSize",
+      this.listQuery.pageSize
+    );
+    let json_query = JSON.stringify(this.query);
+    sessionStorage.setItem("scm-basicInformation-warehouse-query", json_query);
+  },
+  methods: {
+    goDetail(id) {
+      this.detailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id);
+      });
     },
-    created() {
-      this.initData()
+    sortChange({ column, prop, order }) {
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
-    methods: {
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({ column, prop, order }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      initData() {
-        this.listLoading = true
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/WareHouse/getList`,
+        method: "post",
+        data: _query,
+      }).then((res) => {
+        var _list = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let _data = res.data.list[i];
+          _list.push(_data);
         }
-        request({
-          url: `/api/example/WareHouse/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = []
-          for (let i = 0; i < res.data.list.length; i++) {
-            let _data = res.data.list[i]
-            _list.push(_data)
-          }
-          this.list = _list
-          this.total = res.data.pagination.total
+        this.list = _list;
+        this.total = res.data.pagination.total;
 
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
+        this.listLoading = false;
+      });
+    },
+    handleDel(id) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/WareHouse/${id}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 2500
-          })
-          return
-        }
-        const ids = this.multipleSelection.join()
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 2500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection.join();
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
           request({
             url: `/api/example/WareHouse/batchRemove/${ids}`,
-            method: 'DELETE'
-          }).then(res => {
+            method: "DELETE",
+          }).then((res) => {
             this.$message({
-              type: 'success',
+              type: "success",
               message: res.msg,
               onClose: () => {
-                this.initData()
-              }
-            })
-          })
-        }).catch(() => {
+                this.initData();
+              },
+            });
+          });
         })
-      },
-      addWarehouse(){this.formVisible = true},
-      addOrUpdateHandle(id, isDetail) {
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail)
-        })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.columnList)
-        })
-      },
-      download(data) {
-        let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-        request({
-          url: `/api/example/WareHouse/Actions/Export`,
-          method: 'GET',
-          data: query
-        }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery = {
-          currentPage: 1,
-          pageSize: 20,
-          sort: 'desc',
-          sidx: 'creatorTime'
-        }
-        this.initData()
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
-      },
-      resetAll() {
-        for (let key in this.query) {
-          this.query[key] = undefined
-        }
-        this.search()
+        .catch(() => {});
+    },
+    addWarehouse() {
+      this.formVisible = true;
+    },
+    addOrUpdateHandle(id, isDetail) {
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/example/WareHouse/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      // this.listQuery = {
+      //   currentPage: 1,
+      //   pageSize: 20,
+      //   sort: "desc",
+      //   sidx: "creatorTime",
+      // };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
       }
-    }
-  }
+      this.search();
+    },
+    resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>