Эх сурвалжийг харах

工艺详情:增加返回参数,前端显示优化
显示:物料名称、规格、图号、材质、热处理、表面处理

chris 1 жил өмнө
parent
commit
bd277f229e

+ 2 - 1
src/views/modules/common/material-component.vue

@@ -132,7 +132,8 @@
         if (item === 'undefined') {
           this.value = null
         }
-        this.$emit('materialSelected', this.options.find(item1 => item1.value === item))
+        let selectedItem = this.options.find(item1 => item1.value === item)
+        this.$emit('materialSelected', selectedItem)
       },
       cancelReadOnly (onOff) {
         this.$nextTick(() => {

+ 3 - 1
src/views/modules/common/material-type-component.vue

@@ -27,6 +27,7 @@
     },
     watch: {
       typeId (value) {
+        console.log(JSON.stringify(value))
         this.value = value
       }
     },
@@ -53,7 +54,8 @@
           params: this.$http.adornParams({
             'current': this.current,
             'size': this.size,
-            'materialName': this.name
+            'materialName': this.name,
+            'typeId': this.typeId
           })
         }).then(({data}) => {
           if (data && data.code === '200') {

+ 6 - 0
src/views/modules/tech/crafts-detail-dialog.vue

@@ -33,8 +33,14 @@
       <e-desc title="基本信息" column="3">
         <e-desc-item label="工艺名称">{{ dataForm.techName }}</e-desc-item>
         <e-desc-item label="工艺版本">{{ dataForm.techVersion }}</e-desc-item>
+        <e-desc-item label="材质">{{ dataForm.materials }}</e-desc-item>
+
         <e-desc-item label="物料">{{ dataForm.productName }}</e-desc-item>
+        <e-desc-item label="物料规格">{{ dataForm.productSpec }}</e-desc-item>
+        <e-desc-item label="图号">{{ dataForm.mapNumber }}</e-desc-item>
 
+        <e-desc-item label="热处理" span="3">{{ dataForm.heatTreatment }}</e-desc-item>
+        <e-desc-item label="表面处理" span="3">{{ dataForm.surfaceTreatment }}</e-desc-item>
         <e-desc-item label="备注" span="3">{{ dataForm.notes }}</e-desc-item>
       </e-desc>
       <e-desc title="附件">

+ 6 - 0
src/views/modules/tech/crafts-detail.vue

@@ -33,8 +33,14 @@
       <e-desc title="基本信息" column="3">
         <e-desc-item label="工艺名称">{{ dataForm.techName }}</e-desc-item>
         <e-desc-item label="工艺版本">{{ dataForm.techVersion }}</e-desc-item>
+        <e-desc-item label="材质">{{ dataForm.materials }}</e-desc-item>
+
         <e-desc-item label="物料">{{ dataForm.productName }}</e-desc-item>
+        <e-desc-item label="物料规格">{{ dataForm.productSpec }}</e-desc-item>
+        <e-desc-item label="图号">{{ dataForm.mapNumber }}</e-desc-item>
 
+        <e-desc-item label="热处理" span="3">{{ dataForm.heatTreatment }}</e-desc-item>
+        <e-desc-item label="表面处理" span="3">{{ dataForm.surfaceTreatment }}</e-desc-item>
         <e-desc-item label="备注" span="3">{{ dataForm.notes }}</e-desc-item>
       </e-desc>
       <e-desc title="附件">