Merge remote-tracking branch 'origin/main'

src/views/accounting/book/index.vue

@@ -149,7 +149,6 @@
         align="center"
         class-name="small-padding fixed-width"
         fixed="right"
-        width="180px"
       >
         <template v-slot="scope">
           <el-button
@@ -269,6 +268,7 @@
                 :file-list="fileList"
                 :auto-upload="false"
                 :on-success="test"
+                :data="form"
               >
                 <div class="el-upload__text">点击上传，或将文件拖拽到此处</div>
               </el-upload>
@@ -284,7 +284,8 @@
                 :headers="headers"
                 :file-list="fileList1"
                 :auto-upload="false"
-                :on-success="test1"
+                :on-success="test"
+                :data="form"
               >
                 <div class="el-upload__text">点击上传，或将文件拖拽到此处</div>
               </el-upload>
@@ -300,7 +301,8 @@
                 :headers="headers"
                 :file-list="fileList2"
                 :auto-upload="false"
-                :on-success="test2"
+                :on-success="test"
+                :data="form"
               >
                 <div class="el-upload__text">点击上传，或将文件拖拽到此处</div>
               </el-upload>
@@ -618,26 +620,9 @@ export default {
         .catch(() => {});
     },
     test(response, file, fileList) {
-      console.log(response, file, fileList);
-      createAccountingBook(this.form).then((response) => {
-        this.$modal.msgSuccess("新增成功");
-        this.open = false;
-        this.getList();
-      });
-    },
-    test1(response, file, fileList) {
-      console.log(response, file, fileList);
-      createAccountingBook(this.form).then((response) => {
-        this.open = false;
-        this.getList();
-      });
-    },
-    test2(response, file, fileList) {
-      console.log(response, file, fileList);
-      createAccountingBook(this.form).then((response) => {
-        this.open = false;
-        this.getList();
-      });
+      this.$modal.msgSuccess("新增成功");
+      this.open = false;
+      this.getList();
     },
   },
 };

src/views/accounting/invoices/index.vue

@@ -1320,7 +1320,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       outTemplate().then((response) => {
-        this.$download.excel(response, "发票模板.zip");
+        this.$download.excel(response, "发票模板.xls");
       });
     },
     // 文件上传中处理

src/views/accounting/report/index.vue

@@ -9,6 +9,17 @@
       v-show="showSearch"
       label-width="98px"
     >
+      <el-form-item label="会计年度" prop="year">
+        <el-date-picker
+          popper-class="due_year"
+          v-model="queryParams.year"
+          value-format="yyyy"
+          type="year"
+          placeholder="请选择会计年份"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="会计期间" prop="period">
         <el-date-picker
           popper-class="due_month"
@@ -120,7 +131,6 @@
         label="操作"
         align="center"
         fixed="right"
-        width="180px"
         class-name="small-padding fixed-width"
       >
         <template v-slot="scope">
@@ -234,6 +244,7 @@
                 :file-list="fileList"
                 :auto-upload="false"
                 :on-success="test"
+                :data="form"
               >
                 <div class="el-upload__text">点击上传，或将文件拖拽到此处</div>
               </el-upload>
@@ -249,7 +260,8 @@
                 :headers="headers"
                 :file-list="fileList1"
                 :auto-upload="false"
-                :on-success="test1"
+                :on-success="test"
+                :data="form"
               >
                 <div class="el-upload__text">点击上传，或将文件拖拽到此处</div>
               </el-upload>
@@ -265,7 +277,8 @@
                 :headers="headers"
                 :file-list="fileList2"
                 :auto-upload="false"
-                :on-success="test2"
+                :on-success="test"
+                :data="form"
               >
                 <div class="el-upload__text">点击上传，或将文件拖拽到此处</div>
               </el-upload>
@@ -447,20 +460,10 @@ export default {
     /** 表单重置 */
     reset() {
       this.form = {
-        id: undefined,
-        name: undefined,
-        url: undefined,
         companyId: undefined,
         company: undefined,
-        type: undefined,
-        bookCode: undefined,
         year: undefined,
         period: undefined,
-        encrypt: undefined,
-        recordId: undefined,
-        fileStatus: undefined,
-        deptId: undefined,
-        deptName: undefined,
       };
       this.resetForm("form");
       this.fileList = [];
@@ -556,25 +559,9 @@ export default {
     },
     test(response, file, fileList) {
       console.log(response, file, fileList);
-      createAccountingReport(this.form).then((response) => {
-        this.$modal.msgSuccess("新增成功");
-        this.open = false;
-        this.getList();
-      });
-    },
-    test1(response, file, fileList) {
-      console.log(response, file, fileList);
-      createAccountingReport(this.form).then((response) => {
-        this.open = false;
-        this.getList();
-      });
-    },
-    test2(response, file, fileList) {
-      console.log(response, file, fileList);
-      createAccountingReport(this.form).then((response) => {
-        this.open = false;
-        this.getList();
-      });
+      this.$modal.msgSuccess("新增成功");
+      this.open = false;
+      this.getList();
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/borrow/apply/index.vue

@@ -84,14 +84,6 @@
       <el-table-column label="借阅人名称" align="center" prop="userName" />
       <el-table-column label="借阅部门名称" align="center" prop="deptName" />
       <el-table-column label="借阅事由" align="center" prop="reason" />
-      <!-- <el-table-column label="借阅状态" align="center" prop="borrowState">
-        <template v-slot="scope">
-          <dict-tag
-            :type="DICT_TYPE.BORROW_APPLY"
-            :value="scope.row.borrowState"
-          />
-        </template>
-      </el-table-column> -->
       <el-table-column
         label="预计归还日期"
         align="center"
@@ -128,7 +120,6 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="200"
         fixed="right"
       >
         <template v-slot="scope">

src/views/fileAuth/authRecord/index.vue

@@ -9,9 +9,9 @@
       v-show="showSearch"
       label-width="98px"
     >
-      <el-form-item label="鉴定人" prop="userId">
+      <el-form-item label="鉴定人" prop="userName">
         <el-input
-          v-model="queryParams.userId"
+          v-model="queryParams.userName"
           placeholder="请输入鉴定人"
           clearable
           @keyup.enter.native="handleQuery"