From 360ec309c6ceccbb563c7792490499c706101af6 Mon Sep 17 00:00:00 2001
From: chiyilin <2449182606@qq.com>
Date: Mon, 6 Nov 2023 11:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=A1=A3=E6=A1=88--=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5=20=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=A1=E5=87=AD=E8=AF=81--=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounting/voucher/index.vue  | 53 +++++++++++++------------
 src/views/archives/prefile/index.vue    |  8 ++--
 src/views/ea/electronicAssets/index.vue |  3 --
 src/views/ea/electronicOther/index.vue  | 42 +++++++-------------
 4 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue
index 67335852..c78a1f32 100644
--- a/src/views/accounting/voucher/index.vue
+++ b/src/views/accounting/voucher/index.vue
@@ -225,13 +225,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="凭证号" prop="voucherNum">
-              <el-input v-model="form.voucherNum" placeholder="请输入凭证号" />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="凭证类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择凭证类型">
@@ -246,17 +239,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="凭证日期" prop="voucherTime">
-              <el-date-picker
+            <el-form-item label="纸档位置" prop="site">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
                 clearable
-                v-model="form.voucherTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择凭证日期"
+                @change="handleSiteChanged"
               />
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="8">
             <el-form-item label="审核人" prop="audit">
@@ -322,16 +317,26 @@
             /></el-form-item>
           </el-col>
         </el-row>
+      </el-form>
+
+      <!-- 记账凭证 -->
+      <el-divider v-if="optType != 'add'">记账凭证</el-divider>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="纸档位置" prop="site">
-              <el-cascader
-                v-model="siteArray"
-                :options="siteOptions"
-                :props="propName"
-                placeholder="请选择纸档位置"
+            <el-form-item label="凭证号" prop="voucherNum">
+              <el-input v-model="form.voucherNum" placeholder="请输入凭证号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8"> </el-col>
+          <el-col :span="8">
+            <el-form-item label="凭证日期" prop="voucherTime">
+              <el-date-picker
                 clearable
-                @change="handleSiteChanged"
+                v-model="form.voucherTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择凭证日期"
               />
             </el-form-item>
           </el-col>
@@ -347,6 +352,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="8">
             <el-form-item label="会计期间" prop="period">
               <el-date-picker
@@ -360,8 +368,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="摘要" prop="digest">
               <el-input v-model="form.digest" placeholder="请输入摘要" />
@@ -376,9 +382,6 @@
           />
         </el-form-item>
       </el-form>
-
-      <!-- 记账凭证 -->
-      <el-divider v-if="optType != 'add'">记账凭证</el-divider>
       <el-table :data="tableData" style="width: 100%" v-if="optType != 'add'">
         <el-table-column prop="digest" label="摘要" width="180">
         </el-table-column>
diff --git a/src/views/archives/prefile/index.vue b/src/views/archives/prefile/index.vue
index b1e09d9a..88d481d9 100644
--- a/src/views/archives/prefile/index.vue
+++ b/src/views/archives/prefile/index.vue
@@ -275,7 +275,7 @@
       <el-table-column label="完整性" align="center" prop="cherks" >
         <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.CHERKS"
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
             :value="scope.row.cherks"
           />
         </template>
@@ -413,7 +413,7 @@
       <el-table-column label="完整性" align="center" prop="cherks" >
         <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.CHERKS"
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
             :value="scope.row.cherks"
           />
         </template>
@@ -617,7 +617,7 @@
       <el-table-column label="完整性" align="center" prop="cherks" >
         <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.CHERKS"
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
             :value="scope.row.cherks"
           />
         </template>
@@ -742,7 +742,7 @@
       <el-table-column label="完整性	" align="center" prop="cherks" >
         <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.CHERKS"
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
             :value="scope.row.cherks"
           />
         </template>
diff --git a/src/views/ea/electronicAssets/index.vue b/src/views/ea/electronicAssets/index.vue
index cb2269ab..a66d0fa5 100644
--- a/src/views/ea/electronicAssets/index.vue
+++ b/src/views/ea/electronicAssets/index.vue
@@ -583,9 +583,6 @@ export default {
         company: [
           { required: true, message: "业务实体不能为空", trigger: "change" },
         ],
-        deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "change" },
-        ],
         assetCode: [
           { required: true, message: "资产编号不能为空", trigger: "change" },
         ],
diff --git a/src/views/ea/electronicOther/index.vue b/src/views/ea/electronicOther/index.vue
index ef946069..5f939011 100644
--- a/src/views/ea/electronicOther/index.vue
+++ b/src/views/ea/electronicOther/index.vue
@@ -9,15 +9,6 @@
       v-show="showSearch"
       label-width="88px"
     >
-      <el-form-item label="表名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入表名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
       <el-form-item label="业务类型" prop="businessType">
         <el-select v-model="form.businessType" placeholder="请选择业务类型	">
           <el-option
@@ -85,7 +76,6 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="表名" align="center" prop="name" />
       <el-table-column label="OA/ERP流程编号	" align="center" prop="flowCode" />
       <el-table-column label="文件来源" align="center" prop="source" />
       <el-table-column label="年度" align="center" prop="year" />
@@ -204,11 +194,7 @@
         style="margin-top: 20px"
       >
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="表名" prop="name">
-              <el-input v-model="form.name" placeholder="请输入表名" />
-            </el-form-item>
-          </el-col>
+          <el-col :span="8"> </el-col>
           <el-col :span="8">
             <el-form-item label="OA/ERP流程号	" prop="flowCode">
               <el-input
@@ -222,6 +208,18 @@
               <el-input v-model="form.source" placeholder="请输入文件来源" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属部门" prop="deptName">
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -316,18 +314,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="所属部门" prop="deptName">
-              <treeselect
-                v-model="form.deptId"
-                :options="deptOptions"
-                :show-count="true"
-                :clearable="true"
-                placeholder="请选择归属部门"
-                :normalizer="normalizer"
-              />
-            </el-form-item>
-          </el-col>
+          <el-col :span="8"> </el-col>
           <el-col :span="8"> </el-col>
           <!-- <el-col :span="8">
             <el-form-item label="纸档位置" prop="site">
@@ -435,7 +422,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        name: [{ required: true, message: "表名不能为空", trigger: "change" }],
         flowCode: [
           { required: true, message: "OA/流程编号不能为空", trigger: "change" },
           {