Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCheck.vue

@@ -127,7 +127,7 @@
         <el-row>
           <el-col :span="3">
             <div class="ao-text">
-              <span>检验报告：</span>
+              <span>检验报告上传：</span>
             </div>
           </el-col>
           <el-col :span="8">
@@ -159,13 +159,13 @@
           </el-col>
           <el-col :span="3">
             <div class="ao-text" v-if="this.inputQuery.filePath!=null">
-              <span>预览：</span>
+              <span>检验报告预览：</span>
             </div>
           </el-col>
           <el-col :span="8">
             <el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
                        style="text-align:right" @click="showImgViewer" >
-                                    文件预览
+                                    检验报告预览
             </el-button>
             <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
           </el-col>
@@ -199,6 +199,10 @@ export default {
       type: Object,
       required: true,
     },
+    checkFileName: {
+      type: Object,
+      required: true,
+    },
 
 
   },
@@ -305,6 +309,7 @@ export default {
       this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     uploadOnchange(file, fileList) {
+      this.inputQuery.checkFileName=file.name;
       let fileName = file.name;
       let uid = file.uid
       let pos = fileName.lastIndexOf(".");
@@ -387,10 +392,10 @@ export default {
       this.formData = this.inputQuery.formData;
       console.log(this.inputQuery.formData);
     }
-    if (this.formData.filePath != null) {
+    if (this.inputQuery.filePath != null) {
-      this.choiceFile = "更换文件";
+      this.choiceFile = "更换检验报告";
     } else {
-      this.choiceFile = "选取文件";
+      this.choiceFile = "选取检验报告";
     }
   },
 };

src/views/inout/IoDeliveryAuditOrder.vue

@@ -158,6 +158,8 @@
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>
+        <el-table-column label="审核人" prop="reviewUserName" width="120">
+        </el-table-column>
         <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="来源" prop="fromType" width="120">
           <template slot-scope="scope">
@@ -314,8 +316,17 @@
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
-
+          <el-table-column
-          <el-table-column label="操作">
+            label="检验报告"
+            width="160"
+            prop="checkFileName"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div  style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button
                 type="text"

src/views/inout/IoSupAduitOrder.vue

@@ -259,9 +259,19 @@
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
+
+          <el-table-column
+            label="检验报告"
+            width="160"
+            prop="checkFileName"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="160" fixed="right">
             <template slot-scope="scope">
-
               <el-button
                 type="text"
                 size="small"
@@ -361,6 +371,7 @@
         />
       </el-tab-pane>
     </el-tabs>
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
 
 
     <el-dialog
@@ -412,6 +423,9 @@ import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
 import { getBizDetailList } from '@/api/inout/orderDetailBiz'
+import { previewImage } from '@/api/purchase/supCompany'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
 
 const formJson = {
   site_id: "",
@@ -424,6 +438,9 @@ export default {
   name: "IoSupSearchOrder",
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      imgList:[],
+      imgViewerVisible:false,
       showSearch: true,
       Upinvoice:false,
       currentManufacturer:{},
@@ -547,7 +564,7 @@ export default {
       acceptOrderVisible: false,
     };
   },
-  components: {AcceptOrder,DialogCheck},
+  components: {AcceptOrder,DialogCheck,ElImageViewer},
   methods: {
     onReset() {
       this.$router.push({
@@ -596,12 +613,38 @@ export default {
         });
     },
 
+    showImgViewer(row){
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      console.log(this.certFileUrl+"========");
+      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;
+      const m = (e) => { e.preventDefault() };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
+
+
+
     upload(row){
       this.currentManufacturer = row;
       this.Upinvoice = true;
     },
     closeCheckDialog(){
       this.Upinvoice = false;
+      this.getOrderDetails();
     },
     handleSelectionChange(val) {
       this.currentRow.billNo=val.billNo;

src/views/inout/IoSupSecAuditOrder.vue

@@ -285,6 +285,17 @@
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="检验报告"
+            width="160"
+            prop="checkFileName"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div style="color: #1890ff;"  @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="操作" width="160" fixed="right">
             <template slot-scope="scope">
 
@@ -389,6 +400,9 @@
       </el-tab-pane>
     </el-tabs>
 
+    <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+
+
     <el-dialog
       title="编辑"
       :visible.sync="Upinvoice"
@@ -438,6 +452,9 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
+import { previewImage } from '@/api/purchase/supCompany'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
 
 
 const formJson = {
@@ -451,6 +468,9 @@ export default {
   name: "IoSupSearchOrder",
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      imgList:[],
+      imgViewerVisible:false,
       showSearch: true,
       Upinvoice: false,
       currentManufacturer: {},
@@ -580,7 +600,7 @@ export default {
       acceptOrderVisible: false,
     };
   },
-  components: {AcceptOrder, DialogCheck},
+  components: {AcceptOrder, DialogCheck,ElImageViewer},
   methods: {
     onReset() {
       this.$router.push({
@@ -623,7 +643,28 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
+    showImgViewer(row){
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      console.log(this.certFileUrl+"========");
+      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;
+      const m = (e) => { e.preventDefault() };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
     upload(row) {
       this.currentManufacturer = row;
       this.Upinvoice = true;

src/views/purchase/manufacturer/supManufacturerAuditDialog.vue

@@ -179,6 +179,7 @@
         </div>
         <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border
                   highlight-current-row>
+          <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column label="证书名称" prop="name"></el-table-column>
           <el-table-column label="证书编号" prop="code"></el-table-column>

src/views/purchase/product/supProductAuditDialog.vue

@@ -213,6 +213,7 @@
     </el-form>
     <el-card class="el-card">
       <el-table v-loading="certLoading" :data="certList" ref="certTable" style="width: 100%" border highlight-current-row>
+        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="证书名称" prop="name"></el-table-column>
         <el-table-column label="证书编号" prop="code"></el-table-column>

src/views/purchase/product/supProductEditDialog.vue

@@ -549,6 +549,7 @@ export default {
           this.$message.error("生产企业未通过审核不能提交！");
           return;
         }
+      }
       if(val==3){
         this.$confirm( "已审核通过，是否需要重新提交变更", {
           confirmButtonText: "确定",
@@ -580,7 +581,30 @@ export default {
               }
             });
           });
+      }else{
+        this.$refs['inputQuery'].validate(valid => {
+          if (valid) {
+            // this.inputQuery.auditStatus = val;
+
+
+            let formData = JSON.parse(JSON.stringify(this.inputQuery));
+            formData.manufacturerIdFk = this.manufacturerId;
+            formData.auditStatus = val;
+            this.loading = true;
+            let urlName = this.editType == 0 ? 'add' : 'update';
+            addOrModifyRegistration(formData, urlName).then(response => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.closeRegistrationDialog(true);
+                this.$message.success("保存成功");
+              } else {
+                this.$message.error(response.message);
+              }
+            });
+          } else {
+            return false;
           }
+        });
       }
     },
     toViewCompanyCert(row) {