From fc48e1d6c768af96890770020d5c4bd9812014e8 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Fri, 13 Oct 2023 17:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/archives/prefile/index.vue |  3 +-
 src/views/archives/record/index.vue  | 65 +++-------------------------
 2 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/src/views/archives/prefile/index.vue b/src/views/archives/prefile/index.vue
index 0db53b44..48062341 100644
--- a/src/views/archives/prefile/index.vue
+++ b/src/views/archives/prefile/index.vue
@@ -52,6 +52,7 @@
           icon="el-icon-plus"
           size="mini"
           :disabled="multiple"
+          v-hasPermi="['archives:prefile:file']"
           @click="handleFile"
           >归档</el-button
         >
@@ -1048,7 +1049,6 @@ export default {
         id: undefined,
         companyId: undefined,
         company: undefined,
-        frequency: undefined,
         fileType: undefined,
         year: undefined,
         period: undefined,
@@ -1154,6 +1154,7 @@ export default {
           return;
         }
         // 添加的提交
+        this.form.fileType = this.fileType;
         createRecord(this.form).then((response) => {
           this.fileData = response.data;
           this.handlePushFile();
diff --git a/src/views/archives/record/index.vue b/src/views/archives/record/index.vue
index fc724ad6..a120b2a1 100644
--- a/src/views/archives/record/index.vue
+++ b/src/views/archives/record/index.vue
@@ -56,7 +56,7 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -66,7 +66,7 @@
           v-hasPermi="['archives:record:create']"
           >新增</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -79,18 +79,6 @@
           >导出</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-s-claim"
-          size="mini"
-          :disabled="multiple"
-          @click="handleArchive"
-          v-hasPermi="['setting:organization:create']"
-          >归档</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -105,7 +93,6 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="业务实体" align="center" prop="company" />
-      <el-table-column label="归档频次" align="center" prop="frequency" />
       <el-table-column label="档案类型" align="center" prop="fileType">
         <template v-slot="scope">
           <dict-tag
@@ -116,12 +103,10 @@
       </el-table-column>
       <el-table-column label="会计年份" align="center" prop="year" />
       <el-table-column label="会计月份" align="center" prop="period" />
-      <el-table-column label="起止凭证号" align="center" prop="vouNum" />
       <el-table-column label="全宗号" align="center" prop="caseNum" />
       <el-table-column label="目录号" align="center" prop="catalogNum" />
       <el-table-column label="案卷号" align="center" prop="filesNum" />
       <el-table-column label="档案位置" align="center" prop="site" />
-      <el-table-column label="关联号" align="center" prop="flowId" />
       <el-table-column
         label="创建日期"
         align="center"
@@ -132,20 +117,10 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="状态" align="center" prop="status" /> -->
       <el-table-column label="归档详情" align="center" prop="note" />
-      <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="借阅状态" align="center" prop="borrowStatus" />
-      <el-table-column label="鉴定状态" align="center" prop="identifyStatus" />
+      <!-- <el-table-column label="借阅状态" align="center" prop="borrowStatus" />
+      <el-table-column label="鉴定状态" align="center" prop="identifyStatus" /> -->
       <el-table-column label="归档时间" align="center" prop="recordTime" />
-      <!-- <el-table-column label="所属部门" align="center" prop="deptName" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="操作"
@@ -333,13 +308,6 @@
               <el-input v-model="form.flowId" placeholder="请输入关联号" />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="状态" prop="status">
-              <el-radio-group v-model="form.status">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -366,15 +334,7 @@
             </el-form-item>
           </el-col> -->
         </el-row>
-        <el-row>
-          <!-- <el-col :span="8">
-            <el-form-item label="鉴定状态" prop="identifyStatus">
-              <el-radio-group v-model="form.identifyStatus">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
+        <el-row> </el-row>
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
@@ -724,21 +684,6 @@ export default {
         });
       });
     },
-    /** 归档按钮操作 */
-    handleArchive() {
-      const data = this.ids;
-      console.log(data);
-      this.$modal
-        .confirm("是否确认归档")
-        .then(function () {
-          return archivesRecord(data);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("归档成功");
-        })
-        .catch(() => {});
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;