|
|
@@ -239,7 +239,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="单价：" prop="uprice">
|
|
|
- <el-input ref="uprice" v-model="create.temp.uprice" v-limit class="filter-item" placeholder="最多俩位小数" type="number" step="0.01" style="width: 100%;" />
|
|
|
+ <el-input ref="uprice" v-model="create.temp.uprice" class="filter-item" placeholder="最多俩位小数" type="number" step="0.01" style="width: 100%;" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -619,7 +619,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="干物质（DM%）：" prop="dry">
|
|
|
- <el-input ref="dry" v-model="nutritive.temp.dry" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入干物质" type="number" step="0.01" />
|
|
|
+ <el-input ref="dry" v-model="nutritive.temp.dry" :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入干物质" type="number" step="0.01" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -776,6 +776,7 @@ export default {
|
|
|
dialogStatus: '',
|
|
|
temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '' },
|
|
|
rules: {
|
|
|
+ printgroupid :[{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
|
|
|
@@ -989,7 +990,8 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
- const uprice = /^\d+(\.\d{1,2})?$/
|
|
|
+ // const uprice = /^\d+(\.\d{1,2})?$/
|
|
|
+ const uprice = /^(\d+|\d+\.\d{1,2})$/
|
|
|
if (this.create.temp.uprice !== '') {
|
|
|
if (!uprice.test(parseFloat(this.create.temp.uprice))) {
|
|
|
this.$message({ type: 'error', message: '单价请保留两位小数', duration: 2000 })
|
|
|
@@ -1086,7 +1088,8 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
- const uprice = /^\d+(\.\d{1,2})?$/
|
|
|
+ // const uprice = /^\d+(\.\d{1,2})?$/
|
|
|
+ const uprice = /^(\d+|\d+\.\d{1,2})$/
|
|
|
if (this.create.temp.uprice !== '') {
|
|
|
if (!uprice.test(parseFloat(this.create.temp.uprice))) {
|
|
|
this.$message({ type: 'error', message: '单价请保留两位小数', duration: 2000 })
|
