20221104

src/views/expense/expenseList.vue

@@ -50,14 +50,20 @@
             style="margin:1px 5px;"
             @click="selectexpend()"
           >查询</el-button>
-          <el-button type="info" icon="el-icon-refresh" @click="upddlist()">重置</el-button>
+          <el-button type="info" icon="el-icon-refresh" @click="upddlist()">刷新</el-button>
           <el-button type="success" icon="el-icon-download" @click="Reimbursement()">添加发票单</el-button>
         </el-col>
       </el-row>
     </div>
     <!-- 表格区域 -->
     <div class="drawer" v-show="isgetid==0" style="margin-left:15px">
-      <el-table :data="invoicegetList.list" border style="width:99%">
+      <el-table
+        :data="invoicegetList.list"
+        border
+        style="width:99%"
+        :cell-style="{'text-align':'center'}"
+        :header-cell-style="{'text-align':'center'}"
+      >
         <el-table-column label="序号" width="50" style>
           <template slot-scope="scope">
             {{
@@ -67,8 +73,8 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="number" label="发票号码" width="width"></el-table-column>
         <el-table-column prop="code" label="发票代码"></el-table-column>
+        <el-table-column prop="number" label="发票号码" width="width"></el-table-column>
         <el-table-column prop="time" label="发票时间"></el-table-column>
         <el-table-column prop="category" label="发票类型">
           <template slot-scope="scope">
@@ -138,11 +144,11 @@
             label-width="80px"
             class="demo-ruleForm"
           >
-            <el-form-item label="发票号码" prop="number">
-              <el-input v-model="addTO.number" oninput="value=value.replace(/^\.+|[^\d.]/g,'')"></el-input>
-            </el-form-item>
             <el-form-item label="发票代码" prop="code">
-              <el-input v-model="addTO.code"></el-input>
+              <el-input v-model="addTO.code" maxlength="12" onkeyup="this.value=this.value.replace(/\D|^0/g,'')"></el-input>
+            </el-form-item>
+            <el-form-item label="发票号码" prop="number">
+              <el-input v-model="addTO.number" maxlength="8" onkeyup="this.value=this.value.replace(/\D|^0/g,'')"></el-input>
             </el-form-item>
             <el-form-item label="发票时间" required prop="time">
               <el-date-picker
@@ -201,7 +207,7 @@
               type="primary"
               style="margin-left:20px;margin-top:40px;"
             >选取文件</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传jpg/png/pdf文件</div>
+            <div slot="tip" class="el-upload__tip">只能上传jpg/png/pdf文件，且不超过500kb</div>
           </el-upload>
         </el-col>
       </el-row>
@@ -311,7 +317,14 @@ export default {
             trigger: "change"
           }
         ],
-        mone: [{ required: true, message: "请输入发票金额", trigger: "change" }]
+        mone: [
+          { required: true, message: "请输入发票金额", trigger: "change" },
+          {
+            pattern: /(^([-]?)[1-9]([0-9]+)?(\.[0-9]{1,6})?$)|(^([-]?)(0){1}$)|(^([-]?)[0-9]\.[0-9]([0-9])?$)/,
+            message: "输入发票金额不合法",
+            trigger: "change"
+          }
+        ]
       },
       //查询发票数据
       invoiceList: {

src/views/project/income/incomeAdd.vue

@@ -125,7 +125,7 @@ import {
 } from "@/api/project";
 import { selectAll } from "@/api/type";
 import { insert } from "@/api/imcome";
-import { money } from "@/utils/myValidate";
+
 export default {
   data() {
     return {
@@ -163,7 +163,12 @@ export default {
           { required: true, message: "没有输入收入详情", trigger: "change" }
         ],
         incomeMoney: [
-          { required: true, validator: money, trigger: "blur" }
+          { required: true, message: "请输入收入金额", trigger: "blur" },
+          {
+            pattern: /(^([-]?)[1-9]([0-9]+)?(\.[0-9]{1,6})?$)|(^([-]?)(0){1}$)|(^([-]?)[0-9]\.[0-9]([0-9])?$)/,
+            message: "输入收入金额不合法",
+            trigger: "change"
+          }
         ],
         incomeTime: [
           { required: true, message: "请选择收到时间", trigger: "change" }