666

src/views/material/BOMmanage/qualityTesting/inspectionClassify/index.vue

@@ -32,7 +32,7 @@
               ref="table"
               :columns="columns"
               :datasource="datasource"
-              height="calc(100vh - 365px)"
+              height="calc(100vh - 405px)"
               full-height="calc(100vh - 116px)"
               tool-class="ele-toolbar-form"
               cache-key="inspectionClassify"
@@ -275,6 +275,7 @@
       },
 
       handleClose() {
+        this.$refs.table &&  this.$refs.table.clearSelection();
         this.visible = false;
       },
 
@@ -286,6 +287,7 @@
           };
         });
         this.$emit('selectChange', _arr);
+        this.handleClose()
       }
     }
   };

src/views/material/BOMmanage/qualityTesting/term.vue

@@ -7,8 +7,59 @@
       >新增</el-button
     >
 
-
-    <termPop ref="termRef"></termPop>
+   
+
+    <ele-pro-table
+              ref="table"
+              :columns="columns"
+              :datasource="list"
+              height="calc(100vh - 605px)"
+              tool-class="ele-toolbar-form"
+              cache-key="inspectionClassify"
+              row-key="id"
+              :selection.sync="selection"
+            >
+              <!-- 表头工具栏 -->
+
+              <template v-slot:textType="{ row }">
+                {{
+                  row.itemVO.textType == 1
+                    ? '数值'
+                    : row.itemVO.textType == 2
+                    ? '选择'
+                    : row.itemVO.textType == 3
+                    ? '上下限'
+                    : row.itemVO.textType == 4
+                    ? '规格'
+                    : row.itemVO.textType == 5
+                    ? '时间'
+                    : row.itemVO.textType == 6
+                    ? '范围'
+                    : ''
+                }}
+              </template>
+
+              <template v-slot:type="{ row }">
+                {{
+                  getDictValue('质检标准类型', row.itemVO.qualityStandardType)
+                }}
+              </template>
+
+              <template v-slot:defaultValue="{ row }">
+                <div>
+                  <span v-if="row.itemVO.textType == 3">
+                    [ {{ row.itemVO.minValue }}-{{ row.itemVO.maxValue }}]
+                  </span>
+                  <span v-else>{{ row.itemVO.defaultValue }}</span>
+
+                  <span> {{ row.itemVO.unit }}</span>
+                </div>
+              </template>
+
+            </ele-pro-table>
+
+
+    <termPop ref="termRef" @selectChange="selectChange"></termPop>
   </div>
 </template>
 
@@ -40,7 +91,77 @@
     data() {
       return {
         list: [],
-        dictList: []
+        dictList: [],
+
+
+        columns: [
+   
+
+          {
+            prop: 'itemVO.categoryLevelName',
+            label: '质检类型',
+            align: 'center',
+            minWidth: 110
+          },
+
+          {
+            prop: 'itemVO.inspectionCode',
+            label: '参数编码',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 110
+          },
+          {
+            prop: 'itemVO.inspectionName',
+            label: '参数名称',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 110
+          },
+
+          {
+            prop: 'itemVO.textType',
+            label: '参数类型',
+            showOverflowTooltip: true,
+            align: 'center',
+            slot: 'textType',
+            minWidth: 110
+          },
+
+          {
+            prop: 'itemVO.defaultValue',
+            slot: 'defaultValue',
+            label: '工艺参数',
+            align: 'center',
+            minWidth: 150
+          },
+
+          {
+            label: '工艺要求',
+            prop: 'itemVO.inspectionStandard',
+            formatter: (row, column, cellValue) => {
+              return (
+                row.itemVO.symbol + ' ' + cellValue + ' ' + row.itemVO.unit
+              );
+            },
+            minWidth: 150
+          },
+          {
+            label: '标准类型',
+            prop: 'itemVO.type',
+            slot: 'type'
+          },
+
+          {
+            prop: 'itemVO.qualityStandardName',
+            label: '标准名称',
+            align: 'center',
+            minWidth: 110
+          },
+
+ 
+     
+        ]
       };
     },
 
@@ -52,7 +173,7 @@
       });
 
       this.requestDict('质检标准类型');
-      this.getDictList('mathematical_symbol');
+      this.getDictList('mathematical_symbol'); // 数学字符
     },
 
     methods: {
@@ -92,8 +213,13 @@
         });
       },
 
+      getDate() {
+        return this.list;
+      },
 
-  
+      selectChange(list) {
+        this.list = list;
+      }
     }
   };
 </script>