Просмотр исходного кода

Merge branch 'redUrgent' into allTestUrgent

qymljy 7 месяцев назад
Родитель
Сommit
2da67df8d4

+ 1 - 1
src/HDrpManagement/productInspectionMag/modules/edit.vue

@@ -109,7 +109,7 @@ export default {
     onShow(){
       this.dialogFormVisible = true
       this.mediumList()
-      this.form.medium = this.data.medium.split(',')
+      this.form.medium = this.data.medium?this.data.medium.split(','):[]
       this.form.temperature = this.data.temperature
     },
     onSave(){

+ 1 - 1
src/components/confirmBtn/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="open">{{btn_title}}</el-button>
+    <el-button type="primary" size="mini" @click="open">{{$t(btn_title)}}</el-button>
   </div>
 </template>