yusheng 5 dni temu
rodzic
commit
8eacfdcd81

+ 7 - 6
src/views/inspectionWork/components/sampleListDialog.vue

@@ -168,16 +168,17 @@
               >
                 <template slot-scope="scope">
                   <el-select
+                    v-if="
+                      !['炉水电导率', '给水电导率'].includes(
+                        scope.row.inspectionName
+                      )
+                    "
                     v-model="scope.row.qualityResults"
                     placeholder="请选择"
                     style="width: 100%"
                     @change="qualityResultsListChange(tableData)"
                     :disabled="
-                      type == 'detail' ||
-                      (!pageName && props.row.correlationId) ||
-                      ['炉水电导率', '给水电导率'].includes(
-                        scope.row.inspectionName
-                      )
+                      type == 'detail' || (!pageName && props.row.correlationId)
                     "
                   >
                     <el-option
@@ -402,7 +403,7 @@
         let num1 = arr.find(
           (item) => item.inspectionName == '炉水电导率'
         )?.qualityResultContent;
-        console.log(num,num1)
+        console.log(num, num1);
 
         arr.forEach((item, i) => {
           if (num && num1 && item.inspectionName == '干度值') {

+ 4 - 2
src/views/inspectionWork/details.vue

@@ -351,8 +351,10 @@
                   </el-link>
                 </template>
                 <template v-slot:attachmentUrl="{ row, $index }">
-                  <fileMian type="view" v-model="row.attachmentUrl"> </fileMian>
-                </template> </ele-pro-table
+                  <fileMain type="view" v-model="row.attachmentUrl"> </fileMain>
+                </template> 
+                
+                </ele-pro-table
             ></el-tab-pane>
             <el-tab-pane label="检测方案" name="3">
               <ele-pro-table

+ 2 - 1
src/views/inspectionWork/mixins/detailMixins.js

@@ -884,7 +884,8 @@ export default {
         },
         {
           label: '图片',
-          prop: 'imgUrl',
+          prop: 'attachmentUrl',
+          slot: 'attachmentUrl',
           align: 'center',
           width: '150',
           showOverflowTooltip: true