ysy 1 rok temu
rodzic
commit
468a3f11af

+ 13 - 0
src/views/inspectionClassify/components/qualityItem.vue

@@ -42,6 +42,11 @@
         <template v-slot:type="{ row }">
           {{ getDictValue('质检标准类型', row.type) }}
         </template>
+
+
+        <template v-slot:toolList="{ row }">
+             <div style="display: inline-block;" v-for="(item,idx) in row.toolList" :key="idx">{{ item.name }}  <span v-if="row.toolList && idx != row.toolList.length - 1">, </span></div>
+        </template>
       </ele-pro-table>
     </el-card>
 
@@ -139,6 +144,14 @@
             minWidth: 110
           },
 
+          {
+            prop: 'toolList',
+            slot: 'toolList',
+            label: '设备名称',
+            align: 'center',
+            minWidth: 150
+          },
+
           {
             label: '状态',
             prop: 'status',

+ 13 - 0
src/views/inspectionClassify/components/user-list.vue

@@ -47,6 +47,11 @@
         {{ getDictValue('质检标准类型', row.itemVO.type) }}
       </template>
 
+
+      <template v-slot:toolList="{ row }">
+             <div style="display: inline-block;" v-for="(item,idx) in row.itemVO.toolList" :key="idx">{{ item.name }}  <span v-if="row.itemVO.toolList && idx != row.itemVO.toolList.length - 1">, </span></div>
+        </template>
+
       <template v-slot:action="{ row }">
         <el-popconfirm
           class="ele-action"
@@ -165,6 +170,14 @@
             }
           },
 
+          {
+            prop: 'itemVO.toolList',
+            slot: 'toolList',
+            label: '设备名称',
+            align: 'center',
+            minWidth: 150
+          },
+
           {
             label: '备注',
             prop: 'inspectionRemark'

+ 2 - 2
src/views/inspectionProject/index.vue

@@ -59,7 +59,7 @@
 
 
         <template v-slot:toolList="{ row }">
-             55
+             <div style="display: inline-block;" v-for="(item,idx) in row.toolList" :key="idx">{{ item.name }}  <span v-if="row.toolList && idx != row.toolList.length - 1">, </span></div>
         </template>
 
 
@@ -195,7 +195,7 @@ import dictMixins from '@/mixins/dictMixins'
             slot: 'toolList',
             label: '设备名称',
             align: 'center',
-            minWidth: 110
+            minWidth: 150
           },
 
           {