图纸显示调整

src/views/modules/production/plan-submit.vue

@@ -41,13 +41,25 @@
         </el-table-column>
         <el-table-column header-align="center" align="center" label="图纸">
           <template slot-scope="scope">
-            <el-button :disabled="!scope.row.proDrawings || scope.row.proDrawings.length === 0" type="text" size="small"
-              @click="drawDetails(scope.row)">查看</el-button>
+            <el-button v-if="scope.row.drawings && scope.row.drawings.length" type="text" size="small"
+              @click="openImagePreview(scope.row.drawings)">
+              查看({{ scope.row.drawings.length }})
+            </el-button>
+            <el-button v-else type="text" size="small" disabled>
+              查看(0)
+            </el-button>
           </template>
         </el-table-column>
         <el-table-column header-align="center" align="center" min-width="100" :show-tooltip-when-overflow="true"
           label="简图">
           <template slot-scope="scope">
+            <div class="thumb-list" v-if="getImageList(scope.row.attachList2).length">
+              <img v-for="(img, idx) in getImageList(scope.row.attachList2)" :key="(img.url || '') + idx" class="thumb"
+                :src="downloadUrl + img.url" :alt="img.fileName" @click="previewFile(img.fileName, img.url)" />
+            </div>
+            <div v-else style="color: #909399;">暂无图片</div>
+          </template>
+          <!-- <template slot-scope="scope">
             <el-button v-if="scope.row.attachList2 && scope.row.attachList2.length" type="text" size="small"
               @click="openImagePreview(scope.row.attachList2)">
               查看({{ scope.row.attachList2.length }})
@@ -55,7 +67,7 @@
             <el-button v-else type="text" size="small" disabled>
               查看(0)
             </el-button>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="materials" header-align="center" align="center" min-width="140"
           :show-tooltip-when-overflow="true" label="材料">

src/views/modules/tech/product-management.vue

@@ -51,9 +51,18 @@
         </el-table-column>
         <el-table-column header-align="center" align="center" label="对应图纸">
           <template slot-scope="scope">
+            <el-button v-if="scope.row.drawings && scope.row.drawings.length" type="text" size="small"
+              @click="openImagePreview(scope.row.drawings)">
+              查看({{ scope.row.drawings.length }})
+            </el-button>
+            <el-button v-else type="text" size="small" disabled>
+              查看(0)
+            </el-button>
+          </template>
+          <!-- <template slot-scope="scope">
             <el-button :disabled="!scope.row.proDrawings || scope.row.proDrawings.length === 0" type="text" size="small"
               @click="drawDetails(scope.row)">查看</el-button>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="simplePic" header-align="center" align="center" min-width="120" label="简图">
           <template slot-scope="scope">
@@ -189,7 +198,7 @@
         <el-button size="small" type="success" @click="submitUpload">开始上传</el-button>
       </el-upload>
     </el-dialog>
-
+    <image-preview ref="imagePreview" />
   </div>
 </template>
 
@@ -207,9 +216,12 @@ import ChangeForm from './product-change'
 import { bomStateOption, writeStateOption, optionsCompose } from '@/utils/enums'
 import UploadComponent from '@/views/modules/common/upload-component-v2'
 import { downloadUrl } from '@/api/file'
+import ImagePreview from '@/views/modules/common/image-preview.vue'
+import ImageViewerMixin from '@/views/modules/common/mixins/image-viewer-mixin'
 
 export default {
   name: 'product-management',
+  mixins: [ImageViewerMixin],
   components: {
     AttachDetail,
     ProductDrawDetail,
@@ -218,7 +230,8 @@ export default {
     Detail,
     NoticeChangeSetting,
     ChangeForm,
-    UploadComponent
+    UploadComponent,
+    ImagePreview
   },
   data() {
     return {

src/views/modules/tech/project-product-detail.vue

@@ -54,20 +54,27 @@
         </el-table-column>
         <el-table-column header-align="center" align="center" label="图纸">
           <template slot-scope="scope">
+            <el-button v-if="scope.row.drawings && scope.row.drawings.length" type="text" size="small"
+              @click="openImagePreview(scope.row.drawings)">
+              查看({{ scope.row.drawings.length }})
+            </el-button>
+            <el-button v-else type="text" size="small" disabled>
+              查看(0)
+            </el-button>
+          </template>
+          <!-- <template slot-scope="scope">
             <el-button :disabled="!scope.row.proDrawings || scope.row.proDrawings.length === 0" type="text" size="small"
               @click="drawDetails(scope.row)">查看</el-button>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="attachList2" header-align="center" align="center" min-width="100"
           :show-tooltip-when-overflow="true" label="简图">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.attachList2 && scope.row.attachList2.length" type="text" size="small"
-              @click="openImagePreview(scope.row.attachList2)">
-              查看({{ scope.row.attachList2.length }})
-            </el-button>
-            <el-button v-else type="text" size="small" disabled>
-              查看(0)
-            </el-button>
+            <div class="thumb-list" v-if="getImageList(scope.row.attachList2).length">
+              <img v-for="(img, idx) in getImageList(scope.row.attachList2)" :key="(img.url || '') + idx" class="thumb"
+                :src="downloadUrl + img.url" :alt="img.fileName" @click="previewFile(img.fileName, img.url)" />
+            </div>
+            <div v-else style="color: #909399;">暂无图片</div>
           </template>
         </el-table-column>
         <el-table-column prop="productSpec" header-align="center" align="center" min-width="140"

src/views/modules/tech/project-tech-submit.vue

@@ -39,17 +39,30 @@
         <el-table-column prop="versionNumber" header-align="center" align="center" min-width="140"
           :show-tooltip-when-overflow="true" label="版本号">
         </el-table-column>
-        <el-table-column prop="attachList2" header-align="center" align="center" min-width="100"
-          :show-tooltip-when-overflow="true" label="简图">
+        <el-table-column header-align="center" align="center" label="图纸">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.attachList2 && scope.row.attachList2.length" type="text" size="small"
-              @click="openImagePreview(scope.row.attachList2)">
-              查看({{ scope.row.attachList2.length }})
+            <el-button v-if="scope.row.drawings && scope.row.drawings.length" type="text" size="small"
+              @click="openImagePreview(scope.row.drawings)">
+              查看({{ scope.row.drawings.length }})
             </el-button>
             <el-button v-else type="text" size="small" disabled>
               查看(0)
             </el-button>
           </template>
+          <!-- <template slot-scope="scope">
+            <el-button :disabled="!scope.row.proDrawings || scope.row.proDrawings.length === 0" type="text" size="small"
+              @click="drawDetails(scope.row)">查看</el-button>
+          </template> -->
+        </el-table-column>
+        <el-table-column prop="attachList2" header-align="center" align="center" min-width="100"
+          :show-tooltip-when-overflow="true" label="简图">
+          <template slot-scope="scope">
+            <div class="thumb-list" v-if="getImageList(scope.row.attachList2).length">
+              <img v-for="(img, idx) in getImageList(scope.row.attachList2)" :key="(img.url || '') + idx" class="thumb"
+                :src="downloadUrl + img.url" :alt="img.fileName" @click="previewFile(img.fileName, img.url)" />
+            </div>
+            <div v-else style="color: #909399;">暂无图片</div>
+          </template>
           <!-- <template slot-scope="scope">
             <div class="thumb-list" v-if="getImageList(scope.row.attachList2).length">
               <img v-for="(img, idx) in getImageList(scope.row.attachList2)" :key="(img.url || '') + idx" class="thumb"