yujialong 11 months ago
parent b05dd94c89
commit 32dec5cf8f
  1. 9
      src/views/Home.vue
  2. 4
      src/views/Transaction.vue

@ -56,11 +56,10 @@
<el-table-column label="实验要求" <el-table-column label="实验要求"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<quill :border="true" <div class="ql-snow">
:readonly="true" <div class="ql-editor"
v-model="scope.row.experimentalRequirements" v-html="scope.row.experimentalRequirements"></div>
:minHeight="150" </div>
:height="150" />
</template> </template>
</el-table-column> </el-table-column>

@ -335,12 +335,10 @@
<el-input class="number-input" <el-input class="number-input"
v-model.trim="scope.row.value3" v-model.trim="scope.row.value3"
:disabled="isView || scope.row.isDisabled" :disabled="isView || scope.row.isDisabled"
type="number"
size="mini"></el-input> size="mini"></el-input>
<el-input class="number-input" <el-input class="number-input"
v-model.trim="scope.row.value4" v-model.trim="scope.row.value4"
:disabled="isView || scope.row.isDisabled" :disabled="isView || scope.row.isDisabled"
type="number"
size="mini"></el-input> size="mini"></el-input>
<el-select :disabled="isView || scope.row.isDisabled" <el-select :disabled="isView || scope.row.isDisabled"
v-model="scope.row.value5" v-model="scope.row.value5"
@ -1220,7 +1218,7 @@ export default {
} else if ((!row.value3 || !row.value4) && !this.isSt) { } else if ((!row.value3 || !row.value4) && !this.isSt) {
this.$message.warning(`请输入交易指标区间`); this.$message.warning(`请输入交易指标区间`);
return; return;
} else if (row.value3 && row.value4 && +row.value3 > +row.value4) { } else if (row.value3 && row.value4 && !isNaN(row.value3) && !isNaN(row.value4) && +row.value3 > +row.value4) {
this.$message.warning(`第一个指标必须小于第二个指标`); this.$message.warning(`第一个指标必须小于第二个指标`);
return; return;
} }

Loading…
Cancel
Save