Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/supplier/company/basicCompanyProducts.vue

src/views/basic/product/UdiInfoSelectLocalUdi.vue

@@ -164,7 +164,7 @@
         />
       </div>
     </el-card>
-    <el-card class="el-card">
+    <el-card class="el-card" v-if="this.isImport">
       <div>
         <el-form label-width="120px">
           <el-row :gutter="20">

src/views/basic/product/productUdiType.vue

@@ -28,6 +28,7 @@
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column prop="name" label="名称"></el-table-column>
         <el-table-column prop="code" label="编码"></el-table-column>
+        <el-table-column prop="remark" label="备注"></el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button type="text"  @click="handleSubForm( scope.row, 'add')">新增</el-button>

src/views/basic/product/udiInfoselectErpUdi.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="物品编码:">
-              <el-input v-model="erpQuery.code" style="width: 90%" placeholder="请输入物资编码/商品条码/医保编码" clearable="true"
+              <el-input v-model="erpQuery.code" style="width: 90%" placeholder="请输入物资编码" clearable="true"
                         @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
           </el-col>

src/views/system/param/addhelpSettings.vue

@@ -70,15 +70,14 @@
               <span>状态：</span>
             </div>
           </el-col>
-        <el-col :span="8" type="flex">
-          <el-form-item  prop="userFlag">
-            <el-radio-group v-model="formData.status" >
-              <el-radio :label="1">启用</el-radio>
-              <el-radio :label="0">禁用</el-radio>
-
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8" type="flex">
+            <el-form-item  prop="userFlag">
+              <el-radio-group v-model="formData.status" >
+                <el-radio :label="1">启用</el-radio>
+                <el-radio :label="0">禁用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
 
 
@@ -113,14 +112,17 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
                   {{ choiceFile }}
                 </el-button>
-                <el-button type="success" size="small" icon="search" @click="toViewCompanyCert"
+                <el-button type="success" size="small" icon="search" @click="showImgViewer"
                            style="text-align:right;margin-left: 20px" v-show="formData.id!=null"
                 >文件预览
                 </el-button
                 >
                 <div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
+
               </el-upload>
+
             </el-form-item>
+            <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
           </el-col>
         </el-row>
       </el-card>
@@ -136,6 +138,9 @@ import {insertCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert";
 import {insertMenuHelp,updateMenuHelp} from "@/api/system/sysMenuHelp";
 import { updateInv } from '@/api/auth/authAdmin'
 import { isBlank } from '@/utils/strUtil'
+import { previewImage } from '@/api/purchase/supCompany'
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
 
 export default {
   name: "addhelpSettings",
@@ -156,6 +161,8 @@ export default {
   },
   data() {
     return {
+      imgList:[],
+      imgViewerVisible:false,
       BASE_URL: process.env.VUE_APP_BASE_API,
       code: "",
       formData: {
@@ -184,7 +191,7 @@ export default {
     };
   },
   components: {
-    draggable,
+    draggable,ElImageViewer
   },
   methods: {
     submitUpload() {
@@ -268,10 +275,28 @@ export default {
 
     },
 
-    toViewCompanyCert() {
+    showImgViewer(row){
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      window.open(this.certFileUrl + this.formData.filePath);
+      this.imgList=[];
+      previewImage({imageUrl:this.formData.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);
+    },
+
   },
   filters: {},
   mounted() {