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">
@@ -162,6 +162,19 @@
 
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <div class="ao-text" v-if="this.inputQuery.filePath!=null">
+              <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="toViewCompanyCert" >
+                                    文件预览
+            </el-button>
+          </el-col>
+
+
         </el-row>
       </el-card>
     </el-form>
@@ -330,7 +343,7 @@ export default {
 
     toViewCompanyCert() {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      window.open(this.certFileUrl + this.formData.filePath);
+      window.open(this.certFileUrl +  this.inputQuery.filePath);
     },
   },
   filters: {},

src/views/inout/IoDeliveryAuditOrder.vue

@@ -314,6 +314,19 @@
             prop="certCode" width="180"
             show-overflow-tooltip
           ></el-table-column>
+
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="toViewCompanyCert(scope.row)"
+                :disabled="scope.row.filePath == null"
+              >预览
+              </el-button
+              >
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
           v-show="bizTotal>0"
@@ -537,6 +550,7 @@ export default {
   name: "IoCheckSuccessOrder",
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         id: "",
@@ -711,6 +725,10 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
+    toViewCompanyCert(row) {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl +  row.filePath);
+    },
     invChange() {
       this.filterQuery.action = null;
       this.getBusType();

src/views/inout/IoSupAduitOrder.vue

@@ -266,7 +266,7 @@
                 type="text"
                 size="small"
                 @click.native.stop="upload(scope.row)"
-              >编辑
+              >检验报告
               </el-button
               >
             </template>

src/views/inout/IoSupSecAuditOrder.vue

@@ -292,7 +292,7 @@
                 type="text"
                 size="small"
                 @click.native.stop="upload(scope.row)"
-              >编辑
+              >检验报告
               </el-button
               >
             </template>