Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yf
2021-06-22 16:37:33 +08:00
2 changed files with 6 additions and 4 deletions
@@ -44,7 +44,8 @@
<el-date-picker <el-date-picker
v-model="form.standYear" v-model="form.standYear"
type="year" type="year"
placeholder="请选择标准年份"> placeholder="请选择标准年份"
value-format="yyyy">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
@@ -781,8 +782,8 @@
}, { }, {
_this: this _this: this
}, res => { }, res => {
console.log(res); if (res.success) {
if (res.ok) { this.$message.success(res.message)
} }
}) })
} }
@@ -46,7 +46,8 @@
disabled disabled
v-model="form.standYear" v-model="form.standYear"
type="year" type="year"
placeholder="请选择标准年份"> placeholder="请选择标准年份"
value-format="yyyy">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">