Merge remote-tracking branch 'origin/main'

src/api/accounting/invoices.js

@@ -43,6 +43,16 @@ export function getInvoicesPage(query) {
   })
 }
 
+// 获得发票分页2
+export function getInvoicesPageTime(query) {
+  return request({
+    url: '/accounting/invoices/pageTime',
+    method: 'get',
+    params: query
+  })
+}
+
+
 // 导出发票 Excel
 export function exportInvoicesExcel(query) {
   return request({

src/utils/dict.js

@@ -131,6 +131,8 @@ export const DICT_TYPE = {
   ACCOUNTING_INVOICES_STATUS: 'accounting_invoices_status',
   //  发票进销项
   ACCOUNTING_INVOICES_TYPE: 'accounting_invoices_type',
+   // 会计其他资料
+   ACCOUNTING_OTHER_TYPE: 'accounting_other_type',
 }
 
 /**

src/views/accounting/invoices/index.vue

@@ -75,6 +75,17 @@
         >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
+      <el-row style="display: inline-block">
+        <el-button round type="primary" @click="handleOneMonth"
+          >一个月内</el-button
+        >
+        <el-button round type="primary" @click="handleHalfYear"
+          >半年内</el-button
+        >
+        <el-button round type="primary" @click="handleOneYear"
+          >一年内</el-button
+        >
+      </el-row>
     </el-form>
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
@@ -627,6 +638,7 @@
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
         :auto-upload="false"
+        name="multipartFile"
         drag
       >
         <i class="el-icon-upload"></i>
@@ -693,6 +705,7 @@ import {
   exportInvoicesExcel,
   outTemplate,
   downloadXml,
+  getInvoicesPageTime,
 } from "@/api/accounting/invoices";
 import { listData } from "@/api/system/dict/data";
 import { getAccessToken } from "@/utils/auth";
@@ -722,6 +735,7 @@ export default {
       open1: false,
       accountingType: "in",
       fileList: [],
+      time: null,
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -878,6 +892,27 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
+    } /** 查询列表2 */,
+    getList2() {
+      this.loading = true;
+      // 执行查询
+      getInvoicesPageTime({ months: this.time }).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    handleOneMonth() {
+      this.time = 1;
+      this.getList2();
+    },
+    handleHalfYear() {
+      this.time = 6;
+      this.getList2();
+    },
+    handleOneYear() {
+      this.time = 12;
+      this.getList2();
     },
     //获取字典数据
     handleInitList() {

src/views/accounting/other/index.vue

@@ -1,77 +1,41 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      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-input
-      </el-form-item>
+          v-model="queryParams.name"
-      <el-form-item label="OA/ERP流程编号" prop="flowCode">
+          placeholder="请输入表名"
-        <el-input v-model="queryParams.flowCode" placeholder="请输入OA/ERP流程编号" clearable @keyup.enter.native="handleQuery"/>
+          clearable
-      </el-form-item>
+          @keyup.enter.native="handleQuery"
-      <el-form-item label="文件来源" prop="source">
+        />
-        <el-input v-model="queryParams.source" 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-form-item>
-      <el-form-item label="会计期间" prop="period">
-        <el-input v-model="queryParams.period" placeholder="请输入会计期间" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="业务类型" prop="businessType">
-        <el-select v-model="queryParams.businessType" placeholder="请选择业务类型" clearable size="small">
+        <el-select
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ACCOUNTING_OTHER_TYPE)"
+          v-model="queryParams.businessType"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+          placeholder="请选择业务类型"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.ACCOUNTING_OTHER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" 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="createBy">
-        <el-input v-model="queryParams.createBy" placeholder="请输入制单人" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="业务实体id" prop="companyId">
-        <el-input v-model="queryParams.companyId" placeholder="请输入业务实体id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="业务实体" prop="company">
-        <el-input v-model="queryParams.company" placeholder="请输入业务实体" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="文件后缀" prop="suffix">
-        <el-input v-model="queryParams.suffix" placeholder="请输入文件后缀" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="文件地址" prop="fileUrl">
-        <el-input v-model="queryParams.fileUrl" placeholder="请输入文件地址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="绝对路径" prop="fileAp">
-        <el-input v-model="queryParams.fileAp" placeholder="请输入绝对路径" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="流程号" prop="flowId">
-        <el-input v-model="queryParams.flowId" placeholder="请输入流程号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="摘要" prop="note">
-        <el-input v-model="queryParams.note" placeholder="请输入摘要" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属部门id" prop="deptId">
-        <el-input v-model="queryParams.deptId" placeholder="请输入所属部门id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="所属部门" prop="deptName">
-        <el-input v-model="queryParams.deptName" placeholder="请输入所属部门" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="归档id" prop="recordId">
-        <el-input v-model="queryParams.recordId" placeholder="请输入归档id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="用户id" prop="userId">
-        <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="归档状态" prop="archiveState">
-        <el-input v-model="queryParams.archiveState" placeholder="请输入归档状态" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" 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>
@@ -79,19 +43,37 @@
     <!-- 操作工具栏 -->
     <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="['accounting:other:create']">新增</el-button>
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['accounting:other:create']"
+          >新增</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="['accounting:other:export']">导出</el-button>
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['accounting:other: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="id" />
+      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
       <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" />
@@ -99,79 +81,159 @@
       <el-table-column label="会计期间" align="center" prop="period" />
       <el-table-column label="业务类型" align="center" prop="businessType">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.ACCOUNTING_OTHER_TYPE" :value="scope.row.businessType" />
+          <dict-tag
+            :type="DICT_TYPE.ACCOUNTING_OTHER_TYPE"
+            :value="scope.row.businessType"
+          />
         </template>
       </el-table-column>
-      <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="业务实体id" align="center" prop="companyId" />
       <el-table-column label="业务实体" align="center" prop="company" />
       <el-table-column label="文件后缀" align="center" prop="suffix" />
       <el-table-column label="文件地址" align="center" prop="fileUrl" />
       <el-table-column label="绝对路径" align="center" prop="fileAp" />
       <el-table-column label="流程号" align="center" prop="flowId" />
       <el-table-column label="摘要" align="center" prop="note" />
-      <el-table-column label="所属部门id" align="center" prop="deptId" />
-      <el-table-column label="所属部门" align="center" prop="deptName" />
-      <el-table-column label="归档id" align="center" prop="recordId" />
-      <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="归档状态" align="center" prop="archiveState" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        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"
+        type="textarea"
+        prop="remark"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button
-                     v-hasPermi="['accounting:other:update']">修改</el-button>
+            size="mini"
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            type="text"
-                     v-hasPermi="['accounting:other:delete']">删除</el-button>
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['accounting:other:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['accounting:other: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="500px" v-dialogDrag append-to-body>
+    <el-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="表名" prop="name">
               <el-input v-model="form.name" placeholder="请输入表名" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="OA/ERP流程编号" prop="flowCode">
-          <el-input v-model="form.flowCode" placeholder="请输入OA/ERP流程编号" />
+              <el-input
+                v-model="form.flowCode"
+                placeholder="请输入OA/ERP流程编号"
+              />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="文件来源" prop="source">
               <el-input v-model="form.source" placeholder="请输入文件来源" />
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="年度" prop="year">
-          <el-input v-model="form.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-input v-model="form.period" placeholder="请输入会计期间" />
+              <el-date-picker
+                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="businessType">
-          <el-select v-model="form.businessType" placeholder="请选择业务类型">
+              <el-select
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ACCOUNTING_OTHER_TYPE)"
+                v-model="form.businessType"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
+                placeholder="请选择业务类型"
+              >
+                <el-option
+                  v-for="dict in this.getDictDatas(
+                    DICT_TYPE.ACCOUNTING_OTHER_TYPE
+                  )"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
-        <el-form-item label="制单人" prop="createBy">
+          </el-col>
-          <el-input v-model="form.createBy" placeholder="请输入制单人" />
+        </el-row>
-        </el-form-item>
+        <el-row>
-        <el-form-item label="业务实体id" prop="companyId">
+          <el-col :span="8">
-          <el-input v-model="form.companyId" placeholder="请输入业务实体id" />
-        </el-form-item>
             <el-form-item label="业务实体" prop="company">
               <el-input v-model="form.company" placeholder="请输入业务实体" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="摘要" prop="note">
               <el-input v-model="form.note" placeholder="请输入摘要" />
             </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入备注"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -183,12 +245,18 @@
 </template>
 
 <script>
-import { createOther, updateOther, deleteOther, getOther, getOtherPage, exportOtherExcel } from "@/api/accounting/other";
+import {
-
+  createOther,
+  updateOther,
+  deleteOther,
+  getOther,
+  getOtherPage,
+  exportOtherExcel,
+} from "@/api/accounting/other";
+// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 export default {
   name: "Other",
-  components: {
+  components: {},
-  },
   data() {
     return {
       // 遮罩层
@@ -234,8 +302,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
+      rules: {},
-      }
     };
   },
   created() {
@@ -246,7 +313,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getOtherPage(this.queryParams).then(response => {
+      getOtherPage(this.queryParams).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -295,7 +362,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getOther(id).then(response => {
+      getOther(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改其他资料";
@@ -303,13 +370,13 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
         // 修改的提交
         if (this.form.id != null) {
-          updateOther(this.form).then(response => {
+          updateOther(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -317,7 +384,7 @@ export default {
           return;
         }
         // 添加的提交
-        createOther(this.form).then(response => {
+        createOther(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -327,27 +394,35 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除其他资料编号为"' + id + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除其他资料编号为"' + id + '"的数据项?')
+        .then(function () {
           return deleteOther(id);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = {...this.queryParams};
+      let params = { ...this.queryParams };
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有其他资料数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有其他资料数据项?")
+        .then(() => {
           this.exportLoading = true;
           return exportOtherExcel(params);
-        }).then(response => {
+        })
-          this.$download.excel(response, '其他资料.xls');
+        .then((response) => {
+          this.$download.excel(response, "其他资料.xls");
           this.exportLoading = false;
-        }).catch(() => {});
+        })
-    }
+        .catch(() => {});
-  }
+    },
+  },
 };
 </script>