Merge remote-tracking branch 'origin/master'

src/views/program/annual/form.vue

@@ -70,10 +70,10 @@
                             <el-date-picker class="block" v-model="row.predictSignDate" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"/>
                         </template>
                         <template #predictContractMoney="{row,index}">
-                            <el-input v-model="row.predictContractMoney"/>
+                            <el-input v-model="row.predictContractMoney" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #predictAnnualReturned="{row,index}">
-                            <el-input v-model="row.predictAnnualReturned"/>
+                            <el-input v-model="row.predictAnnualReturned" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #action="{row,index}">
                             <el-button size="small" type="primary" @click="addRow">
@@ -100,40 +100,40 @@
                             </el-select>
                         </template>
                         <template #january="{row,index}">
-                            <el-input v-model="row.january"/>
+                            <el-input v-model="row.january"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #february="{row,index}">
-                            <el-input v-model="row.february"/>
+                            <el-input v-model="row.february"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #march="{row,index}">
-                            <el-input v-model="row.march"/>
+                            <el-input v-model="row.march"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #april="{row,index}">
-                            <el-input v-model="row.april"/>
+                            <el-input v-model="row.april"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #may="{row,index}">
-                            <el-input v-model="row.may"/>
+                            <el-input v-model="row.may"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #june="{row,index}">
-                            <el-input v-model="row.june"/>
+                            <el-input v-model="row.june"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #july="{row,index}">
-                            <el-input v-model="row.july"/>
+                            <el-input v-model="row.july"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #august="{row,index}">
-                            <el-input v-model="row.august"/>
+                            <el-input v-model="row.august"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #september="{row,index}">
-                            <el-input v-model="row.september"/>
+                            <el-input v-model="row.september"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #october="{row,index}">
-                            <el-input v-model="row.october"/>
+                            <el-input v-model="row.october"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #november="{row,index}">
-                            <el-input v-model="row.november"/>
+                            <el-input v-model="row.november"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #december="{row,index}">
-                            <el-input v-model="row.december"/>
+                            <el-input v-model="row.december"  onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                         </template>
                         <template #action="{row,index}">
                             <el-button size="small" type="primary" @click="addRow1">

src/views/system/components/tab-price.vue

@@ -19,8 +19,8 @@
                     <el-input v-model="formposition.dictName"/>
                 </el-form-item>
                 <el-form-item label="日单价:">
-                    <!-- <el-input v-model="formposition.dictValue" oninput="value=value.replace(/[^\d]/g,'')"/> -->
-                    <el-input-number v-model="formposition.dictValue" :precision="2" controls-position="right" style="width: 100%;"/>
+                    <el-input v-model="formposition.dictValue" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
+                    <!-- <el-input-number v-model="formposition.dictValue" :precision="2" controls-position="right" style="width: 100%;"/> -->
                 </el-form-item>
             </el-form>
         </HcDialog>