Merge remote-tracking branch 'origin/main'

.env.local

@@ -5,8 +5,8 @@ ENV = 'development'
 VUE_APP_TITLE = 链友融财务数字一体化信息系统
 
 # 芋道管理系统/本地环境
-# VUE_APP_BASE_API = '/proxy-api'
+VUE_APP_BASE_API = '/proxy-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+# VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -22,3 +22,10 @@ VUE_APP_DOC_ENABLE = true
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+
+#线上预览
+VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
+
+#报表
+# VUE_APP_BIAO_API = 'http://139.224.253.31:48080'
+VUE_APP_BIAO_API = 'http://192.168.3.172:48080'

.env.prod

@@ -23,3 +23,9 @@ VUE_APP_DOC_ENABLE = false
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+
+#线上预览
+VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
+
+#报表
+VUE_APP_BIAO_API = 'http://139.224.253.31:48080'

src/components/iFrame/index.vue

@@ -13,16 +13,19 @@ export default {
   props: {
     src: {
       type: String,
-      required: true
+      required: true,
     },
   },
   data() {
     return {
       height: document.documentElement.clientHeight - 94.5 + "px;",
       loading: true,
-      url: this.src
+      url: this.src,
     };
   },
+  created() {
+    console.log(this.url);
+  },
   mounted: function () {
     setTimeout(() => {
       this.loading = false;
@@ -31,6 +34,6 @@ export default {
     window.onresize = function temp() {
       that.height = document.documentElement.clientHeight - 94.5 + "px;";
     };
-  }
+  },
 };
 </script>

src/utils/dict.js

@@ -143,6 +143,8 @@ export const DICT_TYPE = {
   BORROW_STATUS: 'borrow_status',
   //会计凭证类型
   ACCOUNTING_VOUCHER_TYPE: 'accounting_voucher_type',
+  //银行回单认款状态
+  BANK_CONFIRM_STATUS: 'bank_confirm_status',
 
 }
 

src/views/accounting/attachment/index.vue

@@ -161,16 +161,19 @@
       >
         <el-row>
           <el-col :span="8">
-            <!-- <el-form-item label="凭证号" prop="voucherNum">
+            <el-form-item label="会计凭证" prop="voucherNum">
-              <el-input v-model="form.voucherNum" placeholder="请输入凭证号" />
+              <el-select
-            </el-form-item> -->
+                v-model="form.voucherNum"
-            <el-form-item label="会计凭证" prop="voucherId">
+                filterable
-              <el-select v-model="form.voucherId" placeholder="请选择会计凭证">
+                placeholder="请选择会计凭证"
+                value-key="id"
+                @change="handleSelectVoucher"
+              >
                 <el-option
                   v-for="item in kjpzOptions"
                   :key="item.id"
                   :label="item.voucherNum"
-                  :value="item.id"
+                  :value="item"
                 >
                 </el-option>
               </el-select>
@@ -307,9 +310,11 @@ export default {
      * @param fileUrl
      */
     openLink(fileUrl) {
-      const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
+      console.log(process.env.VUE_APP_ONLINE_API);
-        this.base64Encode(fileUrl)
+      // const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
-      )}`;
+      const url =
+        process.env.VUE_APP_ONLINE_API +
+        `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
       window.open(url);
     },
     /** 取消按钮 */
@@ -372,6 +377,11 @@ export default {
       this.form.fileName = res.data.name;
       this.form.fileSize = res.data.size;
     },
+    //凭证选择
+    handleSelectVoucher(val) {
+      this.form.voucherId = val.id;
+      this.form.voucherNum = val.voucherNum;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {

src/views/accounting/bankSlip/index.vue

@@ -85,10 +85,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="凭证id" prop="voucherId">
+      <el-form-item label="凭证号" prop="voucherNum">
         <el-input
-          v-model="queryParams.voucherId"
+          v-model="queryParams.voucherNum"
-          placeholder="请输入凭证id"
+          placeholder="请输入凭证号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -164,7 +164,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="凭证id" align="center" prop="voucherId" />
+      <!-- <el-table-column label="凭证id" align="center" prop="voucherId" /> -->
       <el-table-column label="OA/ERP流程编号" align="center" prop="flowCode" />
       <el-table-column
         label="交易日期"
@@ -227,8 +227,28 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="180"
       >
         <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-check"
+            v-if="
+              scope.row.subscriptionStatus == 0 ||
+              scope.row.subscriptionStatus == null
+            "
+            @click="handleComfirm(scope.row)"
+            >认款
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-check"
+            v-if="scope.row.subscriptionStatus == 1"
+            @click="handleUnComfirm(scope.row)"
+            >取消认款
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -264,16 +284,28 @@
       width="1000px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-upload
+        class="upload-demo"
+        drag
+        :limit="1"
+        :action="uploadUrl"
+        :file-list="fileList"
+        :headers="headers"
+        :on-success="handleSuccess"
+        name="multipartFile"
+        :multiple="false"
+      >
+        <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="110px"
+        style="margin-top: 20px"
+      >
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="OA/ERP流程编号" prop="flowCode">
-              <el-input
-                v-model="form.flowCode"
-                placeholder="请输入OA/ERP流程编号"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="交易日期" prop="tradTime">
               <el-date-picker
@@ -285,13 +317,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="银行" prop="bank">
-              <el-input v-model="form.bank" placeholder="请输入银行" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="交易类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择交易类型">
@@ -299,6 +324,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="银行" prop="bank">
+              <el-input v-model="form.bank" placeholder="请输入银行" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="我方账户" prop="myCompany">
               <el-input v-model="form.myCompany" placeholder="请输入我方账户" />
@@ -530,6 +562,37 @@
         <el-button @click="cancel1">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 认款弹出框-->
+    <el-dialog title="认款" :visible.sync="open2" width="800px" append-to-body>
+      <el-form ref="form1" :model="form1" :rules="rules" label-width="140px">
+        <el-row>
+          <el-col :span="14">
+            <el-form-item label="经办人" prop="staffName">
+              <el-select
+                v-model="form1.staffName"
+                filterable
+                placeholder="请选择经办人"
+                value-key="id"
+                @change="handleSelectUser"
+              >
+                <el-option
+                  v-for="item in userOptions"
+                  :key="item.id"
+                  :value="item"
+                  :label="item.username"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
+        <el-button @click="cancel2">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -544,6 +607,8 @@ import {
   downloadXml,
   getBankSlipPageTime,
 } from "@/api/accounting/bankSlip";
+import { getAccessToken, getTenantId } from "@/utils/auth";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "BankSlip",
@@ -565,6 +630,7 @@ export default {
       // 是否显示弹出层
       open: false,
       open1: false,
+      open2: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -612,15 +678,27 @@ export default {
         password: null,
         inputPassword: null,
       },
+      userOptions: [], //用户数据
       // 表单参数
       form: {},
+      form1: {},
       // 表单校验
-      rules: {},
+      rules: {
+        staffName: [{ required: true, message: "请选择", trigger: "blur" }],
+      },
+      fileList: [], // 文件列表
+      uploadUrl:
+        process.env.VUE_APP_BASE_API + "/admin-api/archives/flow/upload", // 上传地址地址
+      headers: {
+        Authorization: "Bearer " + getAccessToken(),
+        "tenant-id": getTenantId(),
+      }, // 设置上传的请求头
       time: "",
     };
   },
   created() {
     this.getList();
+    this.getUserList();
   },
   methods: {
     /** 查询列表 */
@@ -643,6 +721,12 @@ export default {
         this.loading = false;
       });
     },
+    //获取用户
+    getUserList() {
+      listUser().then((response) => {
+        this.userOptions = response.data.list;
+      });
+    },
     handleOneMonth() {
       this.time = 1;
       this.getList2();
@@ -663,6 +747,12 @@ export default {
     /** 取消按钮 */
     cancel1() {
       this.open1 = false;
+      this.reset();
+    },
+    /** 取消按钮 */
+    cancel2() {
+      this.open2 = false;
+      this.reset();
     },
     /** 表单重置 */
     reset() {
@@ -709,6 +799,12 @@ export default {
         archiveState: undefined,
         password: undefined,
       };
+      this.form1 = {
+        id: undefined,
+        staffId: undefined,
+        staffName: undefined,
+        subscriptionStatus: undefined,
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -727,6 +823,10 @@ export default {
       this.open = true;
       this.title = "添加银行回单";
     },
+    // 上传成功的函数
+    handleSuccess(res) {
+      console.log(res);
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -737,6 +837,43 @@ export default {
         this.title = "修改银行回单";
       });
     },
+    /** 认款按钮操作 */
+    handleComfirm(val) {
+      this.reset();
+      this.form1.id = val.id;
+      this.open2 = true;
+    },
+    handleSelectUser(val) {
+      this.form1.staffId = val.id;
+      this.form1.staffName = val.username;
+    },
+    submitForm2() {
+      this.form1.subscriptionStatus = 1;
+      this.$refs["form1"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        updateBankSlip(this.form1).then((response) => {
+          this.$modal.msgSuccess("认款成功");
+          this.open2 = false;
+          this.getList();
+        });
+      });
+    },
+    /** 取消认款按钮操作 */
+    handleUnComfirm(val) {
+      this.reset();
+      const data = { id: val.id, subscriptionStatus: 0 };
+      this.$modal
+        .confirm('是否确认取消银行回单编号为"' + val.id + '"的认款?')
+        .then(function () {
+          updateBankSlip(data).then((response) => {});
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("取消成功");
+        });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -762,6 +899,7 @@ export default {
     },
     //下载元数据
     handleDownloadData() {
+      this.reset();
       this.open1 = true;
       this.queryParams.inputPassword = null;
     },

src/views/accounting/book/index.vue

@@ -79,11 +79,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="账簿名称" align="center" prop="name">
-        <!-- <template slot-scope="scope">
+        <template slot-scope="scope">
           <el-button type="text" @click="openLink(scope.row.uri)">
             {{ scope.row.name }}
           </el-button>
-        </template> -->
+        </template>
       </el-table-column>
       <el-table-column label="业务实体" align="center" prop="company" />
       <el-table-column label="细分类型" align="center" prop="type" />
@@ -106,14 +106,14 @@
         class-name="small-padding fixed-width"
       >
         <template v-slot="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['archives:accounting-book:update']"
             >修改</el-button
-          >
+          > -->
           <el-button
             size="mini"
             type="text"
@@ -359,12 +359,12 @@ export default {
     //  * 文件预览
     //  * @param fileUrl
     //  */
-    // openLink(fileUrl) {
+    openLink(fileUrl) {
-    //   const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
+      const url =
-    //     this.base64Encode(fileUrl)
+        process.env.VUE_APP_ONLINE_API +
-    //   )}`;
+        `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
-    //   window.open(url);
+      window.open(url);
-    // },
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/accounting/flow/index.vue

@@ -77,7 +77,6 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <!-- <el-table-column label="主键Id" align="center" prop="id" /> -->
       <el-table-column label="OA/ERP流程编号" align="center" prop="flowCode" />
       <el-table-column label="凭证号" align="center" prop="voucherNum" />
       <el-table-column label="业务类型" align="center" prop="businessType">
@@ -95,7 +94,6 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="流程号" align="center" prop="flowId" />
       <el-table-column label="摘要" align="center" prop="note" />
       <el-table-column
         label="创建时间"
@@ -172,22 +170,28 @@
       >
         <el-row>
           <el-col :span="8">
-            <el-form-item label="OA/ERP流程编号" prop="flowCode">
+            <el-form-item label="会计凭证" prop="voucherNum">
-              <el-input
+              <el-select
-                v-model="form.flowCode"
+                v-model="form.voucherNum"
-                placeholder="请输入OA/ERP流程编号"
+                filterable
-              />
+                placeholder="请选择会计凭证"
-            </el-form-item>
+                value-key="id"
-          </el-col>
+                @change="handleSelectVoucher"
-          <el-col :span="8">
+              >
-            <el-form-item label="凭证号" prop="voucherNum">
+                <el-option
-              <el-input v-model="form.voucherNum" placeholder="请输入凭证号" />
+                  v-for="item in kjpzOptions"
+                  :key="item.id"
+                  :label="item.voucherNum"
+                  :value="item"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务类型" prop="businessType">
               <el-select
-                v-model="queryParams.businessType"
+                v-model="form.businessType"
                 placeholder="请选择业务类型"
                 clearable
                 size="small"
@@ -203,18 +207,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <!-- <el-col :span="8">
-            <el-form-item label="文件地址" prop="fileUrl">
-              <el-input v-model="form.fileUrl" placeholder="请输入文件地址" />
-            </el-form-item>
-          </el-col> -->
-          <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-form-item label="摘要" prop="note">
               <el-input v-model="form.note" placeholder="请输入摘要" />
@@ -270,6 +262,7 @@ import {
   downloadXml,
 } from "@/api/accounting/flow";
 import { getAccessToken, getTenantId } from "@/utils/auth";
+import { getVoucherPage } from "@/api/accounting/voucher";
 
 export default {
   name: "Flow",
@@ -291,7 +284,6 @@ export default {
       // 是否显示弹出层
       open: false,
       open1: false,
-      fileList: [],
       imgType: ".jpeg, .jpg, .png",
       // 查询参数
       queryParams: {
@@ -328,10 +320,12 @@ export default {
         Authorization: "Bearer " + getAccessToken(),
         "tenant-id": getTenantId(),
       }, // 设置上传的请求头
+      kjpzOptions: [], //会计凭证
     };
   },
   created() {
     this.getList();
+    this.getKJPZ();
   },
   methods: {
     /** 查询列表 */
@@ -344,6 +338,12 @@ export default {
         this.loading = false;
       });
     },
+    //获取会计凭证
+    getKJPZ() {
+      getVoucherPage().then((res) => {
+        this.kjpzOptions = res.data.list || [];
+      });
+    },
     openLink(fileUrl) {
       window.open(fileUrl);
     },
@@ -352,10 +352,10 @@ export default {
       this.open = false;
       this.reset();
     },
-
     /** 取消按钮 */
     cancel1() {
       this.open1 = false;
+      this.reset();
     },
     /** 表单重置 */
     reset() {
@@ -408,6 +408,11 @@ export default {
         this.title = "修改审批流程";
       });
     },
+    //凭证选择
+    handleSelectVoucher(val) {
+      this.form.voucherId = val.id;
+      this.form.voucherNum = val.voucherNum;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -470,6 +475,7 @@ export default {
     },
     //下载元数据
     handleDownloadData() {
+      this.reset();
       this.open1 = true;
       this.queryParams.inputPassword = null;
     },

src/views/accounting/invoices/index.vue

@@ -918,9 +918,9 @@ export default {
      * @param fileUrl
      */
     openLink(fileUrl) {
-      const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
+      const url =
-        this.base64Encode(fileUrl)
+        process.env.VUE_APP_ONLINE_API +
-      )}`;
+        `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
       window.open(url);
     },
     handleClick(tab) {

src/views/accounting/other/index.vue

@@ -340,9 +340,9 @@ export default {
      * @param fileUrl 地址
      */
     openLink(fileUrl) {
-      const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
+      const url =
-        this.base64Encode(fileUrl)
+        process.env.VUE_APP_ONLINE_API +
-      )}`;
+        `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
       window.open(url);
     },
     /** 查询列表 */

src/views/accounting/voucher/index.vue

@@ -149,7 +149,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1000px"
+      width="1200px"
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -288,81 +288,53 @@
         @tab-click="handleClick"
       >
         <el-tab-pane label="附件" name="first">
-          <!-- <el-upload
-            class="upload-demo"
-            drag
-            multiple
-            :action="uploadUrl1"
-            :file-list="fileList1"
-            :headers="headers"
-            name="multipartFile"
-            :on-success="handleSuccess1"
-            :show-file-list="false"
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">
-              将文件拖到此处，或<em>点击上传</em>
-            </div>
-          </el-upload>
-          <el-divider>已上传附件</el-divider> -->
           <div v-if="showNull" class="null1">空</div>
-          <div v-for="(item, index) in fjList1">
+          <div v-for="(item, index) in fjList" @click="handleClickPdf(item)">
-            <el-image :src="item.fileUrl"> </el-image>
+            <el-image
-          </div>
+              :src="item.fileUrl"
-          <div v-for="(item, index) in fjList2" @click="handleClickPdf(item)">
-            <img
-              src="~@/assets/images/pdf.png"
               style="
                 object-fit: cover;
                 width: 240px;
                 height: 220px;
                 cursor: pointer;
+                margin: 0 10px;
               "
-            />
+            >
+            </el-image>
           </div>
         </el-tab-pane>
         <el-tab-pane label="审批流程" name="second">
-          <!-- <el-upload
-            class="upload-demo"
-            drag
-            action="https://jsonplaceholder.typicode.com/posts/"
-            multiple
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">
-              将文件拖到此处，或<em>点击上传</em>
-            </div>
-          </el-upload>
-          <el-divider>已上传审批流程</el-divider> -->
           <div v-if="showNul2" class="null1">空</div>
+          <div v-for="(item, index) in splcList" @click="handleClickPdf(item)">
+            <el-image
+              :src="item.fileUrl"
+              style="
+                object-fit: cover;
+                width: 240px;
+                height: 220px;
+                cursor: pointer;
+                margin: 0 10px;
+              "
+            >
+            </el-image>
+          </div>
         </el-tab-pane>
         <el-tab-pane label="电子发票" name="third">
-          <!-- <el-upload
-            class="upload-demo"
-            drag
-            multiple
-            :action="uploadUrl3"
-            :file-list="fileList3"
-            :headers="headers"
-            name="multipartFile"
-            :on-success="handleSuccess3"
-            :show-file-list="false"
-            :accept="imgType1"
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">
-              将文件拖到此处，或<em>点击上传</em>
-            </div>
-            <div class="el-upload__tip" slot="tip">
-              支持图片、pdf、ofd格式上传
-            </div>
-          </el-upload>
-          <el-divider>已上传电子发票</el-divider> -->
           <div v-if="showNul3" class="null1">空</div>
-          <div v-for="(item, index) in dzfpList1">
+          <div v-for="(item, index) in dzfpList" @click="handleClickPdf(item)">
-            <el-image :src="item.fileUrl"> </el-image>
+            <el-image
+              :src="item.fileUrl"
+              style="
+                object-fit: cover;
+                width: 240px;
+                height: 220px;
+                cursor: pointer;
+                margin: 0 10px;
+              "
+            >
+            </el-image>
           </div>
-          <div v-for="(item, index) in dzfpList2" @click="handleClickPdf(item)">
+          <!-- <div v-for="(item, index) in dzfpList2" @click="handleClickPdf(item)">
             <img
               src="~@/assets/images/pdf.png"
               style="
@@ -383,26 +355,23 @@
                 cursor: pointer;
               "
             />
-          </div>
+          </div> -->
         </el-tab-pane>
         <el-tab-pane label="银行回单" name="fourth">
-          <!-- <el-upload
-            class="upload-demo"
-            drag
-            action="https://jsonplaceholder.typicode.com/posts/"
-            multiple
-            :accept="imgType2"
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">
-              将文件拖到此处，或<em>点击上传</em>
-            </div>
-            <div class="el-upload__tip" slot="tip">
-              支持pdf、jpg、png格式上传
-            </div>
-          </el-upload>
-          <el-divider>已上传银行回单</el-divider> -->
           <div v-if="showNul4" class="null1">空</div>
+          <div v-for="(item, index) in yhhdList" @click="handleClickPdf(item)">
+            <el-image
+              :src="item.fileUrl"
+              style="
+                object-fit: cover;
+                width: 240px;
+                height: 220px;
+                cursor: pointer;
+                margin: 0 10px;
+              "
+            >
+            </el-image>
+          </div>
         </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
@@ -430,7 +399,6 @@ import { getAttachmentPage } from "@/api/accounting/attachment";
 import { getFlowPage } from "@/api/accounting/flow";
 import { getInvoicesPage } from "@/api/accounting/invoices";
 import { getBankSlipPage } from "@/api/accounting/bankSlip";
-import { getAccessToken, getTenantId } from "@/utils/auth";
 
 export default {
   name: "Voucher",
@@ -497,29 +465,10 @@ export default {
         depotId: null,
         cabinetId: null,
       },
-      fileList1: [], // 文件列表
+      fjList: [],
-      fileList2: [],
+      splcList: [],
-      fileList3: [],
+      dzfpList: [],
-      fjList1: [],
+      yhhdList: [],
-      fjList2: [],
-      dzfpList1: [],
-      dzfpList2: [],
-      dzfpList3: [],
-      uploadUrl1:
-        process.env.VUE_APP_BASE_API +
-        "/admin-api/accounting/attachment/upload", // 附件上传地址
-      uploadUrl2:
-        process.env.VUE_APP_BASE_API + "/admin-api//archives/flow/upload", // 审批流程上传地址
-      uploadUrl3:
-        process.env.VUE_APP_BASE_API +
-        "/admin-api/accounting/invoices/identify", // 电子发票上传地址
-      uploadUrl4:
-        process.env.VUE_APP_BASE_API +
-        "/admin-api/accounting/attachment/upload", // 银行回单上传地址
-      headers: {
-        Authorization: "Bearer " + getAccessToken(),
-        "tenant-id": getTenantId(),
-      }, // 设置上传的请求头
       // 表单参数
       form: {},
       // 表单校验
@@ -528,13 +477,14 @@ export default {
       siteOptions: [], //归档位置数据
       siteArray: [], //归档位置选中值
       typeOptions: [], //凭证类别
-      url: "",
       showNull: "",
       showNul2: "",
-      showNul3: true,
+      showNul3: "",
-      showNul4: true,
+      showNul4: "",
+      fjUrl: "",
     };
   },
+  watch() {},
   created() {
     this.getList();
     this.getUserList();
@@ -568,18 +518,12 @@ export default {
         } else {
           this.showNull = false;
         }
-        this.fjList2 = response.data.list.filter(function (item) {
+        this.fjList = response.data.list;
-          return item.suffix == "pdf";
-        });
       });
     },
     handleClickPdf(val) {
       window.open(val.fileUrl);
     },
-    handleSuccess1(response, file, fileList) {
-      console.log(response, file, fileList);
-      this.getFJ();
-    },
     /** 查询审批流程 */
     getSPLC(val) {
       // 执行查询
@@ -589,6 +533,7 @@ export default {
         } else {
           this.showNul2 = false;
         }
+        this.splcList = response.data.list;
       });
     },
     /** 查询电子发票 */
@@ -600,12 +545,7 @@ export default {
         } else {
           this.showNul3 = false;
         }
-        this.dzfpList2 = response.data.list.filter(function (item) {
+        this.dzfpList = response.data.list;
-          return item.suffix == "pdf";
-        });
-        this.dzfpList3 = response.data.list.filter(function (item) {
-          return item.suffix == "ofd";
-        });
       });
     },
     /** 查询银行回单 */
@@ -617,10 +557,9 @@ export default {
         } else {
           this.showNul4 = false;
         }
+        this.yhhdList = response.data.list;
       });
     },
-    handleClickOfd() {},
-    handleSuccess3() {},
     //获取字典数据
     handleInitList() {
       // 获取凭证类别
@@ -821,4 +760,7 @@ export default {
   font-size: large;
   justify-content: center;
 }
+.el-tab-pane {
+  display: flex;
+}
 </style>

src/views/ea/electronicContracts/index.vue

@@ -1,67 +1,121 @@
 <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="createBy">
-        <el-input v-model="queryParams.createBy" placeholder="请输入制单人" clearable
+        <el-input
-                  @keyup.enter.native="handleQuery"/>
+          v-model="queryParams.createBy"
+          placeholder="请输入制单人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-<!--      <el-form-item label="业务实体" prop="company">-->
+      <!--      <el-form-item label="业务实体" prop="company">-->
-<!--        <el-input v-model="queryParams.company" placeholder="请输入业务实体" clearable-->
+      <!--        <el-input v-model="queryParams.company" placeholder="请输入业务实体" clearable-->
-<!--                  @keyup.enter.native="handleQuery"/>-->
+      <!--                  @keyup.enter.native="handleQuery"/>-->
-<!--      </el-form-item>-->
+      <!--      </el-form-item>-->
-<!--      <el-form-item label="创建日期" prop="createTime">-->
+      <!--      <el-form-item label="创建日期" prop="createTime">-->
-<!--        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"-->
-<!--                        type="daterange"-->
+      <!--                        type="daterange"-->
-<!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"-->
+      <!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"-->
-<!--                        :default-time="['00:00:00', '23:59:59']"/>-->
+      <!--                        :default-time="['00:00:00', '23:59:59']"/>-->
-<!--      </el-form-item>-->
+      <!--      </el-form-item>-->
-<!--      <el-form-item label="所属部门" prop="deptName">-->
+      <!--      <el-form-item label="所属部门" prop="deptName">-->
-<!--        <el-input v-model="queryParams.deptName" placeholder="请输入所属部门" clearable-->
+      <!--        <el-input v-model="queryParams.deptName" placeholder="请输入所属部门" clearable-->
-<!--                  @keyup.enter.native="handleQuery"/>-->
+      <!--                  @keyup.enter.native="handleQuery"/>-->
-<!--      </el-form-item>-->
+      <!--      </el-form-item>-->
       <el-form-item label="合同编号" prop="contractCode">
-        <el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable
+        <el-input
-                  @keyup.enter.native="handleQuery"/>
+          v-model="queryParams.contractCode"
+          placeholder="请输入合同编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="合同名称" prop="contractTitle">
-        <el-input v-model="queryParams.contractTitle" placeholder="请输入合同名称" clearable
+        <el-input
-                  @keyup.enter.native="handleQuery"/>
+          v-model="queryParams.contractTitle"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="合同类型" prop="contractType">
-        <el-select v-model="queryParams.contractType" placeholder="请选择合同类型" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_TYPE)"
+          v-model="queryParams.contractType"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          placeholder="请选择合同类型"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="签署方" prop="signatory">
-        <el-input v-model="queryParams.signatory" placeholder="请输入签署方" clearable
+        <el-input
-                  @keyup.enter.native="handleQuery"/>
+          v-model="queryParams.signatory"
+          placeholder="请输入签署方"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="签署日期" prop="signDate">
-        <el-date-picker v-model="queryParams.signDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+        <el-date-picker
-                        type="daterange"
+          v-model="queryParams.signDate"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          style="width: 240px"
-                        :default-time="['00:00:00', '23:59:59']"/>
+          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="contractStatus">
-        <el-select v-model="queryParams.contractStatus" placeholder="请选择状态" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_STATUS)"
+          v-model="queryParams.contractStatus"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          placeholder="请选择状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="处理结果" prop="handleResult">
-        <el-select v-model="queryParams.handleResult" placeholder="请选择处理结果" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.HANDLE_RESULT)"
+          v-model="queryParams.handleResult"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          placeholder="请选择处理结果"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.HANDLE_RESULT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="年度" prop="year">
         <el-date-picker
           popper-class="due_year"
           v-model="queryParams.year"
-
           value-format="Y"
           type="year"
           placeholder="请选择会计月份"
@@ -82,33 +136,53 @@
         </el-date-picker>
       </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)"
+          v-model="queryParams.borrowStatus"
-                     :key="dict.value" :label="dict.label" :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="recordTime">-->
+      <!--      <el-form-item label="归档时间" prop="recordTime">-->
-<!--        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"-->
-<!--                        type="daterange"-->
+      <!--                        type="daterange"-->
-<!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"-->
+      <!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"-->
-<!--                        :default-time="['00:00:00', '23:59:59']"/>-->
+      <!--                        :default-time="['00:00:00', '23:59:59']"/>-->
-<!--      </el-form-item>-->
+      <!--      </el-form-item>-->
-<!--      <el-form-item label="纸档位置" prop="position">-->
+      <!--      <el-form-item label="纸档位置" prop="position">-->
-<!--        <el-input v-model="queryParams.position" placeholder="请输入纸档位置" clearable-->
+      <!--        <el-input v-model="queryParams.position" placeholder="请输入纸档位置" clearable-->
-<!--                  @keyup.enter.native="handleQuery"/>-->
+      <!--                  @keyup.enter.native="handleQuery"/>-->
-<!--      </el-form-item>-->
+      <!--      </el-form-item>-->
-<!--      <el-form-item label="完整性" prop="cherks">-->
+      <!--      <el-form-item label="完整性" prop="cherks">-->
-<!--        <el-input v-model="queryParams.cherks" placeholder="请输入完整性" clearable @keyup.enter.native="handleQuery"/>-->
+      <!--        <el-input v-model="queryParams.cherks" placeholder="请输入完整性" clearable @keyup.enter.native="handleQuery"/>-->
-<!--      </el-form-item>-->
+      <!--      </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)"
+          v-model="queryParams.fileStatus"
-                     :key="dict.value" :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>
@@ -116,70 +190,116 @@
     <!-- 操作工具栏 -->
     <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-contracts:create']">新增
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ea:electronic-contracts:create']"
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+        <el-button
-                   :loading="exportLoading"
+          type="warning"
-                   v-hasPermi="['ea:electronic-contracts:export']">导出
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['ea:electronic-contracts: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="制单人" align="center" prop="createBy" />
-      <el-table-column label="制单人" align="center" prop="createBy"/>
+      <el-table-column
-      <el-table-column label="创建日期" align="center" prop="createTime" width="180">
+        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="company"/>
+      <el-table-column label="业务实体" align="center" prop="company" />
 
-      <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="所属部门" align="center" prop="deptName" />
-      <el-table-column label="合同编号" align="center" prop="contractCode"/>
+      <el-table-column label="合同编号" align="center" prop="contractCode" />
-      <el-table-column label="合同名称" align="center" prop="contractTitle"/>
+      <el-table-column label="合同名称" align="center" prop="contractTitle" />
       <el-table-column label="合同类型" align="center" prop="contractType">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CONTRACT_TYPE" :value="scope.row.contractType" />
+          <dict-tag
+            :type="DICT_TYPE.CONTRACT_TYPE"
+            :value="scope.row.contractType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="签署方" align="center" prop="signatory"/>
+      <el-table-column label="签署方" align="center" prop="signatory" />
-      <el-table-column label="签署日期" align="center" prop="signDate" width="98px">
+      <el-table-column
+        label="签署日期"
+        align="center"
+        prop="signDate"
+        width="98px"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.signDate) }}</span>
-<!--          <span>{{dateArray(scope.row.signDate) }}</span>-->
+          <!--          <span>{{dateArray(scope.row.signDate) }}</span>-->
-<!--          <span>{{  dateArrayTransfer(scope.row.signDate,'yyyy-MM-dd ') }}</span>-->
+          <!--          <span>{{  dateArrayTransfer(scope.row.signDate,'yyyy-MM-dd ') }}</span>-->
         </template>
       </el-table-column>
-      <el-table-column label="生效日期" align="center" prop="effectiveDate" width="98px">
+      <el-table-column
+        label="生效日期"
+        align="center"
+        prop="effectiveDate"
+        width="98px"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.effectiveDate) }}</span>
-<!--          <span>{{dateArray(scope.row.effectiveDate) }}</span>-->
+          <!--          <span>{{dateArray(scope.row.effectiveDate) }}</span>-->
-
         </template>
       </el-table-column>
-      <el-table-column label="截止日期" align="center" prop="expiryDate" width="98px" >
+      <el-table-column
+        label="截止日期"
+        align="center"
+        prop="expiryDate"
+        width="98px"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.expiryDate) }}</span>
-<!--          <span>{{dateArray(scope.row.expiryDate) }}</span>-->
+          <!--          <span>{{dateArray(scope.row.expiryDate) }}</span>-->
-
         </template>
       </el-table-column>
       <el-table-column label="合同状态" align="center" prop="contractStatus">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.CONTRACT_STATUS" :value="scope.row.contractStatus" />
+          <dict-tag
+            :type="DICT_TYPE.CONTRACT_STATUS"
+            :value="scope.row.contractStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="金额" align="center" prop="contractAmount"/>
+      <el-table-column label="金额" align="center" prop="contractAmount" />
-      <el-table-column label="查看附件" align="center" prop="contractAttachment" width="180">
+      <el-table-column
+        label="查看附件"
+        align="center"
+        prop="contractAttachment"
+        width="180"
+      >
         <template slot-scope="scope">
-          <el-button type="text" @click="openLink(scope.row.contractAttachment)">
+          <el-button
+            type="text"
+            @click="openLink(scope.row.contractAttachment)"
+          >
             {{ scope.row.contractAttachment }}
           </el-button>
         </template>
@@ -202,42 +322,73 @@
 
       <el-table-column label="处理结果" align="center" prop="handleResult">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.HANDLE_RESULT" :value="scope.row.handleResult" />
+          <dict-tag
+            :type="DICT_TYPE.HANDLE_RESULT"
+            :value="scope.row.handleResult"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="年度" align="center" prop="year"/>
+      <el-table-column label="年度" align="center" prop="year" />
-      <el-table-column label="月份" align="center" prop="period"/>
+      <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>
-      <el-table-column label="纸档位置" align="center" prop="position"/>
+      <el-table-column label="纸档位置" align="center" prop="position" />
-      <el-table-column label="完整性" align="center" prop="cherks"/>
+      <el-table-column label="完整性" align="center" prop="cherks" />
 
       <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" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-
+          <el-button
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            size="mini"
-                     v-hasPermi="['ea:electronic-contracts:update']">修改
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ea:electronic-contracts:update']"
+            >修改
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button
-                     v-hasPermi="['ea:electronic-contracts:delete']">删除
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ea:electronic-contracts: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="previewtitle" :visible.sync="preview" width="1000px" v-dialogDrag append-to-body>-->
     <!--      <el-form ref="form" :model="form" :rules="rules" label-width="98px">-->
@@ -272,49 +423,67 @@
     <!--            </el-table-column>-->
     <!--          </el-table>-->
 
-
     <!--        </el-tab-pane>-->
     <!--      </el-tabs>-->
     <!--    </el-dialog>-->
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" v-dialogDrag append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      v-dialogDrag
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="98px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="制单人" prop="createBy">
-              <el-input v-model="form.createBy" placeholder="请输入制单人"/>
+              <el-input v-model="form.createBy" placeholder="请输入制单人" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="业务实体" prop="company">
-              <el-input v-model="form.company" placeholder="请输入业务实体"/>
+              <el-input v-model="form.company" placeholder="请输入业务实体" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="所属部门" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入所属部门"/>
+              <el-input v-model="form.deptName" placeholder="请输入所属部门" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="合同编号" prop="contractCode">
-              <el-input v-model="form.contractCode" placeholder="请输入合同编号"/>
+              <el-input
+                v-model="form.contractCode"
+                placeholder="请输入合同编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="合同名称" prop="contractTitle">
-              <el-input v-model="form.contractTitle" placeholder="请输入合同名称"/>
+              <el-input
+                v-model="form.contractTitle"
+                placeholder="请输入合同名称"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="合同类型" prop="contractType">
-              <el-select v-model="form.contractType" placeholder="请选择合同类型">
+              <el-select
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_TYPE)"
+                v-model="form.contractType"
-                           :key="dict.value" :label="dict.label" :value="dict.value"/>
+                placeholder="请选择合同类型"
+              >
+                <el-option
+                  v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -322,53 +491,81 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="签署方" prop="signatory">
-              <el-input v-model="form.signatory" placeholder="请输入签署方"/>
+              <el-input v-model="form.signatory" placeholder="请输入签署方" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="签署日期" prop="signDate">
-              <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              <el-date-picker
-                              placeholder="选择签署日期"/>
+                clearable
+                v-model="form.signDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择签署日期"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="生效日期" prop="effectiveDate">
-              <el-date-picker clearable v-model="form.effectiveDate" type="date" value-format="yyyy-MM-dd"
+              <el-date-picker
-                              placeholder="选择生效日期"/>
+                clearable
+                v-model="form.effectiveDate"
+                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="expiryDate">
-              <el-date-picker clearable v-model="form.expiryDate" type="date" value-format="yyyy-MM-dd"
+              <el-date-picker
-                              placeholder="选择截止日期"/>
+                clearable
+                v-model="form.expiryDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择截止日期"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="合同状态" prop="contractStatus">
               <el-select v-model="form.contractStatus" placeholder="请选择状态">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_STATUS)"
+                <el-option
-                           :key="dict.value" :label="dict.label" :value="dict.value"/>
+                  v-for="dict in this.getDictDatas(DICT_TYPE.CONTRACT_STATUS)"
+                  :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="contractAmount">
-              <el-input v-model="form.contractAmount" placeholder="请输入金额"/>
+              <el-input
+                v-model="form.contractAmount"
+                placeholder="请输入金额"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="附件">
-          <fileUpload
+          <fileUpload v-model="form.contractAttachment" />
-            v-model="form.contractAttachment"/>
         </el-form-item>
         <el-row>
           <el-col :span="8">
             <el-form-item label="处理结果" prop="handleResult">
-              <el-select v-model="form.handleResult" placeholder="请选择处理结果">
+              <el-select
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.HANDLE_RESULT)"
+                v-model="form.handleResult"
-                           :key="dict.value" :label="dict.label" :value="dict.value"/>
+                placeholder="请选择处理结果"
+              >
+                <el-option
+                  v-for="dict in this.getDictDatas(DICT_TYPE.HANDLE_RESULT)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -401,34 +598,52 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="借阅状态" prop="borrowStatus">
-              <el-select v-model="form.borrowStatus" placeholder="请选择借阅状态">
+              <el-select
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BORROW_STATUS)"
+                v-model="form.borrowStatus"
-                           :key="dict.value" :label="dict.label" :value="dict.value"/>
+                placeholder="请选择借阅状态"
+              >
+                <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-col>
           <el-col :span="8">
             <el-form-item label="归档时间" prop="recordTime">
-              <el-date-picker clearable v-model="form.recordTime" type="date" value-format="yyyy-MM-dd"
+              <el-date-picker
-                              placeholder="选择归档时间"/>
+                clearable
+                v-model="form.recordTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择归档时间"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="纸档位置" prop="position">
-              <el-input v-model="form.position" placeholder="请输入纸档位置"/>
+              <el-input v-model="form.position" placeholder="请输入纸档位置" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="完整性" prop="cherks">
-              <el-input v-model="form.cherks" placeholder="请输入完整性"/>
+              <el-input v-model="form.cherks" placeholder="请输入完整性" />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="归档状态" prop="fileStatus">
               <el-select v-model="form.fileStatus" placeholder="请选择归档状态">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_FILE_STATUS)"
+                <el-option
-                           :key="dict.value" :label="dict.label" :value="dict.value"/>
+                  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-col>
@@ -450,11 +665,11 @@ import {
   deleteElectronicContracts,
   getElectronicContracts,
   getElectronicContractsPage,
-  exportElectronicContractsExcel
+  exportElectronicContractsExcel,
 } from "@/api/ea/electronicContracts/electronicContracts";
-import FileUpload from '@/components/FileUpload';
+import FileUpload from "@/components/FileUpload";
 import ImagePreview from "@/components/ImagePreview";
-import Video from "@/components/VideoUpload"
+import Video from "@/components/VideoUpload";
 import WxVideoPlayer from "@/views/mp/components/wx-video-play/main";
 
 export default {
@@ -522,7 +737,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
     };
   },
   created() {
@@ -534,11 +749,11 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getElectronicContractsPage(this.queryParams).then(response => {
+      getElectronicContractsPage(this.queryParams).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
-        console.log(this.list)
+        console.log(this.list);
       });
     },
     /**
@@ -546,44 +761,43 @@ export default {
      * @param fileUrl
      */
     openLink(fileUrl) {
-      const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
+      const url =
-        this.base64Encode(fileUrl)
+        process.env.VUE_APP_ONLINE_API +
-      )}`;
+        `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
       window.open(url);
     },
     isImg(url) {
-      let suffix = url.substring(url.lastIndexOf("."))
+      let suffix = url.substring(url.lastIndexOf("."));
-      let typeList = ['.jpg', '.png', '.gif', '.jpeg']
+      let typeList = [".jpg", ".png", ".gif", ".jpeg"];
       for (let type of typeList) {
-
         if (suffix == type) {
-          return true
+          return true;
         }
       }
       return false;
     },
     isVideo(url) {
-      let suffix = url.substring(url.lastIndexOf("."))
+      let suffix = url.substring(url.lastIndexOf("."));
-      let typeList = ['.mp3', '.mp4', '.mov', '.avi']
+      let typeList = [".mp3", ".mp4", ".mov", ".avi"];
       for (let type of typeList) {
-        debugger
+        debugger;
         if (suffix == type) {
-          return true
+          return true;
         }
       }
       return false;
     },
     cutFile(url) {
-      let path = url.substring(url.lastIndexOf("/"))
+      let path = url.substring(url.lastIndexOf("/"));
-      return path
+      return path;
     },
-    dateArray(list){
+    dateArray(list) {
-      if (list == null){
+      if (list == null) {
-        return ""
+        return "";
       }
-      let date = list[0]+"-"+list[1]+"-"+list[2]
+      let date = list[0] + "-" + list[1] + "-" + list[2];
-      debugger
+      debugger;
-      return date
+      return date;
     },
     /** 取消按钮 */
     cancel() {
@@ -641,33 +855,30 @@ export default {
     /* 预览按钮*/
     handlePreview() {
       this.preview = true;
-      this.previewtitle = "附件预览"
+      this.previewtitle = "附件预览";
-
     },
 
-
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getElectronicContracts(id).then(response => {
+      getElectronicContracts(id).then((response) => {
         this.form = response.data;
-        this.form.signDate =
+        this.form.signDate = this.form.effectiveDate;
-        this.form.effectiveDate
+        this.form.expiryDate;
-        this.form.expiryDate
         this.open = true;
         this.title = "修改合同档案";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
         // 修改的提交
         if (this.form.id != null) {
-          updateElectronicContracts(this.form).then(response => {
+          updateElectronicContracts(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -675,8 +886,7 @@ export default {
           return;
         }
         // 添加的提交
-        createElectronicContracts(this.form).then(response => {
+        createElectronicContracts(this.form).then((response) => {
-
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -686,30 +896,35 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除合同档案编号为"' + id + '"的数据项?').then(function () {
+      this.$modal
-        return deleteElectronicContracts(id);
+        .confirm('是否确认删除合同档案编号为"' + id + '"的数据项?')
-      }).then(() => {
+        .then(function () {
-        this.getList();
+          return deleteElectronicContracts(id);
-        this.$modal.msgSuccess("删除成功");
+        })
-      }).catch(() => {
+        .then(() => {
-      });
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = {...this.queryParams};
+      let params = { ...this.queryParams };
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有合同档案数据项?').then(() => {
+      this.$modal
-        this.exportLoading = true;
+        .confirm("是否确认导出所有合同档案数据项?")
-        return exportElectronicContractsExcel(params);
+        .then(() => {
-      }).then(response => {
+          this.exportLoading = true;
-        this.$download.excel(response, '合同档案.xls');
+          return exportElectronicContractsExcel(params);
-        this.exportLoading = false;
+        })
-      }).catch(() => {
+        .then((response) => {
-      });
+          this.$download.excel(response, "合同档案.xls");
+          this.exportLoading = false;
+        })
+        .catch(() => {});
     },
-
+  },
-  }
 };
 </script>

src/views/ea/electronicEmployee/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
       <el-form-item label="制单人" prop="createBy">

src/views/report/jmreport/index.vue

@@ -6,13 +6,16 @@
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
-import {getAccessToken} from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 export default {
   name: "JimuReport",
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(),
+      url:
+        process.env.VUE_APP_BIAO_API +
+        "/jmreport/list?token=" +
+        getAccessToken(),
     };
   },
 };

src/views/setting/fileCategory/index.vue

@@ -103,7 +103,14 @@
         prop="categoryCode"
       />
       <!-- <el-table-column label="档案类型父id" align="center" prop="parentId" /> -->
-      <el-table-column label="类型名称" align="center" prop="typeName" />
+      <el-table-column label="类型名称" align="center" prop="typeName" >
+      <template v-slot="scope">
+        <dict-tag
+          :type="DICT_TYPE.ARCHIVES_FILE_TYPE"
+          :value="scope.row.typeName"
+        />
+      </template>
+      </el-table-column>
       <el-table-column label="目录号" align="center" prop="catalogNumber" />
       <el-table-column
         label="二级类别号"
@@ -193,7 +200,15 @@
           </el-col> -->
           <el-col :span="8">
             <el-form-item label="类型名称" prop="typeName">
-              <el-input v-model="form.typeName" placeholder="请输入类型名称" />
+              <el-select v-model="form.typeName" placeholder="请选择档案类型">
+                <el-option
+                  v-for="item in fileTypeOptions"
+                  :key="item.id"
+                  :value="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -250,6 +265,7 @@ import {
 } from "@/api/setting/fileCategory";
 import { listData } from "@/api/system/dict/data";
 
+
 export default {
   name: "FileCategory",
   components: {},
@@ -269,6 +285,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      fileTypeOptions: [], //档案类型
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -294,6 +311,17 @@ export default {
     this.handleInitList();
   },
   methods: {
+    //获取字典数据
+    handleInitList() {
+      // 获取档案类型
+      listData({
+        pageNo: 1,
+        pageSize: 100,
+        dictType: "archives_file_type",
+      }).then((res) => {
+        this.fileTypeOptions = res.data.list || [];
+      });
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;