From 5b5b58e5665d891014dee5ccb3680a74607cc163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Tue, 22 Aug 2023 15:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/cert/supCertAddDialog.vue  | 112 +++++++++---------
 .../company/supCompanyAduditDialog.vue        |  32 ++---
 .../supManufacturerAuditDialog.vue            |  30 ++---
 .../supManufacturerEditDialog.vue             |  32 ++---
 .../product/supProductAuditDialog.vue         |  30 ++---
 .../purchase/product/supProductEditDialog.vue |  30 ++---
 src/views/supplier/company/basicCompany.vue   |  42 +++----
 7 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index 35a6494..67740c7 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -3,7 +3,7 @@
     <el-form :model="formData" :rules="formRules" ref="dataForm">
       <el-card style="margin-top: -30px">
         <el-button-group style="display: flex">
-          <el-button type="primary" @click.native="submitUpload" style="margin: 0 60px 10px auto; height: 35px"
+          <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
                      :loading="loading">提交
           </el-button>
         </el-button-group>
@@ -97,49 +97,41 @@
         <!--                    </el-col>-->
         <!--                </el-row>-->
 
-<!--        <el-row>-->
-<!--          <el-col :span="3">-->
-<!--            <div class="ao-text">-->
-<!--              <span>文件：</span>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item>-->
-<!--              <el-upload-->
-<!--                :disabled="formData.auditStatus == 1"-->
-<!--                class="upload-demo"-->
-<!--                ref="upload"-->
-<!--                :action="this.uploadUrl"-->
-<!--                :on-preview="uploadHandlePreview"-->
-<!--                :on-remove="uploadHandleRemove"-->
-<!--                :headers="headers"-->
-<!--                :on-exceed="uploadHandleExceed"-->
-<!--                accept=".jpg,.png"-->
-<!--                :on-change="uploadOnchange"-->
-<!--                :on-success="uploadHandleSuccess"-->
-<!--                :on-error="uploadHandleError"-->
-<!--                :file-list="fileList"-->
-<!--                :data="{type:'image2'}"-->
-<!--                :auto-upload="true">-->
-<!--                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
-<!--                  {{ choiceFile }}-->
-<!--                </el-button>-->
-<!--                <div>只能上传 jpg,png 文件，且不超过 3 MB</div>-->
-<!--              </el-upload>-->
-<!--              &lt;!&ndash;                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;-->
-<!--              &lt;!&ndash;                                       style="text-align:right"&ndash;&gt;-->
-<!--              &lt;!&ndash;                            >文件预览&ndash;&gt;-->
-<!--              &lt;!&ndash;                            </el-button&ndash;&gt;-->
-<!--              &lt;!&ndash;                            >&ndash;&gt;-->
-
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-        <el-row gutter="20" class="el-row" type="flex">
-          <el-col :span="11" class="el-col">
-            <el-form-item label="文件：" prop="filePath">
-              <cusEditor ref="editorRef" style="width:90vh;height: 100%;overflow: auto; " :content="formData.filePath"
-                         :type="`image2`"/>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>文件：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-upload
+                :disabled="formData.auditStatus == 1"
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jpg,.png"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :data="{type:'image2'}"
+                :auto-upload="true">
+                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
+                  {{ choiceFile }}
+                </el-button>
+                <div>只能上传 jpg,png 文件，且不超过 3 MB</div>
+              </el-upload>
+              <!--                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
+              <!--                                       style="text-align:right"-->
+              <!--                            >文件预览-->
+              <!--                            </el-button-->
+              <!--                            >-->
+
             </el-form-item>
           </el-col>
         </el-row>
@@ -208,8 +200,8 @@ export default {
     };
   },
   components: {
-    // draggable,
-    // ElImageViewer
+    draggable,
+    ElImageViewer
   },
   methods: {
     submitUpload() {
@@ -238,13 +230,23 @@ export default {
     onConfirmSubmit(val) {
       this.formData.repeatUpload = val;
       console.log(this.formData)
-      this.onSubmit();
-      // this.formData.repeatUpload = val;
-      // if (this.$isNotBlank(this.formData.filePath)) {
-      //     this.onSubmit();
-      //   }else {
-      //   this.$message.warning(`请选择文件`);
-      // }
+      if (this.$isNotBlank(this.formData.filePath)) {
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
+          this.onSubmit();
+        } else {
+          this.onSubmit();
+        }
+
+      } else {
+        console.log(this.$refs.upload.uploadFiles.length);
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
+        } else {
+          this.$message.warning(`请选择文件`);
+        }
+      }
+
     },
 
     onSubmit() {
@@ -260,10 +262,8 @@ export default {
         this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
         this.formData.productIdFk = this.inputQuery.productId;
       }
-      if (this.formData.auditStatus != 1){
+      if (this.formData.auditStatus != 1)
         this.formData.auditStatus = "6";
-        this.formData.filePath = this.$refs.editorRef.html
-      }
 
       if (this.editTye == 1) {
         insertCompanyCert(this.formData).then(response => {
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 21e8084..30fc2ae 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -162,7 +162,7 @@
           </el-table-column>
           <el-table-column label="备注" prop="remark"></el-table-column>
           <el-table-column label="确认说明" prop="auditComment" show-overflow-tooltip></el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" width="120">
             <template slot-scope="scope">
               <el-button v-if="editType==1 && auditType!=1" type="text" size="small"
                          @click.native="printSupCert(scope.row)">打印
@@ -544,21 +544,21 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      let newWindow = window.open();
-      newWindow.document.write(row.filePath)
-      // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      // this.imgList = [];
-      // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-      //   if (response.code === 20000) {
-      //     this.imgList = response.data;
-      //   }
-      // });
-      // this.imgViewer = true;
-      // const m = (e) => {
-      //   e.preventDefault()
-      // };
-      // document.body.style.overflow = 'hidden';
-      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // let newWindow = window.open();
+      // newWindow.document.write(row.filePath)
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+      });
+      this.imgViewer = true;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 68c4ada..9f22263 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -556,21 +556,21 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      let newWindow = window.open();
-      newWindow.document.write(row.filePath)
-        // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-        // this.imgList = [];
-        // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-        //   if (response.code === 20000) {
-        //     this.imgList=response.data;
-        //   }
-        // });
-        // this.imgViewerVisible = true;
-        // const m = (e) => {
-        //   e.preventDefault()
-        // };
-        // document.body.style.overflow = 'hidden';
-        // document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // let newWindow = window.open();
+      // newWindow.document.write(row.filePath)
+        this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+        this.imgList = [];
+        previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+          if (response.code === 20000) {
+            this.imgList=response.data;
+          }
+        });
+        this.imgViewerVisible = true;
+        const m = (e) => {
+          e.preventDefault()
+        };
+        document.body.style.overflow = 'hidden';
+        document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index 474c533..8b8e597 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -602,22 +602,22 @@ export default {
       return [
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
     },
-    showImgViewer(row) {supCertAudi
-      let newWindow = window.open();
-      newWindow.document.write(row.filePath)
-      // this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
-      // this.imgList = []
-      // previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
-      //   if (response.code === 20000) {
-      //     this.imgList = response.data
-      //   }
-      // })
-      // this.imgViewerVisible = true
-      // const m = (e) => {
-      //   e.preventDefault()
-      // }
-      // document.body.style.overflow = 'hidden'
-      // document.addEventListener('touchmove', m, false) // 禁止页面滑动
+    showImgViewer(row) {
+      // let newWindow = window.open();
+      // newWindow.document.write(row.filePath)
+      this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
+      this.imgList = []
+      previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data
+        }
+      })
+      this.imgViewerVisible = true
+      const m = (e) => {
+        e.preventDefault()
+      }
+      document.body.style.overflow = 'hidden'
+      document.addEventListener('touchmove', m, false) // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index a21743d..3d21831 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -579,21 +579,21 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      let newWindow = window.open();
-      newWindow.document.write(row.filePath)
-      // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      // this.imgList = [];
-      // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-      //   if (response.code === 20000) {
-      //     this.imgList = response.data;
-      //   }
-      // });
-      // this.imgViewer = true;
-      // const m = (e) => {
-      //   e.preventDefault()
-      // };
-      // document.body.style.overflow = 'hidden';
-      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // let newWindow = window.open();
+      // newWindow.document.write(row.filePath)
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+      });
+      this.imgViewer = true;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index 2982801..1946243 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -663,21 +663,21 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      let newWindow = window.open();
-      newWindow.document.write(row.filePath)
-      // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      // this.imgList = [];
-      // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-      //   if (response.code === 20000) {
-      //     this.imgList=response.data;
-      //   }
-      // });
-      // this.imgViewerVisible = true;
-      // const m = (e) => {
-      //   e.preventDefault()
-      // };
-      // document.body.style.overflow = 'hidden';
-      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // let newWindow = window.open();
+      // newWindow.document.write(row.filePath)
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+        if (response.code === 20000) {
+          this.imgList=response.data;
+        }
+      });
+      this.imgViewerVisible = true;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'hidden';
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
diff --git a/src/views/supplier/company/basicCompany.vue b/src/views/supplier/company/basicCompany.vue
index 2527cb8..16547ca 100644
--- a/src/views/supplier/company/basicCompany.vue
+++ b/src/views/supplier/company/basicCompany.vue
@@ -648,27 +648,27 @@ export default {
     },
 
     showImgViewer(row) {
-      let newWindow = window.open();
-      newWindow.document.write(row.filePath)
-      // this.certFileUrl =
-      //   this.BASE_URL +
-      //   "/udiwms/image/register/file/getImage?type=image2&name=";
-      // this.imgList = [];
-      // previewImage({
-      //   imageUrl: row.filePath,
-      //   certFileUrl: this.certFileUrl,
-      // }).then((response) => {
-      //   if (response.code === 20000) {
-      //     this.imgList = response.data;
-      //   }
-      //   console.log(this.imgList);
-      //   this.imgViewerVisible = true;
-      // });
-      // const m = (e) => {
-      //   e.preventDefault();
-      // };
-      // document.body.style.overflow = "hidden";
-      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // let newWindow = window.open();
+      // newWindow.document.write(row.filePath)
+      this.certFileUrl =
+        this.BASE_URL +
+        "/udiwms/image/register/file/getImage?type=image2&name=";
+      this.imgList = [];
+      previewImage({
+        imageUrl: row.filePath,
+        certFileUrl: this.certFileUrl,
+      }).then((response) => {
+        if (response.code === 20000) {
+          this.imgList = response.data;
+        }
+        console.log(this.imgList);
+        this.imgViewerVisible = true;
+      });
+      const m = (e) => {
+        e.preventDefault();
+      };
+      document.body.style.overflow = "hidden";
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;