codeMan 1 год назад
Родитель
Сommit
df20a509e8

+ 5 - 3
src/optionSystem/itemManage/detail/index.vue

@@ -136,14 +136,14 @@ export default {
             { label: "名称", value: this.mainData.itemname },
             { label: "阀门类型", value: this.mainData.valvetype },
             { label: "公称通径", value: this.mainData.caliber },
-            { label: "公称压力", value: this.mainData.pressure },
+            { label: "公称压力", value: this.mainData.nominalpressure.join(',') },
             { label: "连接方式", value: this.mainData.connection },
             { label: "阀体材质", value: this.mainData.bodymaterial },
             { label: "蝶板材质", value: this.mainData.valveplatematerial },
             { label: "阀杆材质", value: this.mainData.stemmaterial },
             { label: "阀座材质", value: this.mainData.plinthmaterial },
             { label: "阀门扭矩", value: this.mainData.torque },
-            { label: "驱动方式", value: this.mainData.drivetype },
+            { label: "驱动方式", value: this.mainData.drivetype.join(',') },
             { label: "法兰号", value: this.mainData.flh },
             { label: "阀杆尺寸", value: this.mainData.stemsize },
             { label: "圆阀杆最大直径", value: this.mainData.maxrounddiameter },
@@ -183,8 +183,10 @@ export default {
   },
   created() {
     this.optionList()
-    this.queryMainData(this.$route.query.id)
   },
+  mounted () {
+    this.queryMainData(this.$route.query.id)
+  }
 };
 </script>
 

+ 6 - 0
src/optionSystem/itemManage/index.vue

@@ -87,6 +87,12 @@
       <div v-else-if="scope.data.column.columnname === 'marketprice'">
         {{ tool.formatAmount(scope.data.column.data.marketprice, 2) }}
       </div>
+      <div v-else-if="scope.data.column.columnname === 'nominalpressure'">
+        {{ scope.data.column.data.nominalpressure.join(',') }}
+      </div>
+      <div v-else-if="scope.data.column.columnname === 'drivetype'">
+        {{ scope.data.column.data.drivetype.join(',') }}
+      </div>
       <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
     </template>
     <!-- <template v-slot:tbOpreation="scope">

+ 5 - 2
src/optionSystem/itemManage/modules/edit.vue

@@ -32,7 +32,8 @@ export default {
     return {
       drawer:false,
       type:'',
-      valvetype:''
+      valvetype:'',
+      cacheFun:''
     }
   },
   computed:{
@@ -57,7 +58,9 @@ export default {
     onShow () {
       this.drawer = true
       this.$nextTick(() => {
-        this.$refs.form.getFormLayoutData(this.type)
+        setTimeout(() => {
+          this.$refs.form.getFormLayoutData(this.type)
+        },500)
         this.$refs.form.form = JSON.parse(JSON.stringify(this.data))
       })
     },