ysy 1 год назад
Родитель
Сommit
6f77d94699
1 измененных файлов с 69 добавлено и 58 удалено
  1. 69 58
      src/views/material/BOMmanage/qualityTesting/term.vue

+ 69 - 58
src/views/material/BOMmanage/qualityTesting/term.vue

@@ -7,57 +7,74 @@
       >新增</el-button
       >新增</el-button
     >
     >
 
 
-   
-
     <ele-pro-table
     <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>
-
+      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 style="display: flex">
+          <div v-if="row.itemVO.textType == 3 "style="display: flex">
+
+            <el-input
+            style="width: 115px;"
+              v-model="row.itemVO.minValue"
+            ></el-input>
+
+            <el-input
+              style="width: 115px; margin-left: 10px;"
+              v-model="row.itemVO.maxValue"
+              ></el-input>
+         
+          </div>
+
+          <div v-else style="width: 240px">
+            <el-input
+              v-model="row.itemVO.defaultValue"
+              placeholder="请输入"
+            ></el-input>
+          </div>
+
+          <DictSelection
+            style="width: 80px; margin-left: 8px"
+            dictName="工艺参数单位"
+            clearable
+            filterable
+            v-model="row.itemVO.unit"
+          >
+          </DictSelection>
+        </div>
+      </template>
+    </ele-pro-table>
 
 
     <termPop ref="termRef" @selectChange="selectChange"></termPop>
     <termPop ref="termRef" @selectChange="selectChange"></termPop>
   </div>
   </div>
@@ -93,10 +110,7 @@
         list: [],
         list: [],
         dictList: [],
         dictList: [],
 
 
-
         columns: [
         columns: [
-   
-
           {
           {
             prop: 'itemVO.categoryLevelName',
             prop: 'itemVO.categoryLevelName',
             label: '质检类型',
             label: '质检类型',
@@ -133,7 +147,7 @@
             slot: 'defaultValue',
             slot: 'defaultValue',
             label: '工艺参数',
             label: '工艺参数',
             align: 'center',
             align: 'center',
-            minWidth: 150
+            minWidth: 240
           },
           },
 
 
           {
           {
@@ -157,10 +171,7 @@
             label: '标准名称',
             label: '标准名称',
             align: 'center',
             align: 'center',
             minWidth: 110
             minWidth: 110
-          },
-
- 
-     
+          }
         ]
         ]
       };
       };
     },
     },