Merge remote-tracking branch 'origin/main'

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-form-item label="纸档位置" prop="site">
-              <el-date-picker
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
                 clearable
-                v-model="form.voucherTime"
+                @change="handleSiteChanged"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择凭证日期"
               />
             </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-form-item label="凭证号" prop="voucherNum">
-              <el-cascader
+              <el-input v-model="form.voucherNum" placeholder="请输入凭证号" />
-                v-model="siteArray"
+            </el-form-item>
-                :options="siteOptions"
+          </el-col>
-                :props="propName"
+          <el-col :span="8"> </el-col>
-                placeholder="请选择纸档位置"
+          <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,7 +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>
@@ -387,6 +392,9 @@
         <el-table-column prop="creditorMoney" label="贷方金额">
         </el-table-column>
       </el-table>
+
+      <!-- 凭证详情 -->
+      <el-divider v-if="optType != 'add'">凭证详情</el-divider>
       <el-tabs
         style="margin-top: 20px"
         v-if="optType != 'add'"
@@ -532,7 +540,6 @@ import {
   getVoucherDetailsPage,
   downloadXml,
 } from "@/api/accounting/voucher";
-import { listUser } from "@/api/system/user";
 import { getSiteTree } from "@/api/setting/organization";
 import { listData } from "@/api/system/dict/data";
 import { getAttachmentPage } from "@/api/accounting/attachment";
@@ -630,7 +637,6 @@ export default {
           { required: true, message: "凭证号不能为空", trigger: "blur" },
         ],
       },
-      userOptions: [], //用户数据
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
       typeOptions: [], //凭证类别
@@ -645,38 +651,11 @@ export default {
   watch() {},
   created() {
     this.getList();
-    this.getUserList();
     this.getSiteList();
     this.handleInitList();
     this.getOrganizationList();
   },
   methods: {
-    submitForm1() {
-      this.$refs["queryForm"].validate((valid) => {
-        if (!valid) {
-          return;
-        }
-        // 处理查询参数
-        let params = { ...this.queryParams };
-        downloadXml(params)
-          .then((response) => {
-            console.log(response.size);
-            if (response.size == 39) {
-              this.$modal.msgError("密码错误");
-              return false;
-            } else {
-              this.$download.excel(response, "会计凭证元数据.xml");
-              this.open1 = false;
-            }
-          })
-          .catch(() => {});
-      });
-    },
-    //下载元数据
-    handleDownloadData() {
-      this.open1 = true;
-      this.queryParams.inputPassword = null;
-    },
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -862,12 +841,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    //获取用户
-    getUserList() {
-      listUser().then((response) => {
-        this.userOptions = response.data.list;
-      });
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -963,6 +936,32 @@ export default {
         })
         .catch(() => {});
     },
+    //下载元数据
+    handleDownloadData() {
+      this.open1 = true;
+      this.queryParams.inputPassword = null;
+    },
+    submitForm1() {
+      this.$refs["queryForm"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        // 处理查询参数
+        let params = { ...this.queryParams };
+        downloadXml(params)
+          .then((response) => {
+            console.log(response.size);
+            if (response.size == 39) {
+              this.$modal.msgError("密码错误");
+              return false;
+            } else {
+              this.$download.excel(response, "会计凭证元数据.xml");
+              this.open1 = false;
+            }
+          })
+          .catch(() => {});
+      });
+    },
     // 人员选择弹窗
     handleSelectUser1() {
       this.$refs.UserSelect1.showFlag = true;
@@ -975,7 +974,6 @@ export default {
     },
     // 审核人选择
     onUserSelected1(obj) {
-      console.log(obj);
       if (obj != undefined && obj != null) {
         this.form.audit = obj.username;
       }

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>

src/views/ea/electronicAssets/index.vue

@@ -1,35 +1,81 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="98px"
+    >
       <el-form-item label="业务实体名称" prop="company">
-        <el-select v-model="queryParams.company" placeholder="请选择业务实体" value-key="id" @change="handleCompanyChange1"
+        <el-select
-          clearable @keyup.enter.native="handleQuery">
+          v-model="queryParams.company"
-          <el-option v-for="item in organizationList" :key="item.id" :value="item" :label="item.organizationName">
+          placeholder="请选择业务实体"
+          value-key="id"
+          @change="handleCompanyChange1"
+          clearable
+          @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in organizationList"
+            :key="item.id"
+            :value="item"
+            :label="item.organizationName"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="资产名称" prop="assetName">
-        <el-input v-model="queryParams.assetName" placeholder="请输入资产名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.assetName"
+          placeholder="请输入资产名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="报废日期" prop="disposalDate">
-        <el-date-picker v-model="queryParams.disposalDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+        <el-date-picker
-          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          v-model="queryParams.disposalDate"
-          :default-time="['00:00:00', '23:59:59']" />
+          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="purchaseChannel">
-        <el-input v-model="queryParams.purchaseChannel" placeholder="请输入购买渠道" clearable
+        <el-input
-          @keyup.enter.native="handleQuery" />
+          v-model="queryParams.purchaseChannel"
+          placeholder="请输入购买渠道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="年度" prop="year">
-        <el-input v-model="queryParams.year" placeholder="请输入年度" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="月份" prop="period">
-        <el-input v-model="queryParams.period" placeholder="请输入月份" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.period"
+          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>
@@ -37,8 +83,15 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button
-          v-hasPermi="['ea:electronic:create']">新增</el-button>
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ea:electronic:create']"
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,10 +105,21 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+        <el-button
-          v-hasPermi="['ea:electronic:export']">导出</el-button>
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['ea:electronic: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>
 
     <!-- 列表 -->
@@ -79,19 +143,32 @@
           <dict-tag :type="DICT_TYPE.ASSET_TYPE" :value="scope.row.assetType" />
         </template>
       </el-table-column>
-      <el-table-column label="购买日期" align="center" prop="purchaseDate" width="180">
+      <el-table-column
+        label="购买日期"
+        align="center"
+        prop="purchaseDate"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.purchaseDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="报废日期" align="center" prop="disposalDate" width="180">
+      <el-table-column
+        label="报废日期"
+        align="center"
+        prop="disposalDate"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.disposalDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="资产状态" align="center" prop="assetStatus">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.ASSET_STATUS" :value="scope.row.assetStatus" />
+          <dict-tag
+            :type="DICT_TYPE.ASSET_STATUS"
+            :value="scope.row.assetStatus"
+          />
         </template>
       </el-table-column>
       <el-table-column label="资产价格" align="center" prop="purchasePrice" />
@@ -102,27 +179,47 @@
       <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.BORROW_STATUS" :value="scope.row.borrowStatus" />
+          <dict-tag
+            :type="DICT_TYPE.BORROW_STATUS"
+            :value="scope.row.borrowStatus"
+          />
         </template>
       </el-table-column>
       <el-table-column label="纸档位置" align="center" prop="position" />
-      <!-- <el-table-column label="完整性" align="center" prop="cherks">
+      <el-table-column label="完整性" align="center" prop="cherks">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
+          <dict-tag
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
+            :value="scope.row.cherks"
+          />
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="归档状态" align="center" prop="fileStatus">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.ARCHIVES_FILE_STATUS" :value="scope.row.fileStatus" />
+          <dict-tag
+            :type="DICT_TYPE.ARCHIVES_FILE_STATUS"
+            :value="scope.row.fileStatus"
+          />
         </template>
       </el-table-column>
-      <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="createBy" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+        width="180px"
+      >
         <template v-slot="scope">
           <el-button
             size="mini"
@@ -132,41 +229,102 @@
             @click="handleViewFJ(scope.row)"
             >查看附件
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            >查看
           </el-button>
-          <el-button v-if="scope.row.fileStatus == '0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button
-            v-hasPermi="['ea:electronic:update']">修改</el-button>
+            v-if="scope.row.fileStatus == '0'"
-          <el-button v-if="scope.row.fileStatus == '0'" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            size="mini"
-            v-hasPermi="['ea:electronic:delete']">删除</el-button>
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ea:electronic:update']"
+            >修改</el-button
+          >
+          <el-button
+            v-if="scope.row.fileStatus == '0'"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ea:electronic: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
-      @pagination="getList" />
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
-      <el-upload class="upload-demo" drag :limit="1" :action="uploadUrl" :file-list="fileList" :headers="headers"
+      :title="title"
-          :on-success="handleSuccess" name="multipartFile" :multiple="false" :accept="imgType">
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        :limit="1"
+        :action="uploadUrl"
+        :file-list="fileList"
+        :headers="headers"
+        :on-success="handleSuccess"
+        name="multipartFile"
+        :multiple="false"
+        :accept="imgType"
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       </el-upload>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="98px" style="margin-top: 20px">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="98px"
+        style="margin-top: 20px"
+      >
         <el-row>
           <el-col :span="8">
-            <el-form-item label="业务实体名称" prop="company">
+            <el-form-item label="业务实体" prop="company">
-              <el-select v-model="form.company" placeholder="请选择业务实体" value-key="id" @change="handleCompanyChange">
+              <el-select
-                <el-option v-for="item in organizationList" :key="item.id" :value="item" :label="item.organizationName">
+                v-model="form.company"
+                placeholder="请选择业务实体"
+                value-key="id"
+                @change="handleCompanyChange"
+              >
+                <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-col :span="8">
             <el-form-item label="部门名称" prop="deptName">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="true"
+              <treeselect
-                placeholder="请选择归属部门" :normalizer="normalizer" />
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -179,54 +337,83 @@
           <el-input v-model="form.assetName" placeholder="请输入资产名称" />
         </el-form-item>
 
-        
-
         <el-row>
           <el-col :span="8">
             <el-form-item label="资产类型" prop="assetType">
               <el-select v-model="form.assetType" placeholder="请选择咨询类型	">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ASSET_TYPE)" :key="dict.value" :label="dict.label"
+                <el-option
-                  :value="dict.value" />
+                  v-for="dict in this.getDictDatas(DICT_TYPE.ASSET_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="购买日期" prop="purchaseDate">
-              <el-date-picker clearable v-model="form.purchaseDate" type="datetime" value-format="timestamp"
+              <el-date-picker
-                placeholder="选择购买日期" />
+                clearable
+                v-model="form.purchaseDate"
+                type="datetime"
+                value-format="timestamp"
+                placeholder="选择购买日期"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="报废日期" prop="disposalDate">
-              <el-date-picker clearable v-model="form.disposalDate" type="datetime" value-format="timestamp"
+              <el-date-picker
-                placeholder="选择报废日期" />
+                clearable
+                v-model="form.disposalDate"
+                type="datetime"
+                value-format="timestamp"
+                placeholder="选择报废日期"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="资产状态" prop="assetStatus">
-              <el-select v-model="form.assetStatus" placeholder="请选择资产状态">
+              <el-select
-                <el-option v-for="item in typeOptions" :key="item.id" :value="item.value" :label="item.label">
+                v-model="form.assetStatus"
+                placeholder="请选择资产状态"
+              >
+                <el-option
+                  v-for="item in typeOptions"
+                  :key="item.id"
+                  :value="item.value"
+                  :label="item.label"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="资产价格" prop="purchasePrice">
-              <el-input v-model="form.purchasePrice" placeholder="请输入资产价格" />
+              <el-input
+                v-model="form.purchasePrice"
+                placeholder="请输入资产价格"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="资产数量" prop="assetQuantity">
-              <el-input v-model="form.assetQuantity" placeholder="请输入资产数量" />
+              <el-input
+                v-model="form.assetQuantity"
+                placeholder="请输入资产数量"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="购买渠道" prop="purchaseChannel">
-              <el-input v-model="form.purchaseChannel" placeholder="请输入购买渠道" />
+              <el-input
+                v-model="form.purchaseChannel"
+                placeholder="请输入购买渠道"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -236,7 +423,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="年度" prop="year">
-              <el-date-picker format="yyyy年" v-model="form.year" value-format="yyyy" type="year" placeholder="请选择会计年份">
+              <el-date-picker
+                format="yyyy年"
+                v-model="form.year"
+                value-format="yyyy"
+                type="year"
+                placeholder="请选择会计年份"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -244,15 +437,27 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="月份" prop="period">
-              <el-date-picker popper-class="due_month" v-model="form.period" format="M月" value-format="M" type="month"
+              <el-date-picker
-                placeholder="请选择会计月份">
+                popper-class="due_month"
+                v-model="form.period"
+                format="M月"
+                value-format="M"
+                type="month"
+                placeholder="请选择会计月份"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="纸档位置" prop="position">
-              <el-cascader v-model="siteArray" :options="siteOptions" :props="propName" placeholder="请选择纸档位置" clearable
+              <el-cascader
-                @change="handleSiteChanged" />
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -268,7 +473,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="optType != 'view'">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType != 'view'"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -343,7 +550,7 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        contractAttachment:null,
+        contractAttachment: null,
         companyId: null,
         company: null,
         deptId: null,
@@ -372,7 +579,14 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        company: [
+          { required: true, message: "业务实体不能为空", trigger: "change" },
+        ],
+        assetCode: [
+          { required: true, message: "资产编号不能为空", trigger: "change" },
+        ],
+      },
       organizationList: [],
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
@@ -497,7 +711,7 @@ export default {
         deptName: undefined,
         assetCode: undefined,
         assetName: undefined,
-        contractAttachment:undefined,
+        contractAttachment: undefined,
         assetDescription: undefined,
         assetType: undefined,
         purchaseDate: undefined,
@@ -597,6 +811,7 @@ export default {
           return;
         }
         // 添加的提交
+        this.form.cherks = 0;
         createElectronicAssets(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
@@ -616,7 +831,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -634,7 +849,7 @@ export default {
           this.$download.excel(response, "资产档案.xls");
           this.exportLoading = false;
         })
-        .catch(() => { });
+        .catch(() => {});
     },
   },
 };

src/views/ea/electronicConsultation/index.vue

@@ -240,7 +240,10 @@
       <el-table-column label="纸档位置	" align="center" prop="position" />
       <el-table-column label="完整性	" align="center" prop="cherks">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
+          <dict-tag
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
+            :value="scope.row.cherks"
+          />
         </template>
       </el-table-column>
       <el-table-column label="归档状态" align="center" prop="fileStatus">
@@ -376,7 +379,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="完整性	" prop="cherks">
+            <!-- <el-form-item label="完整性	" prop="cherks">
               <el-select v-model="form.cherks" placeholder="请选择归档状态">
                 <el-option
                   v-for="dict in this.getDictDatas(DICT_TYPE.CHERKS)"
@@ -385,6 +388,17 @@
                   :value="dict.value"
                 />
               </el-select>
+            </el-form-item> -->
+
+            <el-form-item label="纸档位置	" prop="position">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -518,18 +532,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="纸档位置	" prop="position">
-              <el-cascader
-                v-model="siteArray"
-                :options="siteOptions"
-                :props="propName"
-                placeholder="请选择纸档位置"
-                clearable
-                @change="handleSiteChanged"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-form-item label="咨询内容	">
           <editor v-model="form.consultationContent" :min-height="192" />
@@ -641,7 +643,19 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        consultationId: [
+          { required: true, message: "咨询编号不能为空", trigger: "change" },
+          {
+            required: true,
+            pattern: /^[_a-zA-Z0-9]+$/,
+            message: "请输入正确咨询编号",
+          },
+        ],
+        company: [
+          { required: true, message: "业务实体不能为空", trigger: "change" },
+        ],
+      },
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
       organizationList: [],
@@ -843,6 +857,7 @@ export default {
           return;
         }
         // 添加的提交
+        this.form.cherks = 0;
         createElectronicConsultation(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;

src/views/ea/electronicContracts/index.vue

@@ -264,7 +264,10 @@
       <el-table-column label="纸档位置" align="center" prop="position" />
       <el-table-column label="完整性" align="center" prop="cherks">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
+          <dict-tag
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
+            :value="scope.row.cherks"
+          />
         </template>
       </el-table-column>
 
@@ -347,12 +350,28 @@
       width="1000px"
       append-to-body
     >
-    <el-upload class="upload-demo" drag :limit="1" :action="uploadUrl" :file-list="fileList" :headers="headers"
+      <el-upload
-          :on-success="handleSuccess" name="multipartFile" :multiple="false" :accept="imgType">
+        class="upload-demo"
+        drag
+        :limit="1"
+        :action="uploadUrl"
+        :file-list="fileList"
+        :headers="headers"
+        :on-success="handleSuccess"
+        name="multipartFile"
+        :multiple="false"
+        :accept="imgType"
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       </el-upload>
-      <el-form ref="form" :model="form" :rules="rules" label-width="98px" style="margin-top: 20px">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="98px"
+        style="margin-top: 20px"
+      >
         <el-row>
           <el-col :span="8">
             <el-form-item label="业务实体" prop="company">
@@ -385,7 +404,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="完整性" prop="cherks">
+            <el-form-item label="纸档位置" prop="position">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="完整性" prop="cherks">
               <el-select v-model="form.cherks" placeholder="请选择归档状态">
                 <el-option
                   v-for="dict in this.getDictDatas(DICT_TYPE.CHERKS)"
@@ -394,7 +423,7 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row>
@@ -537,7 +566,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="纸档位置" prop="position">
+            <!-- <el-form-item label="纸档位置" prop="position">
               <el-cascader
                 v-model="siteArray"
                 :options="siteOptions"
@@ -546,9 +575,8 @@
                 clearable
                 @change="handleSiteChanged"
               />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
-          
         </el-row>
       </el-form>
 
@@ -671,7 +699,19 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        company: [
+          { required: true, message: "业务实体不能为空", trigger: "change" },
+        ],
+        contractCode: [
+          { required: true, message: "合同编号不能为空", trigger: "change" },
+          {
+            required: true,
+            pattern: /^[_a-zA-Z0-9]+$/,
+            message: "请输入正确合同编号",
+          },
+        ],
+      },
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
       organizationList: [],
@@ -915,6 +955,7 @@ export default {
           return;
         }
         // 添加的提交
+        this.form.cherks = 0;
         createElectronicContracts(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;

src/views/ea/electronicCustomerComplaint/index.vue

@@ -244,7 +244,10 @@
       <el-table-column label="纸档位置" align="center" prop="position" />
       <el-table-column label="完整性" align="center" prop="cherks">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
+          <dict-tag
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
+            :value="scope.row.cherks"
+          />
         </template>
       </el-table-column>
       <el-table-column label="归档状态" align="center" prop="fileStatus">
@@ -385,7 +388,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="完整性" prop="cherks">
+            <el-form-item label="纸档位置" prop="position">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="完整性" prop="cherks">
               <el-select v-model="form.cherks" placeholder="请选择归档状态">
                 <el-option
                   v-for="dict in this.getDictDatas(DICT_TYPE.CHERKS)"
@@ -394,7 +407,7 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row>
@@ -527,7 +540,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="纸档位置" prop="position">
+            <!-- <el-form-item label="纸档位置" prop="position">
               <el-cascader
                 v-model="siteArray"
                 :options="siteOptions"
@@ -536,7 +549,7 @@
                 clearable
                 @change="handleSiteChanged"
               />
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-form-item label="客诉内容">
@@ -648,7 +661,19 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        company: [
+          { required: true, message: "业务实体不能为空", trigger: "change" },
+        ],
+        complaintCode: [
+          { required: true, message: "客诉编号不能为空", trigger: "change" },
+          {
+            required: true,
+            pattern: /^[_a-zA-Z0-9]+$/,
+            message: "请输入正确客诉编号",
+          },
+        ],
+      },
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
       organizationList: [],
@@ -857,7 +882,8 @@ export default {
           });
           return;
         }
-        // 添加的提交
+        //
+        this.form.cherks = 0;
         createElectronicCustomerComplaint(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;

src/views/ea/electronicEmployee/index.vue

@@ -1,37 +1,90 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="98px"
+    >
       <el-form-item label="所属部门" prop="deptName">
-        <treeselect style="width: 190px" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
+        <treeselect
-          :clearable="true" placeholder="请选择部门" :normalizer="normalizer" />
+          style="width: 190px"
+          v-model="queryParams.deptId"
+          :options="deptOptions"
+          :show-count="true"
+          :clearable="true"
+          placeholder="请选择部门"
+          :normalizer="normalizer"
+        />
       </el-form-item>
       <el-form-item label="员工姓名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入员工姓名" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入员工姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="性别" prop="gender">
-        <el-select v-model="queryParams.gender" placeholder="请选择性别" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value" :label="dict.label"
+          v-model="queryParams.gender"
-            :value="dict.value" />
+          placeholder="请选择性别"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="身份证号" prop="idCardNumber">
-        <el-input v-model="queryParams.idCardNumber" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.idCardNumber"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="借阅状态" prop="borrowStatus">
-        <el-select v-model="queryParams.borrowStatus" placeholder="请选择借阅状态" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BORROW_STATUS)" :key="dict.value" :label="dict.label"
+          v-model="queryParams.borrowStatus"
-            :value="dict.value" />
+          placeholder="请选择借阅状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.BORROW_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="归档状态" prop="fileStatus">
-        <el-select v-model="queryParams.fileStatus" placeholder="请选择归档状态" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_FILE_STATUS)" :key="dict.value"
+          v-model="queryParams.fileStatus"
-            :label="dict.label" :value="dict.value" />
+          placeholder="请选择归档状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_FILE_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </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>
@@ -39,31 +92,61 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button
-          v-hasPermi="['ea:electronic-employee:create']">新增
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ea:electronic-employee:create']"
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+        <el-button
-          @click="handleDelete">删除</el-button>
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+        <el-button
-          v-hasPermi="['ea:electronic-employee:export']">导出
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['ea:electronic-employee: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" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="业务实体" align="center" prop="company" />
       <el-table-column label="所属部门" align="center" prop="deptName" />
       <el-table-column label="员工姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="gender">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender" />
+          <dict-tag
+            :type="DICT_TYPE.SYSTEM_USER_SEX"
+            :value="scope.row.gender"
+          />
         </template>
       </el-table-column>
       <el-table-column label="国籍" align="center" prop="nationality" />
@@ -73,77 +156,180 @@
       <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.BORROW_STATUS" :value="scope.row.borrowStatus" />
+          <dict-tag
+            :type="DICT_TYPE.BORROW_STATUS"
+            :value="scope.row.borrowStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="归档时间" align="center" prop="recordTime" width="98px" />
+      <el-table-column
+        label="归档时间"
+        align="center"
+        prop="recordTime"
+        width="98px"
+      />
       <el-table-column label="纸档位置" align="center" prop="position" />
       <el-table-column label="完整性" align="center" prop="cherks">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CHERKS" :value="scope.row.cherks" />
+          <dict-tag
+            :type="DICT_TYPE.ACCOUNTING_FILE_STATUS"
+            :value="scope.row.cherks"
+          />
         </template>
       </el-table-column>
       <el-table-column label="归档状态" align="center" prop="fileStatus">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.ARCHIVES_FILE_STATUS" :value="scope.row.fileStatus" />
+          <dict-tag
+            :type="DICT_TYPE.ARCHIVES_FILE_STATUS"
+            :value="scope.row.fileStatus"
+          />
         </template>
       </el-table-column>
       <el-table-column label="制单人" align="center" prop="createBy" />
-      <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" class-name="small-padding fixed-width" fixed="right" width="180px">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+        width="180px"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" v-if="scope.row.contractAttachment"
+          <el-button
-            @click="handleViewFJ(scope.row)">查看附件
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            v-if="scope.row.contractAttachment"
+            @click="handleViewFJ(scope.row)"
+            >查看附件
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            >查看
           </el-button>
-          <el-button v-if="scope.row.fileStatus == '0'" size="mini" type="text" icon="el-icon-edit"
+          <el-button
-            @click="handleUpdate(scope.row)" v-hasPermi="['ea:electronic-employee:update']">修改
+            v-if="scope.row.fileStatus == '0'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ea:electronic-employee:update']"
+            >修改
           </el-button>
-          <el-button v-if="scope.row.fileStatus == '0'" size="mini" type="text" icon="el-icon-delete"
+          <el-button
-            @click="handleDelete(scope.row)" v-hasPermi="['ea:electronic-employee:delete']">删除
+            v-if="scope.row.fileStatus == '0'"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ea:electronic-employee: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
-      @pagination="getList" />
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
-      <el-upload class="upload-demo" drag :limit="1" :action="uploadUrl" :file-list="fileList" :headers="headers"
+      :title="title"
-        :on-success="handleSuccess" name="multipartFile" :multiple="false" :accept="imgType">
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-upload
+        class="upload-demo"
+        drag
+        :limit="1"
+        :action="uploadUrl"
+        :file-list="fileList"
+        :headers="headers"
+        :on-success="handleSuccess"
+        name="multipartFile"
+        :multiple="false"
+        :accept="imgType"
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       </el-upload>
-      <el-form ref="form" :model="form" :rules="rules" label-width="98px" style="margin-top: 20px">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="98px"
+        style="margin-top: 20px"
+      >
         <el-row>
           <el-col :span="8">
             <el-form-item label="业务实体" prop="company">
-              <el-select v-model="form.company" placeholder="请选择业务实体" value-key="id" @change="handleCompanyChange">
+              <el-select
-                <el-option v-for="item in organizationList" :key="item.id" :value="item" :label="item.organizationName">
+                v-model="form.company"
+                placeholder="请选择业务实体"
+                value-key="id"
+                @change="handleCompanyChange"
+              >
+                <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-col :span="8">
             <el-form-item label="部门名称" prop="deptName">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :clearable="true"
+              <treeselect
-                placeholder="请选择归属部门" :normalizer="normalizer" />
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="完整性" prop="cherks">
+            <el-form-item label="纸档位置" prop="position">
+              <el-cascader
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="完整性" prop="cherks">
               <el-select v-model="form.cherks" placeholder="请选择完整性">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CHERKS)" :key="dict.value" :label="dict.label"
+                <el-option
-                  :value="dict.value" />
+                  v-for="dict in this.getDictDatas(DICT_TYPE.CHERKS)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row>
@@ -155,15 +341,24 @@
           <el-col :span="8">
             <el-form-item label="性别" prop="gender">
               <el-select v-model="form.gender" placeholder="请选择性别">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
+                <el-option
-                  :label="dict.label" :value="dict.value" />
+                  v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="出生日期" prop="birthdate">
-              <el-date-picker clearable v-model="form.birthdate" type="date" value-format="yyyy-MM-dd"
+              <el-date-picker
-                placeholder="选择归档时间" />
+                clearable
+                v-model="form.birthdate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择归档时间"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -180,24 +375,36 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系方式" prop="contactNumber">
-              <el-input v-model="form.contactNumber" placeholder="请输入联系方式" />
+              <el-input
+                v-model="form.contactNumber"
+                placeholder="请输入联系方式"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="身份证号" prop="idCardNumber">
-              <el-input v-model="form.idCardNumber" placeholder="请输入身份证号" />
+              <el-input
+                v-model="form.idCardNumber"
+                placeholder="请输入身份证号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="护照号码" prop="passportNumber">
-              <el-input v-model="form.passportNumber" placeholder="请输入护照号码" />
+              <el-input
+                v-model="form.passportNumber"
+                placeholder="请输入护照号码"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="毕业学校" prop="graduationSchool">
-              <el-input v-model="form.graduationSchool" placeholder="请输入毕业学校" />
+              <el-input
+                v-model="form.graduationSchool"
+                placeholder="请输入毕业学校"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -216,25 +423,33 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="工作经历" prop="workExperience">
-              <el-input v-model="form.workExperience" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+              <el-input
-                placeholder="请输入工作经历" />
+                v-model="form.workExperience"
+                :autosize="{ minRows: 1, maxRows: 100 }"
+                type="textarea"
+                placeholder="请输入工作经历"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="教育经历" prop="educationExperience">
-              <el-input v-model="form.educationExperience" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+              <el-input
-                placeholder="请输入教育经历" />
+                v-model="form.educationExperience"
+                :autosize="{ minRows: 1, maxRows: 100 }"
+                type="textarea"
+                placeholder="请输入教育经历"
+              />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="职位" prop="jobTitle">
               <el-input v-model="form.jobTitle" placeholder="请输入职位" />
             </el-form-item>
           </el-col>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="职位级别" prop="jobLevel">
               <el-input v-model="form.jobLevel" placeholder="请输入职位级别" />
@@ -249,99 +464,171 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="身体状况" prop="healthCondition">
-              <el-input v-model="form.healthCondition" placeholder="请输入身体状况" />
+              <el-input
+                v-model="form.healthCondition"
+                placeholder="请输入身体状况"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="疾病史" prop="diseaseHistory">
               <el-radio-group v-model="form.diseaseHistory">
-                <el-radio v-for="dict in this.getDictDatas(
+                <el-radio
+                  v-for="dict in this.getDictDatas(
                     DICT_TYPE.INFRA_BOOLEAN_STRING
-                )" :key="dict.value" :label="dict.value">{{ dict.label }}
+                  )"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}
                 </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="体检记录" prop="medicalRecords">
-          <el-input v-model="form.medicalRecords" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入体检记录" />
+            v-model="form.medicalRecords"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入体检记录"
+          />
         </el-form-item>
         <el-row>
           <el-col :span="8">
             <el-form-item label="社会保险" prop="socialInsurance">
-              <el-input v-model="form.socialInsurance" placeholder="请输入养老保险" />
+              <el-input
+                v-model="form.socialInsurance"
+                placeholder="请输入养老保险"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="养老保险" prop="pensionInsurance">
-              <el-input v-model="form.pensionInsurance" placeholder="请输入医疗保险" />
+              <el-input
+                v-model="form.pensionInsurance"
+                placeholder="请输入医疗保险"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工伤保险" prop="workInjuryInsurance">
-              <el-input v-model="form.workInjuryInsurance" placeholder="请输入工伤保险" />
+              <el-input
+                v-model="form.workInjuryInsurance"
+                placeholder="请输入工伤保险"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="医疗保险" prop="medicalInsurance">
-              <el-input v-model="form.medicalInsurance" placeholder="请输入失业保险" />
+              <el-input
+                v-model="form.medicalInsurance"
+                placeholder="请输入失业保险"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="失业保险" prop="unemploymentInsurance">
-              <el-input v-model="form.unemploymentInsurance" placeholder="请输入失业保险" />
+              <el-input
+                v-model="form.unemploymentInsurance"
+                placeholder="请输入失业保险"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="考核评价" prop="leaveRecords">
-          <el-input v-model="form.leaveRecords" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入考核评价" />
+            v-model="form.leaveRecords"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入考核评价"
+          />
         </el-form-item>
         <el-form-item label="奖惩记录" prop="overtimeRecords">
-          <el-input v-model="form.overtimeRecords" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入奖惩记录" />
+            v-model="form.overtimeRecords"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入奖惩记录"
+          />
         </el-form-item>
         <el-form-item label="培训计划" prop="welfareBenefits">
-          <el-input v-model="form.welfareBenefits" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入培训计划" />
+            v-model="form.welfareBenefits"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入培训计划"
+          />
         </el-form-item>
         <el-form-item label="培训成果" prop="performanceEvaluation">
-          <el-input v-model="form.performanceEvaluation" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入培训成果" />
+            v-model="form.performanceEvaluation"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入培训成果"
+          />
         </el-form-item>
         <el-form-item label="个人标签" prop="rewardsPunishments">
-          <el-input v-model="form.rewardsPunishments" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入个人标签" />
+            v-model="form.rewardsPunishments"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入个人标签"
+          />
         </el-form-item>
         <el-form-item label="兴趣爱好" prop="trainingRecords">
-          <el-input v-model="form.trainingRecords" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入兴趣爱好" />
+            v-model="form.trainingRecords"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入兴趣爱好"
+          />
         </el-form-item>
         <el-form-item label="特长" prop="personalDescription">
-          <el-input v-model="form.personalDescription" :autosize="{ minRows: 1, maxRows: 100 }" type="textarea"
+          <el-input
-            placeholder="请输入内容" />
+            v-model="form.personalDescription"
+            :autosize="{ minRows: 1, maxRows: 100 }"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <el-row>
           <el-col :span="8">
             <el-form-item label="年度" prop="year">
-              <el-date-picker format="yyyy年" v-model="form.year" value-format="yyyy" type="year" placeholder="请选择会计年份">
+              <el-date-picker
+                format="yyyy年"
+                v-model="form.year"
+                value-format="yyyy"
+                type="year"
+                placeholder="请选择会计年份"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="月份" prop="period">
-              <el-date-picker popper-class="due_month" v-model="form.period" format="M月" value-format="M" type="month"
+              <el-date-picker
-                placeholder="请选择会计月份">
+                popper-class="due_month"
+                v-model="form.period"
+                format="M月"
+                value-format="M"
+                type="month"
+                placeholder="请选择会计月份"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="纸档位置" prop="position">
-              <el-cascader v-model="siteArray" :options="siteOptions" :props="propName" placeholder="请选择纸档位置" clearable
+              <el-cascader
-                @change="handleSiteChanged" />
+                v-model="siteArray"
+                :options="siteOptions"
+                :props="propName"
+                placeholder="请选择纸档位置"
+                clearable
+                @change="handleSiteChanged"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -351,7 +638,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="optType != 'view'">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType != 'view'"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -452,53 +741,73 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        company: [
+          { required: true, message: "业务实体不能为空", trigger: "change" },
+        ],
         idCardNumber: [
           { required: true, trigger: "change", message: "身份证号不能为空" },
-          { required: true, pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: "请输入正确身份证号" },
+          {
+            required: true,
+            pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+            message: "请输入正确身份证号",
+          },
         ],
         socialInsurance: [
           { required: true, trigger: "change", message: "金额不能为空" },
           {
-            required: true, pattern: /^\d+$|^\d+[.]?\d+$/
+            required: true,
-            , message: "请输入正确的金额"
+            pattern: /^\d+$|^\d+[.]?\d+$/,
+            message: "请输入正确的金额",
           },
         ],
         pensionInsurance: [
           { required: true, trigger: "change", message: "金额不能为空" },
           {
-            required: true, pattern: /^\d+$|^\d+[.]?\d+$/
+            required: true,
-            , message: "请输入正确的金额"
+            pattern: /^\d+$|^\d+[.]?\d+$/,
+            message: "请输入正确的金额",
           },
         ],
         workInjuryInsurance: [
           { required: true, trigger: "change", message: "金额不能为空" },
           {
-            required: true, pattern: /^\d+$|^\d+[.]?\d+$/
+            required: true,
-            , message: "请输入正确的金额"
+            pattern: /^\d+$|^\d+[.]?\d+$/,
+            message: "请输入正确的金额",
           },
         ],
         medicalInsurance: [
           { required: true, trigger: "change", message: "金额不能为空" },
           {
-            required: true, pattern: /^\d+$|^\d+[.]?\d+$/
+            required: true,
-            , message: "请输入正确的金额"
+            pattern: /^\d+$|^\d+[.]?\d+$/,
+            message: "请输入正确的金额",
           },
         ],
         unemploymentInsurance: [
           { required: true, trigger: "change", message: "金额不能为空" },
           {
-            required: true, pattern: /^\d+$|^\d+[.]?\d+$/
+            required: true,
-            , message: "请输入正确的金额"
+            pattern: /^\d+$|^\d+[.]?\d+$/,
+            message: "请输入正确的金额",
           },
         ],
-        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        contactNumber: [ // 手机号验证
+        contactNumber: [
-          { required: true, trigger: 'change', message: '手机号不能为空' },
+          // 手机号验证
-          { min: 11, max: 11, trigger: 'change', message: '请输入11位手机号码' },
+          { required: true, trigger: "change", message: "手机号不能为空" },
-          { required: true, pattern: /^1[3456789]\d{9}$/, message: "请输入正确手机号" },
+          {
+            min: 11,
+            max: 11,
+            trigger: "change",
+            message: "请输入11位手机号码",
+          },
+          {
+            required: true,
+            pattern: /^1[3456789]\d{9}$/,
+            message: "请输入正确手机号",
+          },
         ],
-
-
       },
       organizationList: [],
       siteOptions: [], //归档位置数据
@@ -725,6 +1034,7 @@ export default {
           return;
         }
         // 添加的提交
+        this.form.cherks = 0;
         createElectronicEmployee(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
@@ -744,7 +1054,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -762,7 +1072,7 @@ export default {
           this.$download.excel(response, "员工档案.xls");
           this.exportLoading = false;
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     dateArray(list) {
       if (list == null) {

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,13 +194,9 @@
         style="margin-top: 20px"
       >
         <el-row>
+          <el-col :span="8"> </el-col>
           <el-col :span="8">
-            <el-form-item label="表名" prop="name">
+            <el-form-item label="OA/ERP流程号	" prop="flowCode">
-              <el-input v-model="form.name" placeholder="请输入表名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="OA/ERP流程编号	" prop="flowCode">
               <el-input
                 v-model="form.flowCode"
                 placeholder="请输入OA/ERP流程编号	"
@@ -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">
@@ -296,7 +294,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="归档状态" prop="fileStatus">
+            <!-- <el-form-item label="归档状态" prop="fileStatus">
               <el-select v-model="form.fileStatus" placeholder="请选择归档状态">
                 <el-option
                   v-for="dict in this.getDictDatas(
@@ -307,27 +305,16 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="流程号" prop="flowId">
               <el-input v-model="form.flowId" placeholder="请输入流程号" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+        </el-row>
-            <el-form-item label="所属部门" prop="deptName">
+        <el-row>
-              <treeselect
+          <el-col :span="8"> </el-col>
-                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-form-item label="纸档位置" prop="site">
@@ -434,7 +421,16 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        flowCode: [
+          { required: true, message: "OA/流程编号不能为空", trigger: "change" },
+          {
+            required: true,
+            pattern: /^[_a-zA-Z0-9]+$/,
+            message: "请输入正确OA/流程编号",
+          },
+        ],
+      },
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
       organizationList: [],
@@ -628,7 +624,8 @@ export default {
           });
           return;
         }
-        // 添加的提交
+        //
+        this.form.fileStatus = 0;
         createElectronicOther(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;