diff --git a/src/views/archives/turnOver/index.vue b/src/views/archives/turnOver/index.vue
index 8d34666f..62e18c54 100644
--- a/src/views/archives/turnOver/index.vue
+++ b/src/views/archives/turnOver/index.vue
@@ -1,94 +1,70 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="98px"
+    >
       <el-form-item label="移交单号" prop="applyNo">
-        <el-input v-model="queryParams.applyNo" placeholder="请输入移交单号" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.applyNo"
+          placeholder="请输入移交单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="移交日期" prop="turnDate">
-        <el-date-picker v-model="queryParams.turnDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="移交说明" prop="turnExplain">
-        <el-input v-model="queryParams.turnExplain" placeholder="请输入移交说明" clearable @keyup.enter.native="handleQuery"/>
+        <el-date-picker
+          v-model="queryParams.turnDate"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
       </el-form-item>
       <el-form-item label="移交人" prop="outputName">
-        <el-input v-model="queryParams.outputName" placeholder="请输入移交人" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="移交人ID" prop="outputNameId">
-        <el-input v-model="queryParams.outputNameId" placeholder="请输入移交人ID" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.outputName"
+          placeholder="请输入移交人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="签收人" prop="inputName">
-        <el-input v-model="queryParams.inputName" placeholder="请输入签收人" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="签收人ID" prop="inputNameId">
-        <el-input v-model="queryParams.inputNameId" placeholder="请输入签收人ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="用户ID" prop="userId">
-        <el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属部门ID" prop="deptId">
-        <el-input v-model="queryParams.deptId" placeholder="请输入所属部门ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptName">
-        <el-input v-model="queryParams.deptName" placeholder="请输入所属部门" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="业务实体ID" prop="companyId">
-        <el-input v-model="queryParams.companyId" placeholder="请输入业务实体ID" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.inputName"
+          placeholder="请输入签收人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="业务实体" prop="company">
-        <el-input v-model="queryParams.company" placeholder="请输入业务实体" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="制单人" prop="createBy">
-        <el-input v-model="queryParams.createBy" placeholder="请输入制单人" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="从立档单位ID" prop="fromOrganizationId">
-        <el-input v-model="queryParams.fromOrganizationId" placeholder="请输入从立档单位ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="从库房ID" prop="fromDepotId">
-        <el-input v-model="queryParams.fromDepotId" placeholder="请输入从库房ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="从档案柜ID" prop="fromCabinetId">
-        <el-input v-model="queryParams.fromCabinetId" placeholder="请输入从档案柜ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="到立档单位ID" prop="toOrganizationId">
-        <el-input v-model="queryParams.toOrganizationId" placeholder="请输入到立档单位ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="到库房ID" prop="toDepotId">
-        <el-input v-model="queryParams.toDepotId" placeholder="请输入到库房ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="到档案柜ID" prop="toCabinetId">
-        <el-input v-model="queryParams.toCabinetId" placeholder="请输入到档案柜ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="制单人id" prop="createById">
-        <el-input v-model="queryParams.createById" placeholder="请输入制单人id" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.company"
+          placeholder="请输入业务实体"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="案卷数量" prop="amount">
-        <el-input v-model="queryParams.amount" placeholder="请输入案卷数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例的编号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="申请类型" prop="billType">
-        <el-select v-model="queryParams.billType" placeholder="请选择申请类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+        <el-input
+          v-model="queryParams.amount"
+          placeholder="请输入案卷数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -96,147 +72,271 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['archives:turn-over:create']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['archives:turn-over:create']"
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['archives:turn-over:export']">导出</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['archives:turn-over:export']"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="主键ID" align="center" prop="id" />
       <el-table-column label="移交单号" align="center" prop="applyNo" />
-      <el-table-column label="移交日期" align="center" prop="turnDate" width="180">
+      <el-table-column
+        label="移交日期"
+        align="center"
+        prop="turnDate"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.turnDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="移交说明" align="center" prop="turnExplain" />
       <el-table-column label="移交人" align="center" prop="outputName" />
-      <el-table-column label="移交人ID" align="center" prop="outputNameId" />
       <el-table-column label="签收人" align="center" prop="inputName" />
-      <el-table-column label="签收人ID" align="center" prop="inputNameId" />
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="所属部门ID" align="center" prop="deptId" />
-      <el-table-column label="所属部门" align="center" prop="deptName" />
-      <el-table-column label="业务实体ID" align="center" prop="companyId" />
       <el-table-column label="业务实体" align="center" prop="company" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="制单人" align="center" prop="createBy" />
-      <el-table-column label="从立档单位ID" align="center" prop="fromOrganizationId" />
-      <el-table-column label="从库房ID" align="center" prop="fromDepotId" />
-      <el-table-column label="从档案柜ID" align="center" prop="fromCabinetId" />
-      <el-table-column label="到立档单位ID" align="center" prop="toOrganizationId" />
-      <el-table-column label="到库房ID" align="center" prop="toDepotId" />
-      <el-table-column label="到档案柜ID" align="center" prop="toCabinetId" />
-      <el-table-column label="制单人id" align="center" prop="createById" />
       <el-table-column label="案卷数量" align="center" prop="amount" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
-      <el-table-column label="申请类型" align="center" prop="billType" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="流程实例的编号"
+        align="center"
+        prop="processInstanceId"
+      />
+      <el-table-column label="申请类型" align="center" prop="billType">
+        <template v-slot="scope">
+          <dict-tag
+            :type="DICT_TYPE.BS_BILL_TYPE"
+            :value="scope.row.billType"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag
+            :type="DICT_TYPE.BS_EXPENSE_APPLY_STATUS"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['archives:turn-over:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['archives:turn-over:delete']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['archives:turn-over:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['archives:turn-over:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="移交单号" prop="applyNo">
-          <el-input v-model="form.applyNo" placeholder="请输入移交单号" />
-        </el-form-item>
-        <el-form-item label="移交日期" prop="turnDate">
-          <el-date-picker clearable v-model="form.turnDate" type="date" value-format="timestamp" placeholder="选择移交日期" />
-        </el-form-item>
-        <el-form-item label="移交说明" prop="turnExplain">
-          <el-input v-model="form.turnExplain" placeholder="请输入移交说明" />
-        </el-form-item>
-        <el-form-item label="移交人" prop="outputName">
-          <el-input v-model="form.outputName" placeholder="请输入移交人" />
-        </el-form-item>
-        <el-form-item label="移交人ID" prop="outputNameId">
-          <el-input v-model="form.outputNameId" placeholder="请输入移交人ID" />
-        </el-form-item>
-        <el-form-item label="签收人" prop="inputName">
-          <el-input v-model="form.inputName" placeholder="请输入签收人" />
-        </el-form-item>
-        <el-form-item label="签收人ID" prop="inputNameId">
-          <el-input v-model="form.inputNameId" placeholder="请输入签收人ID" />
-        </el-form-item>
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
-        <el-form-item label="所属部门ID" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入所属部门ID" />
-        </el-form-item>
-        <el-form-item label="所属部门" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属部门" />
-        </el-form-item>
-        <el-form-item label="业务实体ID" prop="companyId">
-          <el-input v-model="form.companyId" placeholder="请输入业务实体ID" />
-        </el-form-item>
-        <el-form-item label="业务实体" prop="company">
-          <el-input v-model="form.company" placeholder="请输入业务实体" />
-        </el-form-item>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1100px"
+      v-dialogDrag
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="移交单号" prop="applyNo">
+              <el-input
+                v-model="form.applyNo"
+                placeholder="请输入移交单号"
+                readonly
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="移交日期" prop="turnDate">
+              <el-date-picker
+                clearable
+                v-model="form.turnDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择移交日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="移交说明" prop="turnExplain">
+              <el-input
+                v-model="form.turnExplain"
+                placeholder="请输入移交说明"
+              />
+            </el-form-item> </el-col
+        ></el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="移交人" prop="outputName">
+              <el-select
+                v-model="form.outputName"
+                filterable
+                placeholder="请选择移交人"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="签收人" prop="inputName">
+              <el-select
+                v-model="form.inputName"
+                filterable
+                placeholder="请选择签收人"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务实体" prop="company">
+              <!-- <el-select v-model="form.company" placeholder="请选择业务实体">
+                <el-option
+                  v-for="item in organizationList"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.organizationName"
+                >
+                </el-option>
+              </el-select> -->
+              <el-select
+                v-model="company"
+                placeholder="请选择业务实体"
+                value-key="id"
+                @change="handleSelectOrganization"
+              >
+                <el-option
+                  v-for="item in organizationList"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.organizationName"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="旧档案位置">
+              <el-cascader
+                v-model="oldSiteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择档案位置"
+                clearable
+                @change="handleOldSiteChanged"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="新档案位置">
+              <el-cascader
+                v-model="newSiteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择档案位置"
+                clearable
+                @change="handleNewSiteChanged"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="案卷数量" prop="amount">
+              <el-input v-model="form.amount" placeholder="请输入案卷数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流程实例的编号" prop="processInstanceId">
+              <el-input
+                v-model="form.processInstanceId"
+                placeholder="请输入流程实例的编号"
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+            <el-form-item label="申请类型" prop="billType">
+              <el-select v-model="form.billType" placeholder="请选择申请类型">
+                <el-option label="请选择字典生成" value="" />
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="制单人" prop="createBy">
-          <el-input v-model="form.createBy" placeholder="请输入制单人" />
-        </el-form-item>
-        <el-form-item label="从立档单位ID" prop="fromOrganizationId">
-          <el-input v-model="form.fromOrganizationId" placeholder="请输入从立档单位ID" />
-        </el-form-item>
-        <el-form-item label="从库房ID" prop="fromDepotId">
-          <el-input v-model="form.fromDepotId" placeholder="请输入从库房ID" />
-        </el-form-item>
-        <el-form-item label="从档案柜ID" prop="fromCabinetId">
-          <el-input v-model="form.fromCabinetId" placeholder="请输入从档案柜ID" />
-        </el-form-item>
-        <el-form-item label="到立档单位ID" prop="toOrganizationId">
-          <el-input v-model="form.toOrganizationId" placeholder="请输入到立档单位ID" />
-        </el-form-item>
-        <el-form-item label="到库房ID" prop="toDepotId">
-          <el-input v-model="form.toDepotId" placeholder="请输入到库房ID" />
-        </el-form-item>
-        <el-form-item label="到档案柜ID" prop="toCabinetId">
-          <el-input v-model="form.toCabinetId" placeholder="请输入到档案柜ID" />
-        </el-form-item>
-        <el-form-item label="制单人id" prop="createById">
-          <el-input v-model="form.createById" placeholder="请输入制单人id" />
-        </el-form-item>
-        <el-form-item label="案卷数量" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入案卷数量" />
-        </el-form-item>
-        <el-form-item label="流程实例的编号" prop="processInstanceId">
-          <el-input v-model="form.processInstanceId" placeholder="请输入流程实例的编号" />
-        </el-form-item>
-        <el-form-item label="申请类型" prop="billType">
-          <el-select v-model="form.billType" placeholder="请选择申请类型">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入备注"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -248,14 +348,29 @@
 </template>
 
 <script>
-import { createTurnOver, updateTurnOver, deleteTurnOver, getTurnOver, getTurnOverPage, exportTurnOverExcel } from "@/api/archives/turnOver";
+import {
+  createTurnOver,
+  updateTurnOver,
+  deleteTurnOver,
+  getTurnOver,
+  getTurnOverPage,
+  exportTurnOverExcel,
+} from "@/api/archives/turnOver";
+import { getOrganizationPage } from "@/api/setting/organization";
+import { listUser } from "@/api/system/user";
+import { createCodeRule } from "@/api/archives/record";
+import { getSiteTree } from "@/api/setting/organization";
 
 export default {
   name: "TurnOver",
-  components: {
-  },
+  components: {},
   data() {
     return {
+      propName: {
+        label: "pName",
+        value: "pId",
+        multiple: false,
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -304,25 +419,101 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-        createById: [{ required: true, message: "制单人id不能为空", trigger: "blur" }],
-      }
+      rules: {},
+      organizationList: [], //业务实体
+      userOptions: [], //用户数据
+      siteOptions: [], //位置数据
+      oldSiteArray: [], //旧位置
+      newSiteArray: [], //新位置
+      company: null,
     };
   },
   created() {
     this.getList();
+    this.getOrganizationList();
+    this.getUserList();
+    this.getSiteList();
   },
   methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;
       // 执行查询
-      getTurnOverPage(this.queryParams).then(response => {
+      getTurnOverPage(this.queryParams).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
       });
     },
+    // 生成移交单号
+    creatApplyNo() {
+      const data = {
+        catalogNum: "archives",
+        caseNum: "turn-over",
+      };
+      createCodeRule(data).then((response) => {
+        this.form.applyNo = response.data;
+      });
+    },
+    // 获取业务实体
+    getOrganizationList() {
+      getOrganizationPage().then((response) => {
+        this.organizationList = response.data.list;
+      });
+    },
+    handleSelectOrganization(val) {
+      console.log(val);
+      this.form.companyId = val.id;
+      this.form.company = val.organizationName;
+    },
+    //获取用户
+    getUserList() {
+      listUser().then((response) => {
+        this.userOptions = response.data.list;
+      });
+    },
+    //获取归档位置
+    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);
+      });
+    },
+    //选择旧位置
+    handleOldSiteChanged(obj) {
+      if (obj != null) {
+        this.form.fromOrganizationId = obj[0];
+        this.form.fromDepotId = obj[1];
+        this.form.fromCabinetId = obj[2];
+      }
+    },
+    //选择新位置
+    handleNewSiteChanged(obj) {
+      if (obj != null) {
+        this.form.toOrganizationId = obj[0];
+        this.form.toDepotId = obj[1];
+        this.form.toCabinetId = obj[2];
+      }
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -373,6 +564,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.creatApplyNo();
       this.open = true;
       this.title = "添加移交";
     },
@@ -380,21 +572,22 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getTurnOver(id).then(response => {
+      getTurnOver(id).then((response) => {
         this.form = response.data;
+        this.company = response.data.company;
         this.open = true;
         this.title = "修改移交";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
         // 修改的提交
         if (this.form.id != null) {
-          updateTurnOver(this.form).then(response => {
+          updateTurnOver(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -402,7 +595,7 @@ export default {
           return;
         }
         // 添加的提交
-        createTurnOver(this.form).then(response => {
+        createTurnOver(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -412,27 +605,35 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除移交编号为"' + id + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除移交编号为"' + id + '"的数据项?')
+        .then(function () {
           return deleteTurnOver(id);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = {...this.queryParams};
+      let params = { ...this.queryParams };
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有移交数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有移交数据项?")
+        .then(() => {
           this.exportLoading = true;
           return exportTurnOverExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '移交.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "移交.xls");
           this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
diff --git a/src/views/setting/depot/index.vue b/src/views/setting/depot/index.vue
index e0d32c6c..4f97e363 100644
--- a/src/views/setting/depot/index.vue
+++ b/src/views/setting/depot/index.vue
@@ -178,14 +178,16 @@
           <el-col :span="8">
             <el-form-item label="管理者姓名" prop="manegerName">
               <el-select
-                v-model="form.manegerName"
+                v-model="manegerName"
                 filterable
                 placeholder="请选择管理者"
+                value-key="id"
+                @change="handleSelectUser"
               >
                 <el-option
                   v-for="item in userOptions"
                   :key="item.id"
-                  :value="item.id"
+                  :value="item"
                   :label="item.username"
                 >
                 </el-option>
@@ -195,13 +197,15 @@
           <el-col :span="8">
             <el-form-item label="立档单位" prop="organizationName">
               <el-select
-                v-model="form.organizationName"
+                v-model="organizationName"
                 placeholder="请选择立档单位"
+                value-key="id"
+                @change="handleSelectOrganization"
               >
                 <el-option
                   v-for="item in organizationList"
                   :key="item.id"
-                  :value="item.id"
+                  :value="item"
                   :label="item.organizationName"
                 >
                 </el-option>
@@ -265,17 +269,9 @@ export default {
         code: null,
         address: null,
         organizationId: null,
-        manegerId: null,
-        createTime: [],
         manegerName: null,
-        deptId: null,
         deptName: null,
-        companyId: null,
         company: null,
-        remark: null,
-        userId: null,
-        organizationName: null,
-        organizationCode: null,
       },
       // 表单参数
       form: {},
@@ -283,6 +279,8 @@ export default {
       rules: {},
       organizationList: [], //立档单位数据
       userOptions: [], //用户数据
+      organizationName: null,
+      manegerName: null,
     };
   },
   created() {
@@ -307,12 +305,22 @@ export default {
         this.organizationList = response.data.list;
       });
     },
+    handleSelectOrganization(val) {
+      console.log(val);
+      this.form.organizationId = val.id;
+      this.form.organizationName = val.organizationName;
+    },
     //获取用户
     getUserList() {
       listUser().then((response) => {
         this.userOptions = response.data.list;
       });
     },
+    handleSelectUser(val) {
+      console.log(val);
+      this.form.manegerId = val.id;
+      this.form.manegerName = val.username;
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -326,6 +334,8 @@ export default {
         code: undefined,
         address: undefined,
         organizationId: undefined,
+        organizationName: undefined,
+        organizationCode: undefined,
         manegerId: undefined,
         manegerName: undefined,
         deptId: undefined,
@@ -333,10 +343,9 @@ export default {
         companyId: undefined,
         company: undefined,
         remark: undefined,
-        userId: undefined,
-        organizationName: undefined,
-        organizationCode: undefined,
       };
+      this.manegerName = undefined;
+      this.organizationName = undefined;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -361,6 +370,8 @@ export default {
       const id = row.id;
       getDepot(id).then((response) => {
         this.form = response.data;
+        this.organizationName = response.data.organizationName;
+        this.manegerName = response.data.manegerName;
         this.open = true;
         this.title = "修改库房管理";
       });
diff --git a/src/views/setting/depotCabinet/index.vue b/src/views/setting/depotCabinet/index.vue
index f8e87afb..61c428dc 100644
--- a/src/views/setting/depotCabinet/index.vue
+++ b/src/views/setting/depotCabinet/index.vue
@@ -165,8 +165,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="柜子数量" prop="code">
-              <el-input v-model="form.code" placeholder="请输入柜子数量" />
+            <el-form-item label="柜子数量" prop="cabinetNum">
+              <el-input
+                v-model="form.cabinetNum"
+                placeholder="请输入柜子数量"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -179,14 +182,16 @@
           <el-col :span="8">
             <el-form-item label="管理者姓名" prop="manegerName">
               <el-select
-                v-model="form.manegerName"
+                v-model="manegerName"
                 filterable
                 placeholder="请选择管理者"
+                value-key="id"
+                @change="handleSelectUser"
               >
                 <el-option
                   v-for="item in userOptions"
                   :key="item.id"
-                  :value="item.id"
+                  :value="item"
                   :label="item.username"
                 >
                 </el-option>
@@ -194,7 +199,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
@@ -265,6 +269,7 @@ export default {
       // 表单校验
       rules: {},
       userOptions: [], //用户数据
+      manegerName: null,
     };
   },
   created() {
@@ -288,6 +293,11 @@ export default {
         this.userOptions = response.data.list;
       });
     },
+    handleSelectUser(val) {
+      console.log(val);
+      this.form.manegerId = val.id;
+      this.form.manegerName = val.username;
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false;
@@ -309,7 +319,9 @@ export default {
         company: undefined,
         userId: undefined,
         remark: undefined,
+        cabinetNum: undefined,
       };
+      this.manegerName = undefined;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -334,6 +346,7 @@ export default {
       const id = row.id;
       getDepotCabinet(id).then((response) => {
         this.form = response.data;
+        this.manegerName = response.data.manegerName;
         this.open = true;
         this.title = "修改档案柜管理";
       });
diff --git a/src/views/setting/organization/index.vue b/src/views/setting/organization/index.vue
index 5c0a82c2..602a4cbf 100644
--- a/src/views/setting/organization/index.vue
+++ b/src/views/setting/organization/index.vue
@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="88px"
     >
       <el-form-item label="单位名称" prop="organizationName">
         <el-input