sunlupeng vor 1 Jahr
Ursprung
Commit
241021bfcb

+ 54 - 0
src/api/finance/cash/refundInfo.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listRefundInfo(query) {
+  return request({
+    url: '/finance/cash/refund-info/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细
+export function getRefundInfo(dictId) {
+  return request({
+    url: '/finance/cash/refund-info/get?id=' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增
+export function addRefundInfo(data) {
+  return request({
+    url: '/finance/cash/refund-info/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function updateRefundInfo(data) {
+  return request({
+    url: '/finance/cash/refund-info/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function delRefundInfo(dictId) {
+  return request({
+    url: '/finance/cash/refund-info/delete?id=' + dictId,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportRefundInfo(query) {
+  return request({
+    url: '/finance/cash/refund-info/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

+ 578 - 0
src/views/finance/cash/refundInfo.vue

@@ -0,0 +1,578 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="回款标题" prop="refundTitle">
+          <el-input v-model="queryParams.refundTitle" placeholder="请输入回款标题" clearable style="width: 250px"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="客户名称" prop="customerName">
+          <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable style="width: 250px"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="合同名称" prop="contractName">
+          <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable style="width: 250px"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creatorName">
+          <el-input v-model="queryParams.creatorName" placeholder="创建人" clearable style="width: 250px"
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="回款日期" prop="refundDate">
+          <el-date-picker v-model="queryParams.refundDate" style="width: 250px" 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>
+          <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>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            v-hasPermi="['cash:refund-info:create']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+            v-hasPermi="['cash:refund-info:export']">导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="typeList">
+        <el-table-column label="回款标题" align="center" prop="refundTitle" min-width="150" />
+        <!-- <el-table-column label="回款编号" align="center" prop="refundInfoUuid" min-width="100" /> -->
+        <el-table-column label="客户名称" align="center" prop="customerName" min-width="100" />
+        <el-table-column label="合同名称" align="center" prop="contactNumber" min-width="100" />
+        <el-table-column label="回款日期" align="center" prop="refundDate" min-width="100" />
+        <el-table-column label="回款金额" align="center" prop="refundMoney" min-width="100" />
+        <el-table-column label="创建人" align="center" prop="creatorName" min-width="80" />
+        <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
+          <template v-slot="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150">
+          <template v-slot="scope">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['cash:refund-info:update']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['cash:refund-info:delete']">删除</el-button>
+            <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+  
+      <!-- 添加或修改对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="回款标题" prop="refundTitle">
+                <el-input maxlength="20" v-model="form.refundTitle" placeholder='请输入回款标题'></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="客户名称" prop="customerId">
+                <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;">
+                    <el-option v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="item.value"
+                    :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合同名称" prop="contractId">
+                <el-select v-model="form.contractId" placeholder="请选择" style="width: 100%;">
+                  <el-option v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="item.value"
+                    :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合同编号" prop="contractCode">
+                <el-input v-model="form.contractCode" placeholder='合同编号' disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="回款日期" prop="refundDate">
+                <el-date-picker value-format="yyyy-MM-dd" v-model="form.refundDate" type="date" placeholder="选择日期"
+                  style="width: 100%;">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="回款金额" prop="refundMoney">
+                    <el-input v-model="form.refundMoney" placeholder='预估费用' oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="回款周期" prop="refundCycle">
+                    <el-input v-model="form.refundCycle" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder='回款周期(天)'></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item label="逾期天数" prop="overdueDay">
+                    <el-input v-model="form.overdueDay" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder='逾期天数'></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="附件">
+                <el-upload :action="fileUrl" :headers="headers" :file-list="files" :on-success="handleFileSuccessCite"
+                  :before-upload="beforeUploadFile" :on-remove="handleRemove">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks"
+                  placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+      <!-- 详情对话框 -->
+      <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
+        <div class="widget-wrapper">
+      <div class="widget-list">
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <span class="field-required">*</span>
+            <div class="field-name">回款标题</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.refundTitle">{{ form.refundTitle }}</span>
+          </div>
+        </div>
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <span class="field-required">*</span>
+            <div class="field-name">客户名称</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.customerName">{{ form.customerName }}</span>
+          </div>
+        </div>
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <div class="field-name">合同名称</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.contractName">{{ form.contractName }}</span>
+          </div>
+        </div>
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <div class="field-name">合同编号</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.contractCode">{{ form.contractCode }}</span>
+          </div>
+        </div>
+        
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <span class="field-required">*</span>
+            <div class="field-name">回款日期</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.refundDate">{{ form.refundDate }}</span>
+          </div>
+        </div>
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <span class="field-required">*</span>
+            <div class="field-name">回款金额</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.refundMoney">{{ form.refundMoney }}</span>
+          </div>
+        </div>
+  
+  
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <div class="field-name">回款周期</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.refundCycle">{{ form.refundCycle }}</span>
+          </div>
+        </div>
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <div class="field-name">逾期天数</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.overdueDay">{{ form.overdueDay }}</span>
+          </div>
+        </div>
+  
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <div class="field-name">附件</div>
+          </div>
+          <div class="field-component">
+            <div v-for="(item, index) in form.fileList" :key="index">
+              <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+            </div>
+          </div>
+         
+        </div>
+        <div class="fx-field x-grid-col-12">
+          <div class="field-label">
+            <div class="field-name">备注</div>
+          </div>
+          <div class="field-component">
+            <span :title="form.remarks">{{ form.remarks }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { listSimplePosts } from "@/api/system/post";
+  import { listRefundInfo, getRefundInfo, delRefundInfo, addRefundInfo, updateRefundInfo, exportRefundInfo } from "@/api/finance/cash/refundInfo";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  import { listDept } from "@/api/system/dept";
+  import { DICT_TYPE } from '@/utils/dict'
+  import { getBaseHeader } from "@/utils/request";
+import { number } from "echarts";
+  export default {
+    name: "SystemDictType",
+    components: {
+      Treeselect,
+    },
+    data() {
+      return {
+        files: [],
+        // 设置上传的请求头部
+        headers: getBaseHeader(),
+        // 上传的地址
+        fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
+        postOptions: [],
+        // 部门列表
+        deptOptions: [], // 部门属性结构
+        // 遮罩层
+        loading: true,
+        // 导出遮罩层
+        exportLoading: false,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 字典表格数据
+        typeList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        openDetail: false,
+        // 查询参数
+        queryParams: {
+          pageNo: 1,
+          pageSize: 10,
+          refundTitle: undefined,
+          customerName: undefined,
+          contractName: undefined,
+          creatorName: undefined,
+          refundDate: [],
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          refundTitle: [
+            { required: true, message: '请输入回款标题', trigger: 'blur' },
+          ],
+          customerId: [
+            { required: true, message: '请选择', trigger: 'change' }
+          ],
+          refundDate: [
+            { required: true, message: '请选择回款日期', trigger: 'blur' }
+          ],
+          refundMoney: [
+            { required: true, message: '请输入金额', trigger: 'blur' },
+            {
+                pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/,
+                message: "请输入合法的金额数字,最多两位小数",
+                trigger: "blur"
+            }
+          ],
+          refundCycle: [
+            { required: true, message: '请输入回款周期', trigger: 'blur' },
+          ],
+        },
+      };
+    },
+    created() {
+      this.getList();
+      this.getListDept();
+    },
+    methods: {
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+        let fileIds = [];
+        for (let i in fileList) {
+          let id = fileList[i].response.data.id;
+          fileIds.push(id);
+        }
+        this.form.fileIdList = fileIds;
+      },
+      beforeUploadFile(file) {
+        console.log(file);
+        const size = file.size / 1024 / 1024;
+        console.log(size);
+        if (size > 5) {
+          this.$message.error("文件大小不能超过5MB!");
+          return false;
+        }
+      },
+      handleFileSuccessCite(res, file, fileList) {
+        console.log(file, fileList);
+        console.log("------", "==========");
+        console.log("res = ", res);
+  
+        let fileIds = [];
+        for (let i in fileList) {
+          let response = fileList[i].response;
+          if (response.errno && response.errno != "0") {
+            this.$message.error("该文件上传失败,已被移除,请重新上传!");
+            // 上传失败移除该 file 对象
+            fileList.splice(i, 1);
+          } else {
+            let id = fileList[i].response.data.id;
+            fileIds.push(id);
+          }
+        }
+        this.form.fileIdList = fileIds;
+      },
+      /** 查询部门列表 */
+      getListDept() {
+        listDept().then(response => {
+          this.deptOptions = this.handleTree(response.data, "id");
+        });
+        listSimplePosts().then(response => {
+          // 处理 postOptions 参数
+          this.postOptions = [];
+          this.postOptions.push(...response.data);
+        });
+      },
+      /** 转换部门数据结构 */
+      normalizer(node) {
+        if (node.children && !node.children.length) {
+          delete node.children;
+        }
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.children
+        };
+      },
+      /** 查询列表 */
+      getList() {
+        this.loading = true;
+        // 执行查询
+        listRefundInfo(this.queryParams).then(response => {
+          this.typeList = response.data.list;
+          this.total = response.data.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          refundTitle: undefined,
+          customerId: undefined,
+          contractId: undefined,
+          contractCode: undefined,
+          refundDate: undefined,
+          refundMoney: undefined,
+          refundCycle: undefined,
+          overdueDay: undefined,
+          fileIdList: undefined,
+          remarks: undefined,
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加";
+      },
+  
+      /** 详情按钮操作 */
+      handleDetail(row) {
+        this.reset();
+        const id = row.id;
+        getRefundInfo(id).then(response => {
+          this.form = response.data;
+          this.openDetail = true;
+          this.title = "详情";
+        });
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id;
+        getRefundInfo(id).then(response => {
+          let files = response.data.fileList;
+          if (files) {
+            this.files = [];
+            for (let i in files) {
+              let url = files[i].url;
+              let name = files[i].name;
+              let id = files[i].id;
+  
+              this.files.push({
+                name: name,
+                url: url,
+                response: { error: "0", data: { url: url, id: id } },
+              });
+            }
+          }
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改";
+        });
+      },
+      /** 提交按钮 */
+      submitForm: function () {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id !== undefined) {
+              updateRefundInfo(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addRefundInfo(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除数据项?').then(function () {
+          return delRefundInfo(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => { });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        // 处理查询参数
+        let params = { ...this.queryParams };
+        params.pageNo = undefined;
+        params.pageSize = undefined;
+        // 执行导出
+        this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+          this.exportLoading = true;
+          return exportRefundInfo(params);
+        }).then(response => {
+          this.$download.excel(response, '回款信息.xls');
+          this.exportLoading = false;
+        }).catch(() => { });
+      }
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .widget-wrapper>.widget-list {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  
+  .x-grid-col-6 {
+    width: 50%;
+  }
+  
+  .x-grid-col-12 {
+    width: 100%;
+  }
+  
+  .fx-field {
+    line-height: 20px;
+    padding: 7px 12px 12px;
+    position: relative;
+  }
+  
+  .fx-field .field-label {
+    word-wrap: break-word;
+    color: #141e31;
+    display: flex;
+    font-weight: 600;
+    line-height: 20px;
+    padding: 5px 0;
+    position: relative;
+    word-break: break-word;
+  }
+  
+  .fx-field .field-label .field-required {
+    color: #eb5050;
+    margin-left: -6px;
+    position: relative;
+  }
+  
+  .fx-field .field-label .field-name {
+    overflow: hidden;
+  }
+  
+  .field-component {
+    word-wrap: break-word;
+    background: #f5f6f8;
+    border-radius: 2px;
+    color: #141e31;
+    font-size: 14px;
+    line-height: 20px;
+    min-height: 32px;
+    padding: 6px 8px;
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+  
+  ul {
+    padding-left: 0px !important;
+  }
+  
+  .el-tag+.el-tag {
+    margin-left: 10px;
+  }
+  </style>

+ 4 - 4
src/views/finance/expense/info/index.vue

@@ -49,11 +49,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['relations:turnover:create']">新增</el-button>
+          v-hasPermi="['expense:info:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-          v-hasPermi="['relations:turnover:export']">导出</el-button>
+          v-hasPermi="['expense:info:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -80,9 +80,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['relations:turnover:update']">修改</el-button>
+            v-hasPermi="['expense:info:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['relations:turnover:delete']">删除</el-button>
+            v-hasPermi="['expense:info:delete']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
         </template>
       </el-table-column>

+ 4 - 4
src/views/finance/expense/type/data.vue

@@ -18,11 +18,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:dict:create']">新增</el-button>
+                   v-hasPermi="['expense:type:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:dict:export']">导出</el-button>
+                   v-hasPermi="['expense:type:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -39,9 +39,9 @@
       <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)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
+                     v-hasPermi="['expense:type:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
+                     v-hasPermi="['expense:type:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 4 - 4
src/views/finance/expense/type/index.vue

@@ -17,11 +17,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:dict:create']">新增</el-button>
+                   v-hasPermi="['expense:type:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:dict:export']">导出</el-button>
+                   v-hasPermi="['expense:type:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -43,9 +43,9 @@
       <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)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
+                     v-hasPermi="['expense:type:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
+                     v-hasPermi="['expense:type:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 1 - 1
src/views/login.vue

@@ -139,7 +139,7 @@ export default {
               //     }
               //   });
               // }
-              removeTenantId()
+                removeTenantId()
                 getTenantIdByName(value).then(res => {
                   const tenantId = res.data;
                   if (tenantId && tenantId >= 0) {

+ 11 - 6
src/views/meeting/reserveList/index.vue

@@ -28,11 +28,13 @@
 
     <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>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" 
+        v-hasPermi="['meeting:reserveList:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading">导出</el-button>
-        </el-col>
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+        v-hasPermi="['meeting:reserveList:export']">导出</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -52,9 +54,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template v-slot="scope">
-          <el-button v-if="scope.row.statusDesc=='未开始'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-          <el-button v-if="scope.row.statusDesc=='未开始'" size="mini" type="text" icon="el-icon-cancel" @click="handleCancel(scope.row)">取消</el-button>
-          <el-button v-if="scope.row.statusDesc=='进行中'" size="mini" type="text" icon="el-icon-detail" @click="handleEnd(scope.row)">结束</el-button>
+          <el-button v-if="scope.row.statusDesc=='未开始'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          v-hasPermi="['meeting:reserveList:update']">修改</el-button>
+          <el-button v-if="scope.row.statusDesc=='未开始'" size="mini" type="text" icon="el-icon-cancel" @click="handleCancel(scope.row)"
+          v-hasPermi="['meeting:reserveList:cancel']">取消</el-button>
+          <el-button v-if="scope.row.statusDesc=='进行中'" size="mini" type="text" icon="el-icon-detail" @click="handleEnd(scope.row)"
+          v-hasPermi="['meeting:reserveList:end']">结束</el-button>
           <el-button size="mini" type="text" @click="handleDetail(scope.row)">详情</el-button>
         </template>
       </el-table-column>

+ 8 - 3
src/views/oa/business/edit.vue

@@ -30,10 +30,10 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="出差天数">
-        <el-input v-model="form.day" placeholder='出差天数' onblur="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
+        <el-input v-model="form.day" placeholder='出差天数' oninput="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
       </el-form-item>
       <el-form-item label="预估费用(元)" prop="estimatedCost">
-        <el-input v-model="form.estimatedCost" placeholder='预估费用' onblur="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+        <el-input v-model="form.estimatedCost" placeholder='预估费用' oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
       </el-form-item>
       <el-form-item label="出差事由" prop="reason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"
@@ -181,7 +181,12 @@ export default {
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
         estimatedCost: [
-          { required: true, message: "请填写预估费用", trigger: "blur" }
+        { required: true, message: '请输入金额', trigger: 'blur' },
+            {
+                pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/,
+                message: "请输入合法的金额数字,最多两位小数",
+                trigger: "blur"
+            }
         ],
         reason: [
           { required: true, message: "请填写出差事由", trigger: "blur" }

+ 1 - 1
src/views/oa/leave/edit.vue

@@ -50,7 +50,7 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item label="请假天数">
-        <el-input v-model="form.day" placeholder='请假天数' onblur="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
+        <el-input v-model="form.day" placeholder='请假天数' oninput="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
       </el-form-item>
       <el-form-item label="请假原因" prop="reason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"

+ 8 - 3
src/views/personnel/attendance/business/index.vue

@@ -156,13 +156,13 @@
 
           <el-col :span="24">
             <el-form-item label="出差天数">
-              <el-input v-model="form.day" placeholder='出差天数' onblur="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
+              <el-input v-model="form.day" placeholder='出差天数' oninput="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="预估费用" prop="estimatedCost">
               <el-input v-model="form.estimatedCost" placeholder='预估费用(元)'
-                onblur="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+              oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -385,7 +385,12 @@ export default {
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
         estimatedCost: [
-          { required: true, message: "请填写预估费用", trigger: "blur" }
+        { required: true, message: '请输入金额', trigger: 'blur' },
+            {
+                pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/,
+                message: "请输入合法的金额数字,最多两位小数",
+                trigger: "blur"
+            }
         ],
         reason: [
           { required: true, message: "请填写出差事由", trigger: "blur" }

+ 1 - 1
src/views/personnel/attendance/leave/index.vue

@@ -167,7 +167,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="请假天数">
-              <el-input v-model="form.day" placeholder='请假天数' onblur="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
+              <el-input v-model="form.day" placeholder='请假天数' oninput="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

+ 5 - 5
src/views/stamp/list/index.vue

@@ -50,11 +50,11 @@
     <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="['stamp:list:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-          <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                     >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['stamp:list:export']">导出</el-button>
         </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -84,9 +84,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            >修改</el-button>
+          v-hasPermi="['stamp:list:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            >删除</el-button>
+          v-hasPermi="['stamp:list:delete']">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)"
            >详情</el-button>
         </template>