sunlupeng 1 سال پیش
والد
کامیت
5a629984e7
4فایلهای تغییر یافته به همراه17 افزوده شده و 17 حذف شده
  1. 1 1
      src/views/oa/business/DataList.vue
  2. 2 2
      src/views/oa/business/detail.vue
  3. 13 13
      src/views/oa/business/edit.vue
  4. 1 1
      src/views/oa/leave/edit.vue

+ 1 - 1
src/views/oa/business/DataList.vue

@@ -73,7 +73,7 @@
       <el-table-column label="开始日期" align="center" prop="startDate" min-width="100" />
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
       <el-table-column label="出差天数" align="center" prop="day" min-width="100" />
-      <el-table-column label="预估费用" align="center" prop="purchaseMoney" min-width="100" />
+      <el-table-column label="预估费用" align="center" prop="estimatedCost" min-width="100" />
       <el-table-column label="申请人" align="center" prop="applyEmployeeName" min-width="80" />
       <el-table-column label="申请时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">

+ 2 - 2
src/views/oa/business/detail.vue

@@ -75,7 +75,7 @@
           <div class="field-name">预估费用(元)</div>
         </div>
         <div class="field-component">
-          <span :title="form.purchaseMoney">{{ form.purchaseMoney }}</span>
+          <span :title="form.estimatedCost">{{ form.estimatedCost }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -84,7 +84,7 @@
           <div class="field-name">出差事由</div>
         </div>
         <div class="field-component">
-          <span :title="form.purpose">{{ form.purpose }}</span>
+          <span :title="form.reason">{{ form.reason }}</span>
         </div>
       </div>
 

+ 13 - 13
src/views/oa/business/edit.vue

@@ -30,13 +30,13 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="出差天数">
-        <el-input v-model="form.day" placeholder='出差天数' @input="changeDay()"></el-input>
+        <el-input type="number" v-model="form.day" placeholder='出差天数' @input="changeDay()"></el-input>
       </el-form-item>
-      <el-form-item label="预估费用(元)" prop="purchaseMoney">
-        <el-input v-model="form.purchaseMoney" placeholder='预估费用' @input="changeMoney()"></el-input>
+      <el-form-item label="预估费用(元)" prop="estimatedCost">
+        <el-input type="number" v-model="form.estimatedCost" placeholder='预估费用' @input="changeMoney()"></el-input>
       </el-form-item>
-      <el-form-item label="出差事由" prop="purpose">
-        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.purpose"
+      <el-form-item label="出差事由" prop="reason">
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"
           placeholder='出差的主要目的或需要完成的任务'></el-input>
       </el-form-item>
       <el-form-item label="附件">
@@ -158,8 +158,8 @@ export default {
         startDate: undefined,
         endDate: undefined,
         day: undefined,
-        purchaseMoney: undefined,
-        purpose: undefined,
+        estimatedCost: undefined,
+        reason: undefined,
 
         fileIdList: undefined,
         remarks: undefined,
@@ -180,10 +180,10 @@ export default {
         endDate: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
-        purchaseMoney: [
+        estimatedCost: [
           { required: true, message: "请填写预估费用", trigger: "blur" }
         ],
-        purpose: [
+        reason: [
           { required: true, message: "请填写出差事由", trigger: "blur" }
         ],
         peopleList: [
@@ -218,8 +218,8 @@ export default {
   },
   methods: {
     changeMoney(){
-      let purchaseMoney = this.form.purchaseMoney;
-      this.form.purchaseMoney = this.NumberCheck(purchaseMoney,2);
+      let estimatedCost = this.form.estimatedCost;
+      this.form.estimatedCost = this.NumberCheck(estimatedCost,2);
     },
     changeDay(){
       let day = this.form.day;
@@ -252,11 +252,11 @@ export default {
       }
        //如果需要保留小数点后一位,则用下面公式
       if(type==1){
-        str = str.match(/^\d+(?:\.\d{0,1})?/)
+        str = str.replace(/\.\d\d$/,'')
       }
        //如果需要保留小数点后两位,则用下面公式
       if(type==2){
-        str = str.match(/^\d+(?:\.\d{0,2})?/)
+        str = str.replace(/\.\d\d\d$/,'')
       }
       return str;
     },

+ 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='请假天数' @input="changeDay()"></el-input>
+        <el-input type="number" v-model="form.day" placeholder='请假天数' @input="changeDay()"></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"