diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue
index 04309368..fbc4feb8 100644
--- a/src/views/accounting/voucher/index.vue
+++ b/src/views/accounting/voucher/index.vue
@@ -88,11 +88,6 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-      <!-- <el-table-column label="业务实体id" align="center" prop="companyId" />
-      <el-table-column label="业务实体" align="center" prop="company" />
-      <el-table-column label="所属部门id" align="center" prop="deptId" />
-      <el-table-column label="所属部门" align="center" prop="deptName" /> -->
       <el-table-column label="凭证号" align="center" prop="voucherNum" />
       <el-table-column label="凭证日期" align="center" prop="voucherTime" />
       <el-table-column label="摘要" align="center" prop="digest" />
@@ -109,39 +104,6 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <!-- <el-table-column label="核准人" align="center" prop="checker" />
-      <el-table-column label="经办人" align="center" prop="handle" />
-      <el-table-column label="业务标识" align="center" prop="serviceId" />
-      <el-table-column label="业务说明" align="center" prop="serviceExplain" />
-      <el-table-column label="流程号/文件号" align="center" prop="flowId" />
-      <el-table-column label="文件来源" align="center" prop="source" />
-      <el-table-column label="年度" align="center" prop="year" />
-      <el-table-column label="会计期间" align="center" prop="period" />
-      <el-table-column label="借阅状态" align="center" prop="borrowStatus">
-        <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.ACCOUNTING_BORROW_STAUTS"
-            :value="scope.row.borrowStatus"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="归档时间" align="center" prop="recordTime" /> -->
-      <!-- <el-table-column label="归档状态" align="center" prop="fileStatus">
-        <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.ARCHIVES_FILE_STATUS"
-            :value="scope.row.fileStatus"
-          />
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column
-        label="立档单位ID"
-        align="center"
-        prop="organizationId"
-      />
-      <el-table-column label="库房ID" align="center" prop="depotId" />
-      <el-table-column label="档案柜ID" align="center" prop="cabinetId" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -184,12 +146,6 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <!-- <el-form-item label="业务实体" prop="company">
-          <el-input v-model="form.company" placeholder="请输入业务实体" />
-        </el-form-item>
-        <el-form-item label="所属部门" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属部门" />
-        </el-form-item> -->
         <el-row>
           <el-col :span="8">
             <el-form-item label="凭证号" prop="voucherNum">
@@ -218,92 +174,85 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="审核人" prop="audit">
-              <el-input v-model="form.audit" placeholder="请输入审核人" />
+              <el-select
+                v-model="audit"
+                filterable
+                placeholder="请选择审核人"
+                value-key="id"
+                @change="handleSelectUser"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="核准人" prop="checker">
-              <el-input v-model="form.checker" placeholder="请输入核准人" />
+              <el-select
+                v-model="checker"
+                filterable
+                placeholder="请选择核准人"
+                value-key="id"
+                @change="handleSelectUser1"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="经办人" prop="handle">
-              <el-input v-model="form.handle" placeholder="请输入经办人" />
+              <el-select
+                v-model="handle"
+                filterable
+                placeholder="请选择经办人"
+                value-key="id"
+                @change="handleSelectUser2"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="纸档位置" prop="site">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="摘要" prop="digest">
+              <el-input v-model="form.digest" placeholder="请输入摘要" />
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-form-item label="业务标识" prop="serviceId">
-          <el-input v-model="form.serviceId" placeholder="请输入业务标识" />
-        </el-form-item>
-        <el-form-item label="业务说明" prop="serviceExplain">
-          <el-input
-            v-model="form.serviceExplain"
-            placeholder="请输入业务说明"
-          />
-        </el-form-item>
-
-        <el-form-item label="流程号/文件号" prop="flowId">
-          <el-input v-model="form.flowId" placeholder="请输入流程号/文件号" />
-        </el-form-item>
-        <el-form-item label="文件来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入文件来源" />
-        </el-form-item>
-        <el-form-item label="年度" prop="year">
-          <el-input v-model="form.year" placeholder="请输入年度" />
-        </el-form-item>
-        <el-form-item label="会计期间" prop="period">
-          <el-input v-model="form.period" placeholder="请输入会计期间" />
-        </el-form-item>
-        <el-form-item label="借阅状态" prop="borrowStatus">
-          <el-radio-group v-model="form.borrowStatus">
-            <el-radio
-              v-for="dict in this.getDictDatas(
-                DICT_TYPE.ACCOUNTING_BORROW_STAUTS
-              )"
-              :key="dict.value"
-              :label="dict.value"
-              >{{ dict.label }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="归档时间" prop="recordTime">
-          <el-date-picker
-            clearable
-            v-model="form.recordTime"
-            type="date"
-            value-format="timestamp"
-            placeholder="选择归档时间"
-          />
-        </el-form-item>
-        <el-form-item label="纸档位置" prop="position">
-          <el-input v-model="form.position" placeholder="请输入纸档位置" />
-        </el-form-item>
-        <el-form-item label="完整性" prop="cherks">
-          <el-input v-model="form.cherks" placeholder="请输入完整性" />
-        </el-form-item>
-        <el-form-item label="归档id，一个归档id对应多个凭证号" prop="recordId">
-          <el-input
-            v-model="form.recordId"
-            placeholder="请输入归档id，一个归档id对应多个凭证号"
-          />
-        </el-form-item>
-        <el-form-item label="归档状态" prop="fileStatus">
-          <el-radio-group v-model="form.fileStatus">
-            <el-radio
-              v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_FILE_STATUS)"
-              :key="dict.value"
-              :label="dict.value"
-              >{{ dict.label }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item> -->
-        <el-form-item label="摘要" prop="digest">
-          <el-input v-model="form.digest" placeholder="请输入摘要" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
-            type="textarea "
+            type="textarea"
             placeholder="请输入备注"
           />
         </el-form-item>
@@ -325,12 +274,19 @@ import {
   getVoucherPage,
   exportVoucherExcel,
 } from "@/api/accounting/voucher";
+import { listUser } from "@/api/system/user";
+import { getSiteTree } from "@/api/setting/organization";
 
 export default {
   name: "Voucher",
   components: {},
   data() {
     return {
+      propName: {
+        label: "pName",
+        value: "pId",
+        multiple: false,
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -384,10 +340,18 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      userOptions: [], //用户数据
+      siteOptions: [], //归档位置数据
+      siteArray: [], //归档位置选中值
+      audit: null,
+      checker: null,
+      handle: null,
     };
   },
   created() {
     this.getList();
+    this.getUserList();
+    this.getSiteList();
   },
   methods: {
     /** 查询列表 */
@@ -400,6 +364,40 @@ export default {
         this.loading = false;
       });
     },
+    //获取归档位置
+    getSiteList() {
+      getSiteTree().then((response) => {
+        this.siteOptions = response.data;
+        this.siteOptions.map((w) => {
+          w.children.map((l) => {
+            let lstr = JSON.stringify(l.children)
+              .replace(/depotId/g, "lId")
+              .replace(/cabinetId/g, "pId")
+              .replace(/cabinetName/g, "pName");
+            l.children = JSON.parse(lstr);
+          });
+
+          let wstr = JSON.stringify(w.children)
+            .replace(/organizationId/g, "wId")
+            .replace(/depotId/g, "pId")
+            .replace(/depotName/g, "pName");
+          w.children = JSON.parse(wstr);
+        });
+        let ostr = JSON.stringify(this.siteOptions)
+          .replace(/organizationId/g, "pId")
+          .replace(/organizationName/g, "pName");
+        this.siteOptions = JSON.parse(ostr);
+        console.log(this.siteOptions);
+      });
+    },
+    //选择默认的归档位置
+    handleSiteChanged(obj) {
+      if (obj != null) {
+        this.form.organizationId = obj[0];
+        this.form.depotId = obj[1];
+        this.form.cabinetId = obj[2];
+      }
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -451,6 +449,21 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    //获取用户
+    getUserList() {
+      listUser().then((response) => {
+        this.userOptions = response.data.list;
+      });
+    },
+    handleSelectUser(val) {
+      this.form.audit = val.username;
+    },
+    handleSelectUser1(val) {
+      this.form.checker = val.username;
+    },
+    handleSelectUser2(val) {
+      this.form.handle = val.username;
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();