From b41bdd993c56950496aec1ae6b468acac1af6b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 21 Apr 2023 14:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E4=BB=A3=E7=A0=81=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/basicUnitMaintain.js            |   10 +
 src/api/basic/udiRelevance.js                 |    7 +
 src/api/purchase/supCompany.js                |    8 +-
 src/views/purchase/cert/supCertAddDialog.vue  |  721 ++++----
 src/views/purchase/cert/supCertAudit.vue      |   42 +-
 src/views/purchase/cert/supCertSearch.vue     |   27 +-
 src/views/purchase/cert/supCertSet.vue        |    6 +-
 .../purchase/cert/supCertSetSelectDialog.vue  |    2 +-
 .../purchase/cert/supCertificationAdd.vue     | 1050 ++++++------
 .../company/basicSelectSingleProducts.vue     |   20 +-
 .../purchase/company/companyProducts.vue      | 1045 ++++++------
 src/views/purchase/company/supCompanyAdd.vue  |    4 +-
 .../company/supCompanyAduditDialog.vue        |   51 +-
 .../purchase/company/supCompanyEditDialog.vue | 1277 +++++++-------
 .../supManufacturerAuditDialog.vue            |   29 +-
 .../supManufacturerEditDialog.vue             | 1412 +++++++--------
 .../product/supProductAuditDialog.vue         |   24 +-
 .../purchase/product/supProductEditDialog.vue | 1519 +++++++++--------
 18 files changed, 3640 insertions(+), 3614 deletions(-)

diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js
index 4bd03b4f..0355fc24 100644
--- a/src/api/basic/basicUnitMaintain.js
+++ b/src/api/basic/basicUnitMaintain.js
@@ -96,4 +96,14 @@ export function getSystemParamConfig(query) {
   });
 }
 
+export function getCorpList(query) {
+  return axios({
+    url: "/udiwms/basic/unit/maintain/getCorpList",
+    method: "post",
+    data: query
+  });
+}
+
+
+
 
diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js
index b966232f..b82965db 100644
--- a/src/api/basic/udiRelevance.js
+++ b/src/api/basic/udiRelevance.js
@@ -192,6 +192,13 @@ export function getGgxhList(params) {
   });
 }
 
+export function getCertUdis(query) {
+  return axios({
+    url: "/udi/cert/filterUdi",
+    method: "get",
+    params: query
+  });
+}
 
 
 
diff --git a/src/api/purchase/supCompany.js b/src/api/purchase/supCompany.js
index bccf1c76..ce87f3bd 100644
--- a/src/api/purchase/supCompany.js
+++ b/src/api/purchase/supCompany.js
@@ -151,7 +151,13 @@ export function printSupCertProduction(data) {
         data: data
     });
 }
-
+export function previewImage(data) {
+  return axios({
+    url: "/udiwms/image/register/file",
+    method: "post",
+    data: data
+  });
+}
 
 
 
diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index e7eb4503..7d8f5e8e 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -1,380 +1,393 @@
 <template>
-    <div>
-        <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" :loading="loading">提交</el-button>
-                </el-button-group>
-                <el-row>
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>证书名称：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="name">
-                            <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>证书编号：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="code">
-                            <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
-                        </el-form-item>
-                    </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 prop="vailDate">
-
-                            <el-date-picker
-                                v-model="formData.vailDate"
-                                type="date"
-                                :disabled="formData.auditStatus == 1"
-                                value-format="yyyy-MM-dd"
-                                style="width: 100%"
-                                placeholder="请选择有效期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="3">
-                        <div class="ao-text">
-                            <span>失效期：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="expireDate">
-
-                            <el-date-picker
-                                v-model="formData.expireDate"
-                                type="date"
-                                :disabled="formData.auditStatus == 1"
-                                value-format="yyyy-MM-dd"
-                                style="width: 100%"
-                                placeholder="请选择失效期">
-                            </el-date-picker>
-
-                        </el-form-item>
-                    </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 prop="remark">
-                            <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                </el-row>
-
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="4">-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="16">-->
-                <!--                        <div style="color: red">-->
-                <!--                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。-->
-                <!--                        </div>-->
-                <!--                    </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"
-                                :limit="1"
-                                :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 文件，且不超过 2 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>
-            </el-card>
-        </el-form>
-
-    </div>
+  <div>
+    <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"
+                     :loading="loading">提交
+          </el-button>
+        </el-button-group>
+        <el-row>
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>证书名称：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="name">
+              <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>证书编号：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="code">
+              <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
+            </el-form-item>
+          </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 prop="vailDate">
+
+              <el-date-picker
+                v-model="formData.vailDate"
+                type="date"
+                :disabled="formData.auditStatus == 1"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择生效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>失效期：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="expireDate">
+
+              <el-date-picker
+                v-model="formData.expireDate"
+                type="date"
+                :disabled="formData.auditStatus == 1"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="请选择失效期">
+              </el-date-picker>
+
+            </el-form-item>
+          </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 prop="remark">
+              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <!--                <el-row :gutter="20">-->
+        <!--                    <el-col :span="4">-->
+        <!--                    </el-col>-->
+        <!--                    <el-col :span="16">-->
+        <!--                        <div style="color: red">-->
+        <!--                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。-->
+        <!--                        </div>-->
+        <!--                    </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>
+              <!--                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
+              <!--                                       style="text-align:right"-->
+              <!--                            >文件预览-->
+              <!--                            </el-button-->
+              <!--                            >-->
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-form>
+
+  </div>
 </template>
 
 <script>
 import draggable from "vuedraggable";
 import store from "../../../store";
 import {insertCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 
 export default {
-    name: "supCompanyCertAdd",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        inputQuery: {
-            type: Object,
-            required: true,
-        },
-        editTye: {
-            type: Object,//1:新增，2：编辑
-            required: true,
-        },
-        addType: {
-            type: Object,
-            required: true,
-        },
-
+  name: "supCompanyCertAdd",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            code: "",
-            formData: {
-                type: 0,
-                vailDate: null,
-                expireDate: null,
-                remark: null,
-                code: null,
-                name: null,
-                manufacturerIdFk: null,
-                auditStatus: 6
-            },
-            formRules: {
-                name: [
-                {required: true, message: "请输入证书名称", trigger: "blur"}
-                ],
-                 code: [
-                {required: true, message: "请输入证书编号", trigger: "blur"}
-                ],
-            },
-            loading: false,
-            uploadUrl: "",
-            fileList: [],
-            headers: {},
-            choiceFile: "选取文件",
-
-        };
+    inputQuery: {
+      type: Object,
+      required: true,
     },
-    components: {
-        draggable,
+    editTye: {
+      type: Object,//1:新增，2：编辑
+      required: true,
     },
-    methods: {
-        submitUpload() {
-
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    if (this.formData.auditStatus == 1) {
-                        this.$confirm("该证书已审核通过，是否重新提交审核？", "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        })
-                            .then(() => {
-                                this.onConfirmSubmit(1);
-                            })
-                            .catch(() => {
-                            });
-                    } else {
-                        this.onConfirmSubmit();
-                    }
-
-                }
-            });
-        },
-
-        onConfirmSubmit(val) {
-            this.formData.repeatUpload = val;
-             console.log(this.formData)
-            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() {
-            this.loading = true;
-            this.formData.customerId = this.inputQuery.customerId;
-            if(this.formData.customerId==null){
-              this.formData.customerId=store.getters.customerId
-            }
-            this.formData.type = this.addType;
-            //证书类型：1:供应商；2.生产企业；3.产品品种
-            if (this.addType == 2) {
-                this.formData.manufacturerIdFk = this.inputQuery.manufacturerId;
-            } else if (this.addType == 3) {
-                this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
-                this.formData.productIdFk = this.inputQuery.productId;
-            }
-            if (this.formData.auditStatus != 1)
-                this.formData.auditStatus = "6";
-
-            if (this.editTye == 1) {
-                insertCompanyCert(this.formData).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("添加成功");
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            } else {
-                updateCompanyCert(this.formData).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success("添加成功");
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            }
-
-
-        },
-        uploadHandleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
-        uploadHandlePreview(file) {
-            console.log(file);
-            console.log(this.fileList);
-        },
-        uploadHandleExceed(files, fileList) {
-            this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-        },
-        uploadOnchange(file, fileList) {
-            let fileName = file.name;
-            let uid = file.uid
-            let pos = fileName.lastIndexOf(".");
-            let lastName = fileName.substring(pos, fileName.length);
-            if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png") {
-                this.$message.error("上传文件只能是 .jpg,.png 格式");
-                for (let i = 0; i < fileList.length; i++) {//从list删除
-                    if (fileList[i].uid === uid) {
-                        fileList.splice(i, 1)
-                    }
-                }
-                return;
-            }
-            // 限制上传文件的大小
-            const isLt = file.size / 1024 / 1024 / 2 <= 1;
-            if (!isLt) {
-                this.$message.error("上传文件大小不能超过 2MB");
-                for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].uid === uid) {
-                        fileList.splice(i, 1)
-                    }
-                }
-            }
-            return isLt;
-        },
-        uploadHandleSuccess(response, file, fileList) {
-            if (response.code === 20000) {
-                this.formData.filePath = response.data.name;
-
-            } else {
-                this.$message.error("文件上传失败：" + response.message);
-            }
-        },
-        uploadHandleError() {
-
-        },
-
-        toViewCompanyCert() {
-            this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-            window.open(this.certFileUrl + this.formData.filePath);
-        },
+    addType: {
+      type: Object,
+      required: true,
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      code: "",
+      isCleck:false,
+      formData: {
+        type: 0,
+        vailDate: null,
+        expireDate: null,
+        remark: null,
+        code: null,
+        name: null,
+        manufacturerIdFk: null,
+        auditStatus: 6
+      },
+      formRules: {
+        name: [
+          {required: true, message: "请输入证书名称", trigger: "blur"}
+        ],
+        code: [
+          {required: true, message: "请输入证书编号", trigger: "blur"}
+        ],
+      },
+      loading: false,
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+
+    };
+  },
+  components: {
+    draggable,
+    ElImageViewer
+  },
+  methods: {
+    submitUpload() {
+
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.formData.auditStatus == 1) {
+            this.$confirm("该证书已审核通过，是否重新提交审核？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+                this.onConfirmSubmit(1);
+              })
+              .catch(() => {
+              });
+          } else {
+            this.onConfirmSubmit();
+          }
+
+        }
+      });
     },
-    created() {
-        this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
-        this.headers = {
-            ADMIN_ID: store.getters.adminId,
-            ADMIN_TOKEN: store.getters.token,
-        };
-        if (this.inputQuery.formData == null ) {
-            this.formData = {}
-        }else if(this.inputQuery.formData != null && this.inputQuery.formData.addType==1){
-            this.formData = {}
-        }else{
-            this.formData = this.inputQuery.formData;
-            console.log(this.inputQuery.formData);
+
+    onConfirmSubmit(val) {
+      this.formData.repeatUpload = val;
+      console.log(this.formData)
+      if (this.$isNotBlank(this.formData.filePath)) {
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
+          this.onSubmit();
+        } else {
+          this.onSubmit();
         }
-        if (this.formData.filePath != null) {
-            this.choiceFile = "更换文件";
+
+      } else {
+        console.log(this.$refs.upload.uploadFiles.length);
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
         } else {
-            this.choiceFile = "选取文件";
+          this.$message.warning(`请选择文件`);
         }
+      }
+
+    },
+
+    onSubmit() {
+      this.formData.customerId = this.inputQuery.customerId;
+      if (this.formData.customerId == null) {
+        this.formData.customerId = store.getters.customerId
+      }
+      this.formData.type = this.addType;
+      //证书类型：1:供应商；2.生产企业；3.产品品种
+      if (this.addType == 2) {
+        this.formData.manufacturerIdFk = this.inputQuery.manufacturerId;
+      } else if (this.addType == 3) {
+        this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
+        this.formData.productIdFk = this.inputQuery.productId;
+      }
+      if (this.formData.auditStatus != 1)
+        this.formData.auditStatus = "6";
+
+      if (this.editTye == 1) {
+        insertCompanyCert(this.formData).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("添加成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      } else {
+        updateCompanyCert(this.formData).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("添加成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }
+
+
+    },
+    uploadHandleRemove(file, fileList) {
+      this.formData.filePath="";
+      for (var i=0;i<fileList.length;i++){
+        this.formData.filePath+=fileList[i].response.data.name+",";
+      }
+    },
+    uploadHandlePreview(file) {
+      console.log(file);
+      console.log(this.fileList);
+    },
+    uploadHandleExceed(files, fileList) {
+
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc") {
+        this.$message.error("上传文件只能是 jpg,png格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 3 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 3MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        if(this.formData.filePath==null || this.isCleck==true){
+          this.formData.filePath=response.data.name+",";
+          this.isCleck=false;
+        }else{
+          this.formData.filePath+=response.data.name+",";
+        }
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+
+    toViewCompanyCert() {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + this.formData.filePath);
     },
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    if (this.inputQuery.formData == null) {
+      this.formData = {}
+    } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) {
+      this.formData = {}
+    } else {
+      this.formData = this.inputQuery.formData;
+      console.log(this.inputQuery.formData);
+    }
+    if (this.formData.filePath != null) {
+      this.choiceFile = "更换文件";
+      this.isCleck=true;
+    } else {
+      this.choiceFile = "选取文件";
+    }
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index f9548602..c48060cf 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -7,12 +7,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="配送企业名称:">
-              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"></el-input>
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="统一社会信用号:">
-              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
+              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -35,6 +35,17 @@
         <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>
         <el-table-column label="所属地区" prop="area" width="180"></el-table-column>
         <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>
+
+
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+
         <el-table-column label="生产企业证书" prop="auditStatus" width="120">
           <template slot-scope="scope">
 
@@ -61,18 +72,10 @@
             <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
               已全部审核
             </el-tag>
-
-
           </template>
         </el-table-column>
 
-        <el-table-column label="审核状态" prop="auditStatus" width="120">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-              {{ checkFlag[scope.row.auditStatus] }}
-            </el-tag>
-          </template>
-        </el-table-column>
+
 
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
@@ -92,6 +95,8 @@
 
           </template>
         </el-table-column>
+
+
       </el-table>
 
       <pagination
@@ -117,6 +122,7 @@
         :closeDialog="closeDialog"
         :inputQuery="inputQuery"
         :editType="editType"
+        :auditType="auditType"
       ></supCompanyEditAdudit>
     </el-dialog>
 
@@ -128,13 +134,13 @@
           <el-col :span="6">
             <el-form-item label="生产企业名称">
               <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"
-                        placeholder="请输入生产企业名称"></el-input>
+                        placeholder="请输入生产企业名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="统一社会信用号">
               <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%"
-                        placeholder="请输入统一社会信用号"></el-input>
+                        placeholder="请输入统一社会信用号" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -223,6 +229,7 @@
       <supManufacturerAuditDialog
         :addCloseDialog="closeManufacturerDialog"
         :enterpriseId="enterpriseId"
+        :auditType="auditType"
         :inputQuery="inputManufacturerQuery"
         :editType="editManufacturerType"
       ></supManufacturerAuditDialog>
@@ -234,9 +241,9 @@
       <el-form :model="registrationQuery" class="query-form" label-width="120px" v-show="showSearch3">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="产品名称:">
+            <el-form-item label="物资名称:">
               <el-input v-model="registrationQuery.recordProductName" style="width: 90%;" clearable="true"
-                        placeholder="请输入产品名称"></el-input>
+                        placeholder="请输入物资名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -267,7 +274,7 @@
       <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
                 style="width: 100%">
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
@@ -325,6 +332,7 @@
       <suppliersRegistrationBasic
         :closeRegistrationDialog="closeProductDialog"
         :inputQuery="inputProudtQuery"
+        :auditType="auditType"
         :editType="editProductType"
       ></suppliersRegistrationBasic>
     </el-dialog>
@@ -353,6 +361,7 @@ export default {
         page: 1,
         limit: 20,
       },
+      auditType:1,
       loading: false,
       list: [],
       total: 0,
@@ -557,6 +566,7 @@ export default {
 
     supCompanyClick(row) {
       this.filterManufacturerQuery.customerId = row.customerId;
+      this.registrationList=[];
       this.onManufacturerReset();
     },
 
diff --git a/src/views/purchase/cert/supCertSearch.vue b/src/views/purchase/cert/supCertSearch.vue
index f9969952..39871247 100644
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@@ -7,12 +7,12 @@
                 <el-row>
                   <el-col span="6">
                     <el-form-item label="配送企业名称:">
-                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"></el-input>
+                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>
                     </el-form-item>
                   </el-col>
                     <el-col span="6">
                     <el-form-item label="统一社会信用号:">
-                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
+                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
                     </el-form-item>
                     </el-col>
                 </el-row>
@@ -84,12 +84,12 @@
                 <el-row>
                   <el-col :span="6">
                     <el-form-item label="生产企业名称">
-                        <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称"></el-input>
+                        <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%" placeholder="请输入生产企业名称" clearable></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
                     <el-form-item label="统一社会信用号">
-                        <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
+                        <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -165,8 +165,8 @@
         <el-card class="el-card">
             <el-form  :model="registrationQuery" class="query-form" label-width="100px"  v-show="showSearch2">
                 <el-row style="width: 100%">
-                    <el-form-item label="产品名称:">
-                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true" placeholder="请输入产品名称"></el-input>
+                    <el-form-item label="物资名称:">
+                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true" placeholder="请输入物资名称"></el-input>
                     </el-form-item>
                     <el-form-item label="注册备案号:">
                         <el-input v-model="registrationQuery.recordCode" style="width: 90%"  clearable="true" placeholder="请输入注册备案号"></el-input>
@@ -188,7 +188,7 @@
 
             <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row style="width: 100%">
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
@@ -585,7 +585,7 @@ export default {
             this.getRegistrationList();
         },
         printSupCertPdf(row) {
-            let query = {moduleId: 8};
+            let query = {id: 1};
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
                 if (res.code === 20000) {
@@ -625,13 +625,15 @@ export default {
         },
         //生产企业打印
         printSupCertManufacturerPdf(row) {
-            let query = {moduleId: 9};
+            let query = {id: 2};
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
                 if (res.code === 20000) {
+                  debugger
                     //查询全部详情id
                     var supCertQuery={
                         customerId:row.customerId,
+                        manufacturerIdFk:row.manufacturerId,
                         type:2
                     };
                     filterCompanyCertIdList(supCertQuery).then((req) => {
@@ -666,14 +668,17 @@ export default {
         //生产产品打印
         printSupCertProductionPdf(row) {
 
-            let query = {moduleId: 10};
+            let query = {id: 3};
             this.loading = true;
             verifyTemplateFile(query).then((res) => {
+              debugger
                 if (res.code === 20000) {
                     //查询全部详情id
                     var supCertQuery={
                         customerId:row.customerId,
-                        type:2
+                        manufacturerIdFk:row.manufacturerIdFk,
+                        productIdFk:row.productId,
+                        type:3
                     };
                     filterCompanyCertIdList(supCertQuery).then((req) => {
                         if(req.code===20000){
diff --git a/src/views/purchase/cert/supCertSet.vue b/src/views/purchase/cert/supCertSet.vue
index b930fb4d..94f9434e 100644
--- a/src/views/purchase/cert/supCertSet.vue
+++ b/src/views/purchase/cert/supCertSet.vue
@@ -71,7 +71,7 @@
                     </el-row>
                     <el-row>
                         <el-col :span="22">
-                            <el-form-item label="备注:"  prop="remark">
+                            <el-form-item label="说明:"  prop="remark">
                                 <el-input v-model="currentSup.remark" style="width: 95.5%" auto-complete="off" type="textarea"
                                           autosize></el-input>
                             </el-form-item>
@@ -177,7 +177,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="11">
-                            <el-form-item  label="备注:" prop="remark">
+                            <el-form-item  label="说明:" prop="remark">
                                 <el-input v-model="currentManufacturer.remark" auto-complete="off" type="textarea"
                                           autosize></el-input>
                             </el-form-item>
@@ -319,7 +319,7 @@
                         </el-col>
 
                         <el-col :span="11">
-                            <el-form-item label="备注：" prop="remark">
+                            <el-form-item label="说明：" prop="remark">
                                 <el-input v-model="currentProduct.remark" style="width: 90%" auto-complete="off" type="textarea"
                                           autosize></el-input>
                             </el-form-item>
diff --git a/src/views/purchase/cert/supCertSetSelectDialog.vue b/src/views/purchase/cert/supCertSetSelectDialog.vue
index b73f5478..6234caa9 100644
--- a/src/views/purchase/cert/supCertSetSelectDialog.vue
+++ b/src/views/purchase/cert/supCertSetSelectDialog.vue
@@ -146,7 +146,7 @@ export default {
                 manufacturerIdFk: this.manufacturerId,
                 productIdFk: this.productId,
                 supCertSetEntities: this.multipleSelection,
-                customerId: this.customerId,
+                customerId:this.customerId,
             };
             selectAllCert(postQuery)
                 .then(response => {
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index ccc5aefc..b3dedd64 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -1,190 +1,201 @@
 <template>
-    <div>
-        <!---生产企业资质----->
-        <el-card>
-            <el-form  :model="filterQuery" class="query-form" label-width="100px"  v-show="showSearch">
-              <el-row>
-                <el-col span="6">
-                    <el-form-item label="企业名称:">
-                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                  <el-col span="6">
-                    <el-form-item label="社会信用号:">
-                        <el-input v-model="filterQuery.creditCode" style="width: 90%" placeholder="请输入社会信用号"></el-input>
-                    </el-form-item>
-                  </el-col>
-                <el-col span="6">
-                    <el-form-item label="处理状态:">
-                        <el-select v-model="filterQuery.auditStatus" style="width: 90%" placeholder="请输入处理状态">
-                            <el-option label="全部" value=""></el-option>
-                            <el-option label="草稿" value="0"></el-option>
-                            <el-option label="未审核" value="6"></el-option>
-                            <el-option label="变更未审核" value="3"></el-option>
-                            <el-option label="已审核" value="1"></el-option>
-                            <el-option label="已拒绝" value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                </el-row>
-            </el-form>
-
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="addInfoDialog()">添加</el-button>
-            </el-button-group>
-          </div>
-
-          <el-divider style="margin: 15px"></el-divider>
-
-
-          <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row @current-change="supManufacturerClick">
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="企业名称" prop="companyName" width="250"></el-table-column>
-                <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
-                <el-table-column label="企业类型" prop="bussinessStatus" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ companyTypeMap[scope.row.companyType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="所在地区" prop="placeArea"></el-table-column>
-                <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-
-                <el-table-column label="操作"  width="120">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="addInfoDialog(scope.row)">编辑</el-button>
-                        <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
-                        <el-button type="text" size="small" v-if="scope.row.auditStatus === 2" @click.native.stop="rejectInfo(scope.row)">说明</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-
-            <el-dialog
-                :title="formMap[formName]"
-                :visible.sync="addInfoVisible"
-                width="80%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="addInfoVisible"
-                @close='closeDialog'
-            >
-                <suppliersEnterpriseBasicAdd
-                    :addCloseDialog="closeDialog"
-                    :inputQuery="inputQuery"
-                    :editType="editType"
-                    :fromType="fromType"
-                ></suppliersEnterpriseBasicAdd>
-            </el-dialog>
-
-
-        </el-card>
-
-
-        <!---配送企业资质----->
-        <el-card class="el-card">
-            <el-form :model="registrationQuery" class="query-form" style="margin-top: 5px" v-show="showSearch2" label-width="100px">
-              <el-row>
-                <el-col span="6">
-                    <el-form-item label="产品名称:">
-                        <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable placeholder="产品名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col span="6">
-                    <el-form-item label="注册备案号:">
-                        <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable placeholder="注册备案号"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col span="6">
-                    <el-form-item label="注册备案人:">
-                        <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable placeholder="注册备案人"></el-input>
-                    </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch2">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="registrationDialog()">添加</el-button>
-            </el-button-group>
-          </div>
-          <el-divider style="margin: 15px"></el-divider>
-
-
-
-            <el-table v-loading="registrationLoading" :data="registrationList" style="width: 100%"  border highlight-current-row>
-                <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="注册/备案产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作"  width="120">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="registrationDialog(scope.row)">编辑</el-button>
-                        <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1" @click.native="deleteRegistration(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-
-          <pagination
-            v-show="certTotal>0"
-            :total="certTotal"
-            :page.sync="registrationQuery.page"
-            :limit.sync="registrationQuery.limit"
-            @pagination="certHandleCurrentChange"
-          ></pagination>
-
-
-            <el-dialog
-                :title="formProductMap[formName]"
-                :visible.sync="registrationVisible"
-                width="80%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="registrationVisible"
-                @close='closeProductDialog'
-            >
-                <suppliersRegistrationBasic
-                    :closeRegistrationDialog="closeProductDialog"
-                    :inputQuery="curProductQuery"
-                    :editType="editProductType"
-                    :currentManufacturer="currentManufacturer"
-                ></suppliersRegistrationBasic>
-            </el-dialog>
-        </el-card>
-
-    </div>
+  <div>
+    <!---生产企业资质----->
+    <el-card>
+      <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col span="6">
+            <el-form-item label="企业名称:">
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="6">
+            <el-form-item label="社会信用号:">
+              <el-input v-model="filterQuery.creditCode" style="width: 90%" placeholder="请输入社会信用号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="6">
+            <el-form-item label="处理状态:">
+              <el-select v-model="filterQuery.auditStatus" style="width: 90%" placeholder="请输入处理状态">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="草稿" value="0"></el-option>
+                <el-option label="未审核" value="6"></el-option>
+                <el-option label="变更未审核" value="3"></el-option>
+                <el-option label="已审核" value="1"></el-option>
+                <el-option label="已拒绝" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addInfoDialog()">添加</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="supManufacturerClick">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="企业名称" prop="companyName" width="250"></el-table-column>
+        <el-table-column label="社会信用号" prop="creditCode"></el-table-column>
+        <el-table-column label="企业类型" prop="bussinessStatus" width="120">
+          <template slot-scope="scope">
+            <span>{{ companyTypeMap[scope.row.companyType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所在地区" prop="placeArea"></el-table-column>
+        <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="addInfoDialog(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1"
+                       @click.native.stop="deleteDialog(scope.row)">删除
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.auditStatus === 2"
+                       @click.native.stop="rejectInfo(scope.row)">说明
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+      <el-dialog
+        :title="formMap[formName]"
+        :visible.sync="addInfoVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addInfoVisible"
+        @close='closeDialog'
+      >
+        <suppliersEnterpriseBasicAdd
+          :addCloseDialog="closeDialog"
+          :inputQuery="inputQuery"
+          :editType="editType"
+          :fromType="fromType"
+        ></suppliersEnterpriseBasicAdd>
+      </el-dialog>
+
+
+    </el-card>
+
+
+    <!---配送企业资质----->
+    <el-card class="el-card">
+      <el-form :model="registrationQuery" class="query-form" style="margin-top: 5px" v-show="showSearch2"
+               label-width="100px">
+        <el-row>
+          <el-col span="6">
+            <el-form-item label="物资名称:">
+              <el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable
+                        placeholder="物资名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="6">
+            <el-form-item label="注册备案号:">
+              <el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable
+                        placeholder="注册备案号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="6">
+            <el-form-item label="注册备案人:">
+              <el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable
+                        placeholder="注册备案人"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch2">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset2">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit2">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="registrationDialog()">添加</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="registrationLoading" :data="registrationList" style="width: 100%" border
+                highlight-current-row>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="注册/备案产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="registrationDialog(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" :disabled="scope.row.auditStatus === 1"
+                       @click.native="deleteRegistration(scope.row)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <pagination
+        v-show="certTotal>0"
+        :total="certTotal"
+        :page.sync="registrationQuery.page"
+        :limit.sync="registrationQuery.limit"
+        @pagination="certHandleCurrentChange"
+      ></pagination>
+
+
+      <el-dialog
+        :title="formProductMap[formName]"
+        :visible.sync="registrationVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="registrationVisible"
+        @close='closeProductDialog'
+      >
+        <suppliersRegistrationBasic
+          :closeRegistrationDialog="closeProductDialog"
+          :inputQuery="curProductQuery"
+          :editType="editProductType"
+          :currentManufacturer="currentManufacturer"
+        ></suppliersRegistrationBasic>
+      </el-dialog>
+    </el-card>
+
+  </div>
 </template>
 
 <script>
@@ -194,352 +205,355 @@ import {getRegistrationList, deleteRegistration} from "../../../api/purchase/sup
 import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog";
 
 export default {
-    name: "supCertificationAdd",
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            showSearch:true,
-            showSearch2:true,
-            /**------------------生产企业资质--------------------*/
-            filterQuery: {
-                customerId: null,
-                companyName: "",
-                auditStatus: null,
-                creditCode: "",
-                placeArea: "",
-                page: 1,
-                limit: 20,
-            },
-            total: 0,
-            companyTypeMap: {
-                1: "境内企业",
-                2: "境外企业"
-            },
-            productManageTypeMap: {
-                1: "Ⅰ类",
-                2: "Ⅱ类",
-                3: "Ⅲ类",
-            },
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            loading: false,
-            list: [],
-            addInfoVisible: false,
-            fileUrl: "",
-            inputQuery: {
-
-                auditStatus: 6
-            },
-            editType: 1,
-            fromType: 2,//1:供应商，2:医院
-            formMap: {
-                add: "新增生产企业资质信息",
-                update: "编辑生产企业资质信息",
-            },
-            currentManufacturer: null,
-
-
-            /**------------------配送企业资质--------------------*/
-            registrationVisible: false,
-            enterpriseId: "",
-            registrationQuery: {
-                auditStatus: null,
-                customerId: null,
-                manufacturerIdFk: null,
-                recordProductName: "",
-                recordCode: "",
-                recordPeopleName: "",
-                page: 1,
-                limit: 20
-            },
-            registrationList: [],
-            certTotal: 0,
-            registrationLoading: false,
-            registrationId: "",
-
-            pmQuery: {
-                customerId: null,
-                companyName: null,
-                page: 1,
-                limit: 10,
-            },
-            curProductQuery: {
-                auditStatus: 6
-            },
-            editProductType: 0,
-            formName: "add",
-            formProductMap: {
-                add: "新增配送产品资质信息",
-                update: "编辑配送产品资质信息",
-            },
+  name: "supCertificationAdd",
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      showSearch: true,
+      showSearch2: true,
+      /**------------------生产企业资质--------------------*/
+      filterQuery: {
+        customerId: null,
+        companyName: "",
+        auditStatus: null,
+        creditCode: "",
+        placeArea: "",
+        page: 1,
+        limit: 20,
+      },
+      total: 0,
+      companyTypeMap: {
+        1: "境内企业",
+        2: "境外企业"
+      },
+      productManageTypeMap: {
+        1: "Ⅰ类",
+        2: "Ⅱ类",
+        3: "Ⅲ类",
+      },
+      checkFlag: {
+        0: "草稿",
+        1: "已通过",
+        2: "已拒绝",
+        3: "变更未审核",
+        6: "未审核",
+      },
+      loading: false,
+      list: [],
+      addInfoVisible: false,
+      fileUrl: "",
+      inputQuery: {
+
+        auditStatus: 6
+      },
+      editType: 1,
+      fromType: 1,//1:供应商，2:医院
+      formMap: {
+        add: "新增生产企业资质信息",
+        update: "编辑生产企业资质信息",
+      },
+      currentManufacturer: null,
+
+
+      /**------------------配送企业资质--------------------*/
+      registrationVisible: false,
+      enterpriseId: "",
+      registrationQuery: {
+        auditStatus: null,
+        customerId: null,
+        manufacturerIdFk: null,
+        recordProductName: "",
+        recordCode: "",
+        recordPeopleName: "",
+        page: 1,
+        limit: 20
+      },
+      registrationList: [],
+      certTotal: 0,
+      registrationLoading: false,
+      registrationId: "",
+
+      pmQuery: {
+        customerId: null,
+        companyName: null,
+        page: 1,
+        limit: 10,
+      },
+      curProductQuery: {
+        auditStatus: 6
+      },
+      editProductType: 0,
+      formName: "add",
+      formProductMap: {
+        add: "新增配送产品资质信息",
+        update: "编辑配送产品资质信息",
+      },
+    };
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        3: "warning",
+        6: "warning",
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        0: "禁用",
+        1: "正常",
+        2: "未验证",
+      };
+      return statusMap[status];
+    },
+  },
+  methods: {
+    /**-------------------------生产企业资质---------------------*/
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        customerId: null,
+        companyName: "",
+        creditCode: "",
+        placeArea: "",
+        auditStatus: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+      this.registrationList = [];
+    },
+    onSubmit() {
+      this.filterQuery.page = 1
+      this.getList();
+      this.registrationList = [];
+      this.currentManufacturer=null;
+    },
+    toViewRegistrationCert(row, num) {
+      let path = num === 1 ? row.filePath : row.instructions;
+      window.open(this.fileUrl + path);
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = this.$store.getters.customerId
+      getCompanyBySup(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    hideSearch2() {
+      this.showSearch2 = !this.showSearch2;
+    },
+    addInfoDialog(row) {
+      if (this.$isNotBlank(row)) {
+        this.enterpriseId = row.id;
+        this.editType = 1;
+        this.inputQuery = row;
+      } else {
+        this.enterpriseId = null;
+        this.editType = 0;
+        this.inputQuery = {
+          auditStatus: 0
         };
+      }
+
+      this.addInfoVisible = true;
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                3: "warning",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
-        statusFilterName(status) {
-            const statusMap = {
-                0: "禁用",
-                1: "正常",
-                2: "未验证",
-            };
-            return statusMap[status];
-        },
+    closeDialog(type) {
+      this.addInfoVisible = false;
+      this.registrationVisible = false;
+      this.enterpriseId = null;
+      this.registrationId = null;
+      this.getList();
+      this.registrationList = [];
     },
-    methods: {
-        /**-------------------------生产企业资质---------------------*/
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                customerId: null,
-                companyName: "",
-                creditCode: "",
-                placeArea: "",
-                auditStatus: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-            this.registrationList = [];
-        },
-        onSubmit() {
-            this.filterQuery.page=1
-            this.getList();
-            this.registrationList = [];
-        },
-        toViewRegistrationCert(row, num) {
-            let path = num === 1 ? row.filePath : row.instructions;
-            window.open(this.fileUrl + path);
-        },
-        getList() {
-            this.loading = true;
-            getCompanyBySup(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-         hideSearch2() {
-          this.showSearch2 = !this.showSearch2;
-         },
-        addInfoDialog(row) {
-            if (this.$isNotBlank(row)) {
-                this.enterpriseId = row.id;
-                this.editType = 1;
-                this.inputQuery = row;
-            } else {
-                this.enterpriseId = null;
-                this.editType = 0;
-                this.inputQuery = {
-                    auditStatus: 0
-                };
-            }
 
-            this.addInfoVisible = true;
-        },
-        closeDialog(type) {
-            this.addInfoVisible = false;
-            this.registrationVisible = false;
-            this.enterpriseId = null;
-            this.registrationId = null;
-            this.getList();
-            this.registrationList = [];
-        },
 
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCheckedChange(val) {
+      console.log(val);
+      console.log(this.check);
+    },
+
+    rejectInfo(row) {
+      this.$confirm(row.auditComment, "驳回说明", {
+        confirmButtonText: "确定",
+        type: "warning",
+        showCancelButton: false,
+      })
+        .then(() => {
+        });
 
-        handleSizeChange(val) {
-            this.filterQuery.limit = val;
-            this.getList();
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
+    },
+
+    deleteDialog(row) {
+      this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let tQuery = {
+            id: row.id,
+          };
+          deleteCompany(tQuery).then(() => {
             this.getList();
-        },
-        handleCheckedChange(val) {
-            console.log(val);
-            console.log(this.check);
-        },
-
-        rejectInfo(row) {
-            this.$confirm(row.auditComment, "驳回说明", {
-                confirmButtonText: "确定",
-                type: "warning",
-                showCancelButton: false,
-            })
-                .then(() => {
-                });
-
-        },
-
-        deleteDialog(row) {
-            this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let tQuery = {
-                        id: row.id,
-                    };
-                    deleteCompany(tQuery).then(() => {
-                        this.getList();
-                    });
-                })
-                .catch(() => {
-                });
-        },
-
-        supManufacturerClick(row) {
-            this.registrationQuery.customerId = row.customerId;
-            this.registrationQuery.manufacturerIdFk = row.manufacturerId;
-            this.getRegistrationList();
-            this.currentManufacturer = row;
-        },
-
-        /**---------------------------配送产品资质----------------------*/
-
-        onReset2() {
-            //判断有没有选择配送企业
-            if(this.currentManufacturer!=null){
-                this.registrationQuery = {
-                    customerId: this.registrationQuery.customerId,
-                    manufacturerIdFk: this.registrationQuery.manufacturerIdFk,
-                    recordProductName: "",
-                    recordCode: "",
-                    recordPeopleName: "",
-                    auditStatus: null,
-                    page: 1,
-                    limit: 20
-                };
-                this.getRegistrationList();
-            }
-        },
-        onSubmit2() {
-            if(this.currentManufacturer==null){
-                this.$message.error("请先选中生产企业！");
-                return
-            }
-            this.registrationQuery.page=1;
-            this.getRegistrationList();
-        },
-        registrationDialog(row) {
-            if(this.currentManufacturer==null){
-                this.$message.error("请先选中生产企业！");
-                return
-            }
+          });
+        })
+        .catch(() => {
+        });
+    },
+
+    supManufacturerClick(row) {
+      this.registrationQuery.customerId = row.customerId;
+      this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+      this.getRegistrationList();
+      this.currentManufacturer = row;
+    },
 
-            if (this.$isNotBlank(row)) {
-                this.registrationId = row.id;
-                this.curProductQuery = row;
-                this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus;
-                this.formName = "update";
-                this.editProductType = 1;
+    /**---------------------------配送产品资质----------------------*/
+
+    onReset2() {
+      //判断有没有选择配送企业
+      if (this.currentManufacturer != null) {
+        this.registrationQuery = {
+          customerId: this.registrationQuery.customerId,
+          manufacturerIdFk: this.registrationQuery.manufacturerIdFk,
+          recordProductName: "",
+          recordCode: "",
+          recordPeopleName: "",
+          auditStatus: null,
+          page: 1,
+          limit: 20
+        };
+        this.getRegistrationList();
+      }
+    },
+    onSubmit2() {
+      if (this.currentManufacturer == null) {
+        this.$message.error("请先选中生产企业！");
+        return
+      }
+      this.registrationQuery.page = 1;
+      this.getRegistrationList();
+    },
+    registrationDialog(row) {
+      if (this.currentManufacturer == null) {
+        this.$message.error("请先选中生产企业！");
+        return
+      }
+
+      if (this.$isNotBlank(row)) {
+        this.registrationId = row.id;
+        this.curProductQuery = row;
+        this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus;
+        this.curProductQuery.manufacturerId = this.registrationQuery.manufacturerIdFk
+        this.formName = "update";
+        this.editProductType = 1;
+      } else {
+        this.editProductType = 0;
+        this.formName = "add";
+        this.curProductQuery = {
+          auditStatus: 0,
+          cuStatus: this.currentManufacturer.auditStatus,
+          manufacturerId: this.registrationQuery.manufacturerIdFk
+        };
+      }
+      this.registrationVisible = true;
+    },
+    deleteRegistration(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        let tQuery = {
+          id: row.id,
+          filePath: row.filePath,
+          filePath2: row.instructions,
+        };
+        deleteRegistration(tQuery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getRegistrationList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
             } else {
-                this.editProductType = 0;
-                this.formName = "add";
-                this.curProductQuery = {
-                    auditStatus: 0,
-                    cuStatus:this.currentManufacturer.auditStatus
-                };
+              this.$message.error(response.message);
             }
-            this.registrationVisible = true;
-        },
-        deleteRegistration(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tQuery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                    filePath2: row.instructions,
-                };
-                deleteRegistration(tQuery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getRegistrationList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
-        },
-        closeProductDialog() {
-            this.registrationVisible = false;
-            this.enterpriseId = null;
-            this.registrationId = null;
-            this.getList();
-            this.registrationList = [];
-        },
-        getRegistrationList() {
-            this.registrationLoading = true;
-            getRegistrationList(this.registrationQuery)
-                .then((response) => {
-                    this.registrationLoading = false;
-                    this.registrationList = response.data.list || [];
-                    this.certTotal = response.data.total;
-                })
-                .catch(() => {
-                    this.registrationLoading = false;
-                    this.registrationList = [];
-                });
-        },
-        supChange(val) {
-            this.pmQuery.customerId = val;
-            this.findPMMethod();
-        },
-        certHandleCurrentChange(val) {
-            this.registrationQuery.page = val.page;
-            this.getRegistrationList();
-        }
-
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
     },
-    components: {
-        suppliersEnterpriseBasicAdd, suppliersRegistrationBasic
+    closeProductDialog() {
+      this.registrationVisible = false;
+      this.enterpriseId = null;
+      this.registrationId = null;
+      this.getRegistrationList();
     },
-    mounted() {
+    getRegistrationList() {
+      this.registrationLoading = true;
+      getRegistrationList(this.registrationQuery)
+        .then((response) => {
+          this.registrationLoading = false;
+          this.registrationList = response.data.list || [];
+          this.certTotal = response.data.total;
+        })
+        .catch(() => {
+          this.registrationLoading = false;
+          this.registrationList = [];
+        });
     },
-    created() {
-        this.fileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
-        this.getList();
-        // this.getRegistrationList();
+    supChange(val) {
+      this.pmQuery.customerId = val;
+      this.findPMMethod();
     },
+    certHandleCurrentChange(val) {
+      this.registrationQuery.page = val.page;
+      this.getRegistrationList();
+    }
+
+  },
+  components: {
+    suppliersEnterpriseBasicAdd, suppliersRegistrationBasic
+  },
+  mounted() {
+  },
+  created() {
+    this.fileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
+    this.getList();
+    // this.getRegistrationList();
+  },
 }
 </script>
 
diff --git a/src/views/purchase/company/basicSelectSingleProducts.vue b/src/views/purchase/company/basicSelectSingleProducts.vue
index 926fe882..90fe2002 100644
--- a/src/views/purchase/company/basicSelectSingleProducts.vue
+++ b/src/views/purchase/company/basicSelectSingleProducts.vue
@@ -9,8 +9,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="产品通用名:">
-                <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+              <el-form-item label="物资名称:">
+                <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -54,9 +54,9 @@
           <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
           <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
           <el-table-column width="60" label="操作" >
             <template slot-scope="scope">
@@ -87,7 +87,7 @@
 
           <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
             <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
           </el-table>
@@ -95,8 +95,8 @@
           <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="产品名称" prop="cpmctymc">
-                  <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
+                <el-form-item label="物资名称" prop="cpmctymc">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入物资名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">
@@ -254,7 +254,7 @@
             </el-row>
             <el-row >
               <el-col :span="12" class="el-col">
-                <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+                <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
                   <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
                 </el-form-item>
               </el-col>
@@ -325,7 +325,7 @@ export default {
                 isUseDy: false,
             },
 
-            replTitle: "产品信息补齐:",
+            replTitle: "物资字典信息补齐:",
             isImport: false,
             isImportUdi: false,
             isUploadSmp: false,
@@ -435,7 +435,7 @@ export default {
         selectExport() {
             var selectData = this.multipleSelection;
             if (selectData == null || selectData.length == 0) {
-                this.$message.warning("请先选入产品！");
+                this.$message.warning("请先选入物资字典信息！");
                 return;
             }
             this.closeSelDialog(selectData[0].id);
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 715ac28a..0c2bdbaf 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -1,618 +1,537 @@
 <template>
-    <div>
-      <el-card>
-        <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
-          <el-row>
-            <el-col :span="6">
-                <el-form-item label="产品编码:">
-                    <el-input v-model="filterQuery.unionCode"  style="width:90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="DI/物资编码:">
+              <el-input v-model="filterQuery.unionCode" style="width:90%" placeholder="请输入DI/物资编码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width:90%" placeholder="请输入物资名称"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="注册/备案人:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入注册/备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="统一社会信用号:">
+              <el-input v-model="filterQuery.tyshxydm" style="width: 90%" placeholder="请输入统一社会信用号"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="注册/备案号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册/备案号"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="submitSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-upload2" @click="selectExport">选中导入</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleSelectionChange" border
+                highlight-current-row>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品类别" prop="cplb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="分类编码" prop="classifyName" show-overflow-tooltip></el-table-column>
+        <el-table-column width="60" label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="handleModifyClick(scope.row)"
+            >详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <el-dialog
+        title="产品信息详情"
+        :visible.sync="editDialogVisible"
+        width="70%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        append-to-body
+        v-if="editDialogVisible"
+      >
+
+        <el-card>
+          <el-form :model="editQuery" ref="editQuery" label-width="140px" style="margin-top: 20px">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="物资名称" prop="cpmctymc">
+                  <el-input style="width: 90%" size="small" splaceholder="请输入物资名称" :disabled="true"
+                            v-model="editQuery.cpmctymc"></el-input>
                 </el-form-item>
-            </el-col>
-            <el-col :span="6">
-                <el-form-item label="产品通用名:">
-                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="器械类别" prop="qxlb">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别"
+                            v-model="editQuery.qxlb"></el-input>
                 </el-form-item>
-            </el-col>
-            <el-col :span="6">
-                <el-form-item label="规格型号:">
-                    <el-input v-model="filterQuery.ggxh"  style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="产品类别" prop="cplb">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别"
+                            v-model="editQuery.cplb"></el-input>
                 </el-form-item>
-            </el-col>
-            <el-col :span="6">
-                <el-form-item label="生产企业:">
-                    <el-input v-model="filterQuery.ylqxzcrbarmc"  style="width: 90%" placeholder="请输入生产企业/注册备案人" clearable="true"></el-input>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="分类编码" prop="flbm">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码"
+                            v-model="editQuery.flbm"></el-input>
                 </el-form-item>
-            </el-col>
+              </el-col>
             </el-row>
-
             <el-row>
-              <el-col :span="6">
-                <el-form-item label="配送企业:">
-                    <el-input v-model="filterQuery.supName"  style="width: 90%" placeholder="请输入配送企业" clearable="true"></el-input>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人"
+                            v-model="editQuery.ylqxzcrbarmc"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="第三方产品编码:">
-                    <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称"
+                            v-model="editQuery.ylqxzcrbarywmc"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-        </el-form>
+            <el-row>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="统一社会信用号" prop="tyshxydm">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号"
+                            v-model="editQuery.tyshxydm"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
+                  <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号"
+                            v-model="editQuery.zczbhhzbapzbh"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+        <el-card>
 
-        <div class="top-right-btn">
-          <el-button-group style="display:flex;">
-            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="submitSearch">查询</el-button>
-            <el-button type="primary" icon="el-icon-upload2" @click="selectExport">选中导入</el-button>
-          </el-button-group>
-        </div>
-        <el-divider style="margin: 15px"></el-divider>
-        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange"  border highlight-current-row>
-            <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+          <el-table :data="detailList" style="width: 100%" @current-change="handleSelectionChange" border
+                    highlight-current-row>
             <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
             <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-            <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-            <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
-            <el-table-column width="60" label="操作" >
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="handleModifyClick(scope.row)"
-                    >详情
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-dialog
-            title="产品信息详情"
-            :visible.sync="editDialogVisible"
-            width="70%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            append-to-body
-            v-if="editDialogVisible"
-        >
-          <el-table :data="sysList" style="width: 100%" border highlight-current-row>
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="第三方产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="第三方产品ID" prop="thirdId" show-overflow-tooltip></el-table-column>
-          </el-table>
-
-          <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
-            <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-            <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
           </el-table>
 
-            <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="产品名称" prop="cpmctymc">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="产品标识" prop="nameCode">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="规格型号" prop="ggxh">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="器械类别" prop="qxlb">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
 
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="产品类别" prop="cplb">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="分类编码" prop="flbm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="商品条码" prop="sptm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="医保编码" prop="ybbm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="统一社会信用号" prop="tyshxydm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="上级产品编码" prop="sjcpbm">
-                    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包装级别" prop="packLevel">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包装层级" prop="bzcj">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包含下级包装数量" prop="bhxjsl">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
-                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="12" class="el-col">
-                  <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
-                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="是否包含批号" prop="scbssfbhph">
-                          <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                          <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
-                            <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
-                          </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
-                        <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
-                        <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品描述" prop="cpms">
-                        <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="计量单位" prop="measname">
-                        <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row >
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
-                        <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-
-        </el-dialog>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :limit.sync="filterQuery.limit"
-          :page.sync="filterQuery.page"
-          @pagination="handleCurrentChange"
-        ></pagination>
-
-      </el-card>
-    </div>
+          <pagination
+            v-show="detailTotal>0"
+            :total="detailTotal"
+            :limit.sync="detailQuery.limit"
+            :page.sync="detailQuery.page"
+            @pagination="handeleDetailChange"
+          ></pagination>
+        </el-card>
+      </el-dialog>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+  </div>
 </template>
 
 <script>
 import {
-    getUdiInfos,
-    updateErpProduct,
-    thirdSysDetail,
-    getSmUdiInfos
+  getUdiInfos,
+  updateErpProduct,
+  thirdSysDetail,
+  getSmUdiInfos, getCertUdis
 } from "@/api/basic/udiRelevance";
 import {udiUpload} from "@/api/thrsys/smp"
 import {filterByUuid} from "@/api/basic/udiInfo";
 import {
-    insertCompanyProductRelevance,
-    updateCompanyProductRelevance, insertFilter
+  insertCompanyProductRelevance,
+  updateCompanyProductRelevance, insertFilter
 } from "@/api/basic/udiRlSuptRelevance";
 import store from "@/store";
 
 export default {
-    name: "UdIInfoSelect",
-    props: {
-        unitFk: {
-            type: Object,
-            required: true,
-        },
-        selectType: {
-            type: Object,
-            required: true,
-        },
-        closeSelDialog: {
-            type: Function,
-            required: true,
-        },
+  name: "UdIInfoSelect",
+  props: {
+    unitFk: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            showSearch: true,
-            filterQuery: {
-                customerId: null,
-                uuids: [],
-                rlIds: [],
-                ylqxzcrbarmc: "",
-                supName: null,
-                cpmctymc: "",
-                nameCode: "",
-                page: 1,
-                limit: 20,
-                addType: 1,
-                isDisable: false,
-            },
-
-            editQuery: null,
-            relevanceEdit: {
-                id: null,
-                thirdId: "",
-                isUseDy: false,
-            },
-            isImport: false,
-            isImportUdi: false,
-            isUploadSmp: false,
-            isImportFile: false,
-            uploadFileUrl: null,
-            checked: false,
-            list: [],
-            detailList: [],
-            sysList: [],
-            total: 0,
-            thirdNo: "",
-            uuid: "111",
-            thirdId: null,
-            relId: "",
-            thisData: {
-                nameCode: null,
-                cpmctymc: null,
-                ggxh: null
-            },
-            multipleSelection: [],
-            editDialogVisible: false,
-            selectUdiDialogVisible: false,
-            selectErpDialogVisible: false,
-            selectLocalVisible: false,
-        };
+    selectType: {
+      type: Object,
+      required: true,
     },
-
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                customerId: null,
-                uuids: [],
-                rlIds: [],
-                ylqxzcrbarmc: "",
-                supName: null,
-                cpmctymc: "",
-                nameCode: "",
-                page: 1,
-                limit: 20,
-                unitFk: null,
-                addType: 1,
-            };
-            this.getList();
-        },
-
-      hideSearch() {
-        this.showSearch = !this.showSearch;
+    closeSelDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        customerId: null,
+        uuids: [],
+        rlIds: [],
+        ylqxzcrbarmc: "",
+        supName: null,
+        cpmctymc: "",
+        nameCode: "",
+        page: 1,
+        limit: 20,
+        addType: 1,
+        isDisable: false,
       },
-        submitSearch() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            getSmUdiInfos(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-
-        getDetailList(detailQuery) {
-            this.loading = true;
-            filterByUuid(detailQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.detailList = response.data || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-
-        handleDetail(row) {
-            this.editQuery = row;
-        },
+      detailTotal: 0,
+      detailQuery: {
+        cpmctymc: null,
+        manufactory: null,
+        page: 1,
+        limit: 20,
+      },
+      editQuery: null,
+      relevanceEdit: {
+        id: null,
+        thirdId: "",
+        isUseDy: false,
+      },
+      isImport: false,
+      isImportUdi: false,
+      isUploadSmp: false,
+      isImportFile: false,
+      uploadFileUrl: null,
+      checked: false,
+      list: [],
+      detailList: [],
+      sysList: [],
+      total: 0,
+      thirdNo: "",
+      uuid: "111",
+      thirdId: null,
+      relId: "",
+      thisData: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null
+      },
+      multipleSelection: {},
+      editDialogVisible: false,
+      selectUdiDialogVisible: false,
+      selectErpDialogVisible: false,
+      selectLocalVisible: false,
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        customerId: null,
+        uuids: [],
+        rlIds: [],
+        ylqxzcrbarmc: "",
+        supName: null,
+        cpmctymc: "",
+        nameCode: "",
+        page: 1,
+        limit: 20,
+        unitFk: null,
+        addType: 1,
+      };
+      this.getList();
+    },
 
-        combine() {
-            this.combineQuery.productUuid = this.currentRow.uuid;
-            this.combineQuery.customerId = store.getters.customerId;
-            insertCompanyProductRelevance(this.combineQuery).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.$message.success("添加成功");
-                    this.closeDialog(true);
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    submitSearch() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      getCertUdis(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
+    getDetailList(detailQuery) {
+      this.loading = true;
+      getUdiInfos(detailQuery)
+        .then((response) => {
+          this.loading = false;
+          this.detailList = response.data.list || [];
+          this.detailTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.detailTotal = 0;
+        });
+    },
 
-        selectExport() {
-            var selectData = this.multipleSelection;
-          if (selectData == null || selectData.length == 0) {
-            this.$message.warning("请先选入产品！");
-            return;
-          }
-          this.closeSelDialog(selectData[0].id);
+    handleDetail(row) {
+      this.editQuery = row;
+    },
 
-        },
-        allExport() {
-            this.filterQuery.customerId = store.getters.customerId;
-            insertFilter(this.filterQuery).then(response => {
-                this.loading = false;
-                if (response.code == 20000) {
-                    this.$message.success(response.data);
-                    this.$emit("closeSelDialog", true);
-                    this.closeSelDialog();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
+    combine() {
+      this.combineQuery.productUuid = this.currentRow.uuid;
+      this.combineQuery.customerId = store.getters.customerId;
+      insertCompanyProductRelevance(this.combineQuery).then(response => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.$message.success("添加成功");
+          this.closeDialog(true);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
 
-        intentDetail() {
-            this.isImportUdi = false;
-            this.selectUdiDialogVisible = true;
-        },
 
-        intentImportErp(val) {
-            this.uuid = val.uuid;
-            this.relId = val.id;
-            this.isImport = true;
-            this.thisData = val;
-            this.selectErpDialogVisible = true;
-        },
-        uploadSMP() {
-            var selectData = this.multipleSelection;
-            selectData.forEach((obj) => {
-                this.filterQuery.uuids.push(obj.uuid);
-            });
-            this.allUploadSMP();
-        },
+    selectExport() {
+      var selectData = this.multipleSelection;
+      if (selectData == null) {
+        this.$message.warning("请先选入物资字典信息！");
+        return;
+      }
+      this.closeSelDialog(selectData.id);
 
-        allUploadSMP() {
-            udiUpload(this.filterQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "上传成功！",
-                        });
-                    } else {
-                        this.$message({
-                            type: "error",
-                            message: response.message,
-                        });
-                    }
-                    this.$emit("cancelDialog", true);
-                })
-                .catch(() => {
-                    this.$message({
-                        type: "error",
-                        message: "上传失败",
-                    });
-                    this.$emit("cancelDialog", true);
-                });
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
+    },
+    allExport() {
+      this.filterQuery.customerId = store.getters.customerId;
+      insertFilter(this.filterQuery).then(response => {
+        this.loading = false;
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+          this.$emit("closeSelDialog", true);
+          this.closeSelDialog();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
 
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
-            this.getList();
-        },
-        handleModifyClick(row) {
-            this.editDialogVisible = true;
-            this.editQuery = row;
-            this.relevanceEdit = {
-                id: row.id,
-                thirdId: row.thirdId,
-                isUseDy: row.isUseDy,
-            };
-            this.checked = row.isUseDy == 1;
+    intentDetail() {
+      this.isImportUdi = false;
+      this.selectUdiDialogVisible = true;
+    },
 
-            let ttquery = {
-                id: row.id,
-                page: 1,
-                limit: 10,
-            };
+    intentImportErp(val) {
+      this.uuid = val.uuid;
+      this.relId = val.id;
+      this.isImport = true;
+      this.thisData = val;
+      this.selectErpDialogVisible = true;
+    },
+    uploadSMP() {
+      var selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.filterQuery.uuids.push(obj.uuid);
+      });
+      this.allUploadSMP();
+    },
 
-            this.getDetailList(ttquery);
-            this.getThirdSysDetail();
-        },
-        closeUdi(val) {
-            this.selectUdiDialogVisible = false;
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-            if (val) {
-                this.getList();
-            }
-        },
-        getThirdSysDetail() {
-            let query = {
-                id: this.relevanceEdit.id,
-            };
+    allUploadSMP() {
+      udiUpload(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: "上传成功！",
+            });
+          } else {
+            this.$message({
+              type: "error",
+              message: response.message,
+            });
+          }
+          this.$emit("cancelDialog", true);
+        })
+        .catch(() => {
+          this.$message({
+            type: "error",
+            message: "上传失败",
+          });
+          this.$emit("cancelDialog", true);
+        });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
 
-            thirdSysDetail(query)
-                .then((response) => {
-                    this.loading = false;
-                    this.sysList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.sysList = [];
-                });
-        },
-        checkSelectable(row) {
-            return !row.isSelect;
-        },
-        uploadErpProduct() {
-            updateErpProduct()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: response.data,
-                        });
-                        this.$emit("closeDialog", true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
 
-        closeDialog() {
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-        },
+    handeleDetailChange(val) {
+      this.detailQuery.page = val.page;
+      this.getDetailList();
+    },
 
-        selectSysParam() {
-            let query = {
-                paramKey: "smp_isUploadProuct",
-            };
-            selectSysParamByKey(query).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isUploadSmp = true;
-                    }
-                }
-            });
-            let query1 = {
-                paramKey: "upload_pi_file_enabled",
-            };
-            selectSysParamByKey(query1).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isImportFile = true;
-                    }
-                }
-            });
-            let query2 = {
-                paramKey: "upload_pi_file_url",
-            };
-            selectSysParamByKey(query2).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.paramValue;
-                }
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleModifyClick(row) {
+      this.editDialogVisible = true;
+      this.editQuery = row;
+      this.relevanceEdit = {
+        id: row.id,
+        thirdId: row.thirdId,
+        isUseDy: row.isUseDy,
+      };
+      this.checked = row.isUseDy == 1;
+      this.detailQuery = {
+        cpmctymc: row.cpmctymc,
+        manufactory: row.manufactory,
+        page: 1,
+        limit: 10,
+      };
+
+      this.getDetailList(this.detailQuery);
+      this.getThirdSysDetail();
+    },
+    closeUdi(val) {
+      this.selectUdiDialogVisible = false;
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    getThirdSysDetail() {
+      let query = {
+        id: this.relevanceEdit.id,
+      };
+
+      thirdSysDetail(query)
+        .then((response) => {
+          this.loading = false;
+          this.sysList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.sysList = [];
+        });
+    },
+    checkSelectable(row) {
+      return !row.isSelect;
+    },
+    uploadErpProduct() {
+      updateErpProduct()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: response.data,
             });
-        },
+            this.$emit("closeDialog", true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
     },
-    mounted() {
+
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
     },
-    components: {},
-    created() {
 
-        this.getList();
-        this.selectSysParam();
+    selectSysParam() {
+      let query = {
+        paramKey: "smp_isUploadProuct",
+      };
+      selectSysParamByKey(query).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isUploadSmp = true;
+          }
+        }
+      });
+      let query1 = {
+        paramKey: "upload_pi_file_enabled",
+      };
+      selectSysParamByKey(query1).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isImportFile = true;
+          }
+        }
+      });
+      let query2 = {
+        paramKey: "upload_pi_file_url",
+      };
+      selectSysParamByKey(query2).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.paramValue;
+        }
+      });
     },
+  },
+  mounted() {
+  },
+  components: {},
+  created() {
+
+    this.getList();
+    this.selectSysParam();
+  },
 };
 </script>
 <style scoped>
diff --git a/src/views/purchase/company/supCompanyAdd.vue b/src/views/purchase/company/supCompanyAdd.vue
index 31116e10..248f4348 100644
--- a/src/views/purchase/company/supCompanyAdd.vue
+++ b/src/views/purchase/company/supCompanyAdd.vue
@@ -31,8 +31,8 @@
           <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
-                <el-table-column label="联系人" prop="contacts"></el-table-column>
+                <el-table-column label="社会信用号" prop="creditNum"></el-table-column>
+                <el-table-column label="企业法人" prop="contacts"></el-table-column>
                 <el-table-column label="所属地区" prop="area"></el-table-column>
                 <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="审核状态" prop="auditStatus" width="120">
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 51cbd618..1e957ef1 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -11,7 +11,7 @@
         <div style="display: flex;">
           <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button>
           <el-button v-if="editType==2" type="primary" size="mini" @click="onRejectSubmit">审核拒绝</el-button>
-          <el-button v-if="editType==1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印</el-button>
+          <el-button v-if="editType==1 && auditType!=1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印</el-button>
         </div>
 
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
@@ -147,7 +147,7 @@
           <el-table-column label="确认说明" prop="auditComment" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button v-if="editType==1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
+              <el-button v-if="editType==1 && auditType!=1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
               </el-button>
               <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
               <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
@@ -259,7 +259,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirm">确认</el-button>
-        <el-button type="primary" @click="cancel">取消</el-button>
+
       </div>
     </el-dialog>
 
@@ -305,6 +305,10 @@ export default {
     editType: {//1：查询页面，2:审核页面，
       type: Object,
       required: true,
+    },
+    auditType: {
+      type: Object,
+      required: true
     }
   },
 
@@ -454,6 +458,8 @@ export default {
     this.getCompanyCertList();
     this.customerlist();
     this.selectedOptions = this.inputQuery.areaCode.split(",");
+
+
   },
   components: {
     draggable,
@@ -507,29 +513,18 @@ export default {
       return [
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
-    showImgViewer(row) {
-      var varindex = row.filePath.lastIndexOf(".");
-      var varext = row.filePath.substring(varindex + 1);
-      var isImage = this.isAssetTypeAnImage(varext);
-      if (isImage == true) {
-        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.push(response.data);
-          }
-        });
-        this.imgViewerVisible = true;
-        const m = (e) => {
-          e.preventDefault()
-        };
-        document.body.style.overflow = 'hidden';
-        document.addEventListener("touchmove", m, false); // 禁止页面滑动
-      } else {
-        this.toViewCompanyCert(row);
-      }
-
-
+    showImgViewer(row){
+      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;
@@ -649,7 +644,7 @@ export default {
     ,
     printSupCert(row) {
       var selectIds = [row.id];
-      let query = {moduleId: 8};
+      let query = {id: 1};
       this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
@@ -688,7 +683,7 @@ export default {
         this.$message.error("请先选择打印的证书！");
         return
       }
-      let query = {moduleId: 8};
+      let query = {id: 1};
       this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue
index 20c05f8b..6d855bc7 100644
--- a/src/views/purchase/company/supCompanyEditDialog.vue
+++ b/src/views/purchase/company/supCompanyEditDialog.vue
@@ -1,707 +1,696 @@
 <template>
-    <div>
-        <el-form :model="inputQuery" :rules="rules" ref="inputQuery" label-width="100px">
-            <el-card class="el-card" style="margin-top: -15px">
-                <div style="float: right; ">
-                    <el-button type="primary" size="mini" icon="search" @click="selectBasicCorp()">选入往来单位</el-button>
-                    <el-button type="primary" size="mini" icon="search" @click="onModifySubmit(0)">草稿保存</el-button>
-                    <el-button type="primary" size="mini" icon="search" @click="onModifySubmit(6)">提交审核</el-button>
-                </div>
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 35px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业名称:" label-width="150px" prop="companyName">
-                            <el-input
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="inputQuery.companyName"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditNum">
-                            <el-input
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="inputQuery.creditNum"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业类别:" label-width="150px" prop="classes">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.classes"
-                                placeholder="企业类别"
-                                style="width: 100%;"
-                            >
-                                <el-option v-if="classesDisplay" label="医院" value="1"></el-option>
-                                <el-option label="经营企业" value="2"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属地区:" label-width="150px" prop="area">
-                            <el-cascader
-                                size="small"
-                                :options="options"
-                                v-model="selectedOptions"
-                                placeholder="请选择所属地区"
-                                style="width: 100%"
-                                @change="handleChange"
-                            >
-                            </el-cascader>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="联系人:" label-width="150px" prop="contacts">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.contacts"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="详细地址:" label-width="150px" prop="detailAddr">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.detailAddr"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="联系电话:" label-width="150px" prop="mobile">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.mobile"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="邮箱:" label-width="150px" prop="email">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.email"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
-            <el-card>
-
-                <div style=" float: right;
+  <div>
+    <el-form :model="inputQuery" :rules="rules" ref="inputQuery" label-width="100px">
+      <el-card class="el-card" style="margin-top: -15px">
+        <div style="float: right; ">
+          <el-button type="primary" size="mini" icon="search" @click="onModifySubmit(0)">草稿保存</el-button>
+          <el-button type="primary" size="mini" icon="search" @click="onModifySubmit(6)">提交审核</el-button>
+        </div>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 35px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="企业名称:" label-width="150px" prop="companyName">
+              <el-select v-model="inputQuery.companyName" @change="getCompanyId" placeholder="请选择企业名称" style="width: 90%">
+              <el-option
+                v-for="item in maintainsList"
+                :key="item.name"
+                :label="item.name"
+                :value="item.id">
+                <span style="float: left">{{ item.name }}</span>
+              </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditNum">
+              <el-input
+                size="small"
+                splaceholder="请输入内容"
+                v-model="inputQuery.creditNum"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="企业类别:" label-width="150px" prop="classes">
+              <el-select
+                size="small"
+                v-model="inputQuery.classes"
+                placeholder="企业类别"
+                style="width: 100%;"
+              >
+                <el-option v-if="classesDisplay" label="医院" value="1"></el-option>
+                <el-option label="经营企业" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属地区:" label-width="150px" prop="area">
+              <el-cascader
+                size="small"
+                :options="options"
+                v-model="selectedOptions"
+                placeholder="请选择所属地区"
+                style="width: 100%"
+                @change="handleChange"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="联系人:" label-width="150px" prop="contacts">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.contacts"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="详细地址:" label-width="150px" prop="detailAddr">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.detailAddr"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="联系电话:" label-width="150px" prop="mobile">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.mobile"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="邮箱:" label-width="150px" prop="email">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.email"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card>
+
+        <div style=" float: right;
                         text-align: right;
                         margin-bottom: 8px;"
-                >
-
-                    <el-button type="primary" size="mini" icon="search" @click="selectCert"
-                               style="text-align:right"
-                    >选入资质证书
-                    </el-button
-                    >
-
-                    <el-button type="primary" size="mini" icon="search" @click="addCert"
-                               style="text-align:right"
-                    >添加资质证书
-                    </el-button
-                    >
-
-                </div>
-
-                <el-table v-loading="certLoading" :data="certList" style=" width: 100%;margin-top: 20px" border highlight-current-row>
-                    <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>
-                    <el-table-column label="生效期" prop="vailDate"></el-table-column>
-                    <el-table-column label="失效期" prop="expireDate"></el-table-column>
-                    <el-table-column label="确认状态" prop="auditStatus" width="120">
-                        <template slot-scope="scope">
-                            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                                {{ checkFlag[scope.row.auditStatus] }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="确认说明" prop="auditComment"></el-table-column>
-                  <el-table-column label="状态" prop="status" width="120">
-                    <template slot-scope="scope">
-                      <el-tag :type="(scope.row.status) | statusType">
-                        {{ statusFlag[scope.row.status] }}
-                      </el-tag>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" prop="remark"></el-table-column>
-                    <el-table-column label="操作" width="180">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="addCert(scope.row)"
-                                v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
-                            >编辑
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="toViewCompanyCert(scope.row)"
-                            >预览
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
-                                @click.native="deleteCompanyCert(scope.row)"
-                            >删除
-                            </el-button
-                            >
-
-                            <el-button
-                                type="text"
-                                size="small"
-                                v-if=" scope.row.auditStatus == 1 && scope.row.status==0"
-                                @click.native="disableCert(scope.row,1)"
-                            >禁用
-                            </el-button
-                            >
-
-                            <el-button
-                                type="text"
-                                size="small"
-                                v-if=" scope.row.auditStatus == 1 && scope.row.status==1"
-                                @click.native="disableCert(scope.row,0)"
-                            >启用
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-              <pagination
-                v-show="certTotal>0"
-                :total="certTotal"
-                :page.sync="certQuery.page"
-                :limit.sync="certQuery.limit"
-                @pagination="certHandleCurrentChange"
-
-              ></pagination>
-            </el-card>
-
-            <el-dialog
-                title="添加资质证书"
-                :visible.sync="addCertVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="70%"
-                v-if="addCertVisible"
-                append-to-body
-                @close='closeLocalDialog'
-            >
-                <companyAddCert
-                    :closeDialog="closeLocalDialog"
-                    :inputQuery="inputQuery"
-                    :addType="addType"
-                    :editTye="editTye"
-                ></companyAddCert>
-            </el-dialog>
-
-
-            <el-dialog
-                title="选入往来单位"
-                :visible.sync="selectCorpVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="70%"
-                v-if="selectCorpVisible"
-                append-to-body
-                @close='closeLocalDialog'
-            >
-                <corpMaintainSelect
-                    :closeDialog="closeSelectCorpDialog"
-                ></corpMaintainSelect>
-            </el-dialog>
-
-
-            <el-dialog
-                title="选入资质证书"
-                :visible.sync="selectCertVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="70%"
-                v-if="selectCertVisible"
-                append-to-body
-                @close='closeLocalDialog'
-            >
-                <supCertSetSelectDialog
-                    :certType="certType"
-                    :closeDialog="closeLocalDialog"
-                    :customerId="customerId"
-                ></supCertSetSelectDialog>
-            </el-dialog>
-
-        </el-form>
-    </div>
+        >
+
+          <el-button type="primary" size="mini" icon="search" @click="selectCert"
+                     style="text-align:right"
+          >选入资质证书
+          </el-button
+          >
+
+          <el-button type="primary" size="mini" icon="search" @click="addCert"
+                     style="text-align:right"
+          >添加资质证书
+          </el-button
+          >
+
+        </div>
+
+        <el-table v-loading="certLoading" :data="certList" style=" width: 100%;margin-top: 20px" border
+                  highlight-current-row>
+          <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>
+          <el-table-column label="生效期" prop="vailDate"></el-table-column>
+          <el-table-column label="失效期" prop="expireDate"></el-table-column>
+          <el-table-column label="证书状态">
+            <template slot-scope="scope">
+              <span>{{ expire[scope.row.status] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" prop="auditStatus" width="120">
+            <template slot-scope="scope">
+              <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+                {{ checkFlag[scope.row.auditStatus] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+
+          <el-table-column label="操作" width="180">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click.native="addCert(scope.row)"
+                v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
+              >编辑
+              </el-button
+              >
+              <el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">预览</el-button>
+              <el-button
+                type="text"
+                size="small"
+                v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
+                @click.native="deleteCompanyCert(scope.row)"
+              >删除
+              </el-button
+              >
+
+              <el-button
+                type="text"
+                size="small"
+                v-if=" scope.row.auditStatus == 1 && scope.row.status==0"
+                @click.native="disableCert(scope.row,1)"
+              >禁用
+              </el-button
+              >
+
+              <el-button
+                type="text"
+                size="small"
+                v-if=" scope.row.auditStatus == 1 && scope.row.status==1"
+                @click.native="disableCert(scope.row,0)"
+              >启用
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                         :url-list="imgList"/>
+        <pagination
+          v-show="certTotal>0"
+          :total="certTotal"
+          :page.sync="certQuery.page"
+          :limit.sync="certQuery.limit"
+          @pagination="certHandleCurrentChange"
+
+        ></pagination>
+      </el-card>
+
+      <el-dialog
+        title="添加资质证书"
+        :visible.sync="addCertVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+        v-if="addCertVisible"
+        append-to-body
+        @close='closeLocalDialog'
+      >
+        <companyAddCert
+          :closeDialog="closeLocalDialog"
+          :inputQuery="inputQuery"
+          :addType="addType"
+          :editTye="editTye"
+        ></companyAddCert>
+      </el-dialog>
+
+
+
+
+      <el-dialog
+        title="选入资质证书"
+        :visible.sync="selectCertVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+        v-if="selectCertVisible"
+        append-to-body
+        @close='closeLocalDialog'
+      >
+        <supCertSetSelectDialog
+          :certType="certType"
+          :closeDialog="closeLocalDialog"
+          :customerId="customerId"
+        ></supCertSetSelectDialog>
+      </el-dialog>
+
+    </el-form>
+  </div>
 </template>
 
 <script>
-import {modifyCompany, addCompany, bindCorp} from "@/api/purchase/supCompany";
+import {modifyCompany, addCompany, bindCorp, previewImage} from "@/api/purchase/supCompany";
 import store from "@/store/index";
 import {regionDataPlus, CodeToText} from "element-china-area-data";
 import {filterCompanyCert, deleteCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert";
 import corpMaintainSelect from "@/views/basic/corpMaintain/corpMaintainSelect"
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
 import draggable from "vuedraggable";
-import {getUUID} from "@/utils/strUtil";
+import {getUUID, isBlank} from "@/utils/strUtil";
 import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog";
+import {getBasicUnitMaintains, getCorpList} from "@/api/basic/basicUnitMaintain";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 
 export default {
 
-    name: "supCompanyEdit",
-    props: {
-        closeDialog: {
-            type: Function,
+  name: "supCompanyEdit",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    editType: {
+      type: Number,
+      required: true,
+    }
+  },
+
+
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      headers: {},
+      classesDisplay: false,
+      selectedOptions: [],
+      imgViewerVisible: false,
+      imgList: [],
+      options: regionDataPlus,
+      rules: {
+        companyName: [
+          {
             required: true,
-        },
-        inputQuery: {
-            type: Object,
+            message: "请输入企业名称",
+            trigger: "blur"
+          }
+        ],
+        creditNum: [
+          {
             required: true,
-        },
-        editType: {
-            type: Number,
+            message: "请输入统一社会信用代码",
+            trigger: "blur"
+          }
+        ],
+        classes: [
+          {
             required: true,
-        }
-    },
-
-
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            headers: {},
-            classesDisplay: false,
-            selectedOptions: [],
-            options: regionDataPlus,
-            rules: {
-                companyName: [
-                    {
-                        required: true,
-                        message: "请输入企业名称",
-                        trigger: "blur"
-                    }
-                ],
-                creditNum: [
-                    {
-                        required: true,
-                        message: "请输入统一社会信用代码",
-                        trigger: "blur"
-                    }
-                ],
-                classes: [
-                    {
-                        required: true,
-                        message: "请选择企业类别",
-                        trigger: "change"
-                    }
-                ],
-                area: [
-                    {
-                        required: true,
-                        message: "请选择所属地区",
-                        trigger: "change"
-                    }
-                ],
-                detailAddr: [
-                    {
-                        required: true,
-                        message: "请输入详细地址",
-                        trigger: "change"
-                    }
-                ],
-                contacts: [
-                    {
-                        required: true,
-                        message: "请输入联系人",
-                        trigger: "change"
-                    }
-                ],
-                mobile: [
-                    {
-                        required: true,
-                        message: "请输入联系电话",
-                        trigger: "change"
-                    }
-                ],
-                email: [
-                    {
-                        required: true,
-                        message: "请输入邮箱",
-                        trigger: "change"
-                    }
-                ],
-                updateCause: [
-                    {
-                        required: true,
-                        message: "请输入变更原因",
-                        trigger: "change"
-                    }
-                ],
-
-            },
-            uploadUrl: "",
-            fileUrl: "",
-            certFileUrl: "",
-            url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
-            certQuery: {
-                page: 1,
-                limit: 20
-            },
-          statusFlag: {
-            0: "有效",
-            1: "失效",
-          },
-            certList: [],
-            certTotal: 0,
-            certLoading: false,
-            addCertVisible: false,
-            salesmanQuery: {
-                name: "",
-                page: 1,
-                limit: 20
-            },
-            salesmanList: [],
-            salesmanTotal: 0,
-            salesmanLoading: false,
-            addSalesmanVisible: false,
-            certTypeMap: {
-                1: '身份证'
-            },
-            selectLocalVisible: false,
-            productQuery: {
-                ylqxzcrbarmc: "",
-                cpmctymc: "",
-                ggxh: "",
-                page: 1,
-                limit: 20
-            },
-            productList: [],
-            productTotal: 0,
-            productLoading: false,
-            uuid: null,
-            companyApplyUpdateVisible: false,
-            companyEditDisabled: true,
-            companyEditButtonStr: "编辑",
-            addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
-            checkFlag: {
-              0: "未认证",
-              1: "已确认",
-              2: "已拒绝",
-              3: "变更未确认",
-              6: "未确认",
-            },
-            editTye: 1,
-
-            selectCorpVisible: false,
-            selectCertVisible: false,
-            certType: 1,
-            customerId: null,
+            message: "请选择企业类别",
+            trigger: "change"
+          }
+        ],
+        area: [
+          {
+            required: true,
+            message: "请选择所属地区",
+            trigger: "change"
+          }
+        ],
+        detailAddr: [
+          {
+            required: true,
+            message: "请输入详细地址",
+            trigger: "change"
+          }
+        ],
+        contacts: [
+          {
+            required: true,
+            message: "请输入联系人",
+            trigger: "change"
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            message: "请输入联系电话",
+            trigger: "change"
+          }
+        ],
+        email: [
+          {
+            required: true,
+            message: "请输入邮箱",
+            trigger: "change"
+          }
+        ],
+        updateCause: [
+          {
+            required: true,
+            message: "请输入变更原因",
+            trigger: "change"
+          }
+        ],
 
-        };
+      },
+      uploadUrl: "",
+      fileUrl: "",
+      certFileUrl: "",
+      url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
+      certQuery: {
+        page: 1,
+        limit: 20
+      },
+      expire: {
+        0: "有效",
+        1: "失效"
+      },
+      certList: [],
+      certTotal: 0,
+      certLoading: false,
+      addCertVisible: false,
+      salesmanQuery: {
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      salesmanList: [],
+      salesmanTotal: 0,
+      salesmanLoading: false,
+      addSalesmanVisible: false,
+      certTypeMap: {
+        1: '身份证'
+      },
+      selectLocalVisible: false,
+      productQuery: {
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        ggxh: "",
+        page: 1,
+        limit: 20
+      },
+      maintainsList:[],
+      productList: [],
+      productTotal: 0,
+      productLoading: false,
+      uuid: null,
+      companyApplyUpdateVisible: false,
+      companyEditDisabled: true,
+      companyEditButtonStr: "编辑",
+      addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
+      checkFlag: {
+        0: "草稿",
+        1: "已通过",
+        2: "已拒绝",
+        3: "变更未审核",
+        6: "未审核",
+      },
+      editTye: 1,
+
+      selectCorpVisible: false,
+      selectCertVisible: false,
+      certType: 1,
+      customerId: null,
+
+    };
+  }
+  ,
+  created() {
+  if(isBlank(this.inputQuery.customerId)){
+    this.getCompanyCertList();
+  }
+    this.getBasicUnitMaintainsList();
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    if (this.inputQuery.areaCode != null)
+      this.selectedOptions = this.inputQuery.areaCode.split(",");
+  }
+  ,
+  components: {
+    draggable, companyAddCert, corpMaintainSelect, supCertSetSelectDialog,ElImageViewer
+  }
+  ,
+  methods: {
+
+    onModifySubmit(val) {
+
+      this.inputQuery.auditStatus = val;
+      if (this.editType == 0) { //新增保存
+
+        this.$refs["inputQuery"].validate(valid => {
+          if (valid) {
+            this.$confirm("是否确定提交保存?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(() => {
+              this.loading = true;
+              addCompany(this.inputQuery).then(response => {
+                this.loading = false;
+                if (response.code === 20000) {
+                  this.$message.success("提交成功");
+                  this.closeDialog();
+                } else {
+                  this.$message.error(response.message);
+                }
+              });
+            }).catch(() => {
+            });
+          } else {
+            return false;
+          }
+        });
+      } else {                //编辑保存
+        this.$refs["inputQuery"].validate(valid => {
+          if (valid) {
+            this.$confirm("是否提交变更?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(() => {
+              this.loading = true;
+              modifyCompany(this.inputQuery).then(response => {
+                this.loading = false;
+                if (response.code === 20000) {
+                  this.$message.success("提交成功");
+                  this.closeDialog();
+                } else {
+                  this.$message.error(response.message);
+                  this.inputQuery.auditStatus = 0
+                }
+              });
+            }).catch(() => {
+            });
+          } else {
+            return false;
+          }
+        });
+      }
     }
     ,
-    created() {
-        if (this.editType == 0) {
-            this.inputQuery.customerId = getUUID("");
-        }else{
-            this.customerId=this.inputQuery.customerId
-            this.getCompanyCertList();
+    showImgViewer(row) {
+      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.headers = {
-            ADMIN_ID: store.getters.adminId,
-            ADMIN_TOKEN: store.getters.token,
-        };
-
-        this.customerId = this.inputQuery.customerId;
-
-        if (this.inputQuery.areaCode != null)
-            this.selectedOptions = this.inputQuery.areaCode.split(",");
+      });
+      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);
+    },
+    selectBasicCorp() {
+      this.selectCorpVisible = true;
     }
     ,
-    components: {
-        draggable, companyAddCert, corpMaintainSelect, supCertSetSelectDialog
+    getCompanyId(){
+      this.inputQuery.customerId= this.maintainsList.find(item => item.id == this.inputQuery.companyName).erpId
+      this.inputQuery.companyName= this.maintainsList.find(item => item.id == this.inputQuery.companyName).name
+      this.customerId=this.inputQuery.customerId;
+    },
+
+    cancelDialog() {
+      this.closeDialog();
     }
     ,
-    methods: {
-
-        onModifySubmit(val) {
-
-            this.inputQuery.auditStatus = val;
-            if (this.editType == 0) { //新增保存
-
-                this.$refs["inputQuery"].validate(valid => {
-                    if (valid) {
-                        this.$confirm("是否确定提交保存?", "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        }).then(() => {
-                            this.loading = true;
-
-                            addCompany(this.inputQuery).then(response => {
-                                this.loading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success("提交成功");
-                                    this.closeDialog();
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            });
-                        }).catch(() => {
-                        });
-                    } else {
-                        return false;
-                    }
-                });
-            } else {                //编辑保存
-                this.$refs["inputQuery"].validate(valid => {
-                    if (valid) {
-                        this.$confirm("是否提交变更?", "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        }).then(() => {
-                            this.loading = true;
-                            modifyCompany(this.inputQuery).then(response => {
-                                this.loading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success("提交成功");
-                                    this.closeDialog();
-                                } else {
-                                    this.$message.error(response.message);
-                                    this.inputQuery.auditStatus=0
-                                }
-                            });
-                        }).catch(() => {
-                        });
-                    } else {
-                        return false;
-                    }
-                });
-            }
-        }
-        ,
 
-        onAuditSubmit() {
+    closeLocalDialog() {
+      this.addCertVisible = false;
+      this.selectCertVisible = false;
+      this.getCompanyCertList();
+    }
+    ,
 
+    handleChange(value) {
+      var area = '';
+      for (var i = 0; i <= 2; i++) {
+        if (CodeToText[value[i]] != null && CodeToText[value[i]] != undefined) {
+          area += CodeToText[value[i]];
         }
-        ,
+      }
+      this.inputQuery.area = area;
+      this.inputQuery.areaCode = value.toString();
+    }
+    ,
 
-        selectBasicCorp() {
-            this.selectCorpVisible = true;
-        }
-        ,
+    addCert(row) {
+      if(isBlank(this.inputQuery.customerId)){
+        return this.$message.error("请先选择供应商");
+      }
+
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.formName = 2
+        this.inputQuery.formData = row;
+        this.editTye = 2;
+      } else {
+        this.formName = 1;
+        this.inputQuery.formData = {};
+        this.inputQuery.formData.addType = 1;
+        this.editTye = 1;
+      }
+      this.addCertVisible = true;
+    }
+    ,
 
+    selectCert() {
+      if(isBlank(this.inputQuery.customerId)){
+        return this.$message.error("请先选择供应商");
+      }
+      this.selectCertVisible = true;
+    },
 
-        cancelDialog() {
-            this.closeDialog();
-        }
-        ,
+    certHandleCurrentChange(val) {
+      this.certQuery.page = val.page;
+      this.getCompanyCertList();
+    }
+    ,
+    getBasicUnitMaintainsList() {
+      getCorpList()
+        .then((response) => {
+          this.maintainsList = response.data || [];
+        })
+        .catch(() => {
+          this.maintainsList = [];
+        });
 
-        closeLocalDialog() {
-            this.addCertVisible = false;
-            this.selectCertVisible = false;
-            this.getCompanyCertList();
-        }
-        ,
-
-
-        closeSelectCorpDialog(val) {
-            if (val != null) {
-                let query = {
-                    customerId: val.erpId
-                };
-                bindCorp(query).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.inputQuery = response.data;
-                        this.customerId=val.erpId
-                        this.selectCorpVisible = false;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
+    },
 
-            }
-        },
-
-        handleChange(value) {
-            var area='';
-            for(var i=0;i<=2;i++){
-              if(CodeToText[value[i]]!=null && CodeToText[value[i]]!=undefined){
-                area+=CodeToText[value[i]];
-              }
-          }
-            this.inputQuery.area = area;
-            this.inputQuery.areaCode = value.toString();
-        }
-        ,
 
-        addCert(row) {
-            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
-                this.formName = 2
-                this.inputQuery.formData = row;
-                this.editTye = 2;
+    getCompanyCertList() {
+      debugger
+      this.certLoading = true;
+      this.certQuery.customerId = this.inputQuery.customerId;
+      console.log(this.customerId)
+      filterCompanyCert(this.certQuery)
+        .then((response) => {
+          this.certLoading = false;
+          this.certList = response.data.list || [];
+          this.certTotal = response.data.total;
+        })
+        .catch(() => {
+          this.certLoading = false;
+          this.certList = [];
+        });
+    }
+    ,
+
+    deleteCompanyCert(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        let tquery = {
+          id: row.id,
+          filePath: row.filePath,
+        };
+        deleteCompanyCert(tquery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
             } else {
-                this.formName = 1;
-                this.inputQuery.formData = {};
-                this.inputQuery.formData.addType=1;
-                this.editTye = 1;
+              this.$message.error(response.message);
             }
-            this.addCertVisible = true;
-        }
-        ,
-
-        selectCert() {
-            this.selectCertVisible = true;
-        },
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    }
+    ,
 
-        toViewCompanyCert(row) {
-            this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-            window.open(this.certFileUrl + row.filePath);
-        }
-        ,
 
-        certHandleCurrentChange(val) {
-            this.certQuery.page = val.page;
-            this.getCompanyCertList();
-        }
-        ,
-
-        getCompanyCertList() {
-            this.certLoading = true;
-            this.certQuery.customerId = this.customerId;
-            filterCompanyCert(this.certQuery)
-                .then((response) => {
-                    this.certLoading = false;
-                    this.certList = response.data.list || [];
-                    this.certTotal=response.data.total;
-                })
-                .catch(() => {
-                    this.certLoading = false;
-                    this.certList = [];
-                });
+    disableCert(row, status) {
+      row.status = status;
+      updateCompanyCert(row).then(response => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.$message.success("更新成功！");
+          this.getCompanyCertList();
+        } else {
+          this.$message.error(response.message);
         }
-        ,
-
-        deleteCompanyCert(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tquery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                };
-                deleteCompanyCert(tquery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getCompanyCertList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
-        }
-        ,
-
+      });
 
-        disableCert(row, status) {
-            row.status = status;
-            updateCompanyCert(row).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.$message.success("更新成功！");
-                    this.getCompanyCertList();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-
-        },
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        }
-        ,
-      statusType(status) {
-        const statusMap = {
-          0: "success",
-          1: "danger",
-        };
-        return statusMap[status];
-      },
+    },
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+      };
+      return statusMap[status];
     }
     ,
+  }
+  ,
 }
 ;
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 120px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 120px;
 }
 
 .text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-card {
-    margin-right: 20px;
-    margin-top: 15px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  margin-top: 15px;
+  /*transition: all .5s;*/
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 34395860..1955e047 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -13,7 +13,7 @@
           <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button>
           <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onRejectSubmit">审核拒绝
           </el-button>
-          <el-button v-if="editType==1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印
+          <el-button v-if="editType==1 && auditType!=1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印
           </el-button>
         </div>
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
@@ -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>
@@ -199,7 +200,7 @@
           </el-table-column>
           <el-table-column label="操作" width="250">
             <template slot-scope="scope">
-              <el-button v-if="editType==1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
+              <el-button v-if="editType==1 && auditType!=1" type="text" size="small" @click.native="printSupCert(scope.row)">打印
               </el-button>
               <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
               <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
@@ -347,6 +348,10 @@ export default {
     editType: {
       type: Object,
       required: true,
+    },
+    auditType: {
+      type: Object,
+      required: true
     }
   },
   data() {
@@ -545,15 +550,12 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      var varindex = row.filePath.lastIndexOf(".");
-      var varext = row.filePath.substring(varindex + 1);
-      var isImage = this.isAssetTypeAnImage(varext);
-      if (isImage == true) {
+
         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.push(response.data);
+            this.imgList=response.data;
           }
         });
         this.imgViewerVisible = true;
@@ -562,11 +564,6 @@ export default {
         };
         document.body.style.overflow = 'hidden';
         document.addEventListener("touchmove", m, false); // 禁止页面滑动
-      } else {
-        this.toViewCompanyCert(row);
-      }
-
-
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
@@ -783,9 +780,9 @@ export default {
         return;
       }
       // 限制上传文件的大小
-      const isLt = file.size / 1024 / 1024 / 10 <= 1;
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
       if (!isLt) {
-        this.$message.error("上传文件大小不能超过 10MB");
+        this.$message.error("上传文件大小不能超过 30MB");
         for (let i = 0; i < fileList.length; i++) {
           if (fileList[i].uid === uid) {
             fileList.splice(i, 1)
@@ -808,7 +805,7 @@ export default {
     },
     printSupCert(row) {
       var selectIds = [row.id];
-      let query = {moduleId: 9};
+      let query = {id: 2};
       this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
@@ -847,7 +844,7 @@ export default {
         this.$message.error("请先选择打印的证书！");
         return
       }
-      let query = {moduleId: 9};
+      let query = {id: 2};
       this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index 63add753..84cabe63 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -1,729 +1,767 @@
 <template>
-    <div>
-        <el-form
-            :model="inputQuery"
-            :rules="rules"
-            ref="inputQuery"
-            label-width="100px"
-            style="margin-top: -30px"
-        >
-            <el-card class="el-card">
-
-                <div style="float:right ">
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 0"
-                        @click="addOrModifyCompany(0)"
-                    >草稿保存
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 0|| inputQuery.auditStatus == 6"
-                        @click="onModifySubmit(6)"
-                    >提交审核
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 3|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
-                        @click="onModifySubmit(3)"
-                    >提交审核
-                    </el-button
-                    >
-                </div>
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 40px">
-                    <el-col :span="10" class="el-col" v-if="fromType==2">
-                        <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
-                            <el-select
-                                v-model="inputQuery.customerId"
-                                filterable
-                                remote
-                                clearable="true"
-                                :disabled="editType!=0"
-                                reserve-keyword
-                                placeholder="请输入供应商名称"
-                                :remote-method="findMethod"
-                                :loading="loading"
-                                style="width: 100%;"
-                                @change="unitChange"
-                            >
-                                <el-option
-                                    v-for="item in fromOptions"
-                                    :key="item.customerId"
-                                    :label="item.companyName"
-                                    :value="item.customerId"
-                                >
-                                    <span style="float: left">{{ item.companyName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item
-                        >
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业名称:" label-width="150px" prop="companyName">
-                            <el-input
-                                size="small"
-                                placeholder="请输入企业名称"
-                                v-model="inputQuery.companyName"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="统一社会信用代码:" label-width="150px" prop="creditCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入统一社会信用代码"
-                                v-model="inputQuery.creditCode"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="企业类型:" label-width="150px" prop="companyType">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.companyType"
-                                placeholder="请选择企业类型"
-                                style="width: 100%;"
-                            >
-                                <el-option label="境内企业" value="1"></el-option>
-                                <el-option label="境外企业" value="2"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="登记状态:" label-width="150px" prop="registerStatus">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.registerStatus"
-                                placeholder="请选择登记状态"
-                                style="width: 100%;"
-                            >
-                                <el-option label="续存（在营，开业，在册）" value="1"></el-option>
-                                <el-option label="吊销" value="2"></el-option>
-                                <el-option label="注销" value="3"></el-option>
-                                <el-option label="迁出" value="4"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所在地区:" label-width="150px" prop="placeArea">
-                            <el-cascader
-                                size="small"
-                                :options="options"
-                                v-model="selectedOptions"
-                                placeholder="请选择所在地区"
-                                style="width: 100%"
-                                @change="handleChange"
-                            >
-                            </el-cascader>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="生产地区:" label-width="150px" prop="productionArea">
-                            <el-cascader
-                                size="small"
-                                :options="options"
-                                v-model="selectedOptions2"
-                                placeholder="请选择生产地区"
-                                style="width: 100%"
-                                @change="handleChange2"
-                            >
-                            </el-cascader>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所在地址:" label-width="150px" prop="placeAddress">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.placeAddress"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="生产地址:" label-width="150px" prop="productionAddress">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.productionAddress"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="20" class="el-col">
-                        <el-form-item label="备注:" label-width="150px" prop="remark">
-                            <el-input
-                                type="textarea"
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.remark"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
-
-            <el-card class="el-card">
-                <div style="float:right ">
-
-                    <el-button type="primary" size="mini" icon="search" @click="selectCert"
-                    >选入资质证书
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        @click="addCert()"
-                    >添加资质证书
-                    </el-button
-                    >
-
-                </div>
-                <el-table v-loading="certLoading" :data="certList" style="width: 100%;margin-top: 40px"  border highlight-current-row>
-                    <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="name"></el-table-column>
-                    <el-table-column label="生效期" prop="vailDate"></el-table-column>
-                    <el-table-column label="失效期" prop="expireDate"></el-table-column>
-                    <el-table-column label="审核状态" prop="auditStatus" width="120">
-                        <template slot-scope="scope">
-                            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                                {{ checkFlag[scope.row.auditStatus] }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="状态" prop="status" width="120">
-                        <template slot-scope="scope">
-                            <el-tag :type="(scope.row.status) | statusType">
-                                {{ statusFlag[scope.row.status] }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注" prop="remark"></el-table-column>
-                    <el-table-column label="操作"  width="250">
-                        <template slot-scope="scope">
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="addCert(scope.row)"
-                            >编辑
-                            </el-button
-                            >
-
-                            <el-button
-                                type="text"
-                                size="small"
-                                @click.native="toViewCompanyCert(scope.row)"
-                            >预览
-                            </el-button
-                            >
-                            <el-button
-                                type="text"
-                                size="small"
-                                v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
-                                @click.native="deleteCompanyCert(scope.row)"
-                            >删除
-                            </el-button
-                            >
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-              <pagination
-                v-show="certTotal>0"
-                :total="certTotal"
-                :page.sync="certQuery.page"
-                :limit.sync="certQuery.limit"
-                @pagination="certHandleCurrentChange"
-
-              ></pagination>
-            </el-card>
-
-            <el-dialog
-                title="添加资质证书"
-                :visible.sync="addCertVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="70%"
-                v-if="addCertVisible"
-                append-to-body
-                @close='closeLocalDialog'
-            >
-                <companyAddCert
-                    :closeDialog="closeLocalDialog"
-                    :inputQuery="inputQuery"
-                    :addType="addType"
-                    :editTye="editTye"
-                ></companyAddCert>
-            </el-dialog>
-            <el-dialog
-                title="选入资质证书"
-                :visible.sync="selectCertVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="70%"
-                v-if="selectCertVisible"
-                append-to-body
-                @close='closeLocalDialog'
+  <div>
+    <el-form
+      :model="inputQuery"
+      :rules="rules"
+      ref="inputQuery"
+      label-width="100px"
+      style="margin-top: -30px"
+    >
+      <el-card class="el-card">
+
+        <div style="float:right ">
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 0"
+            @click="addOrModifyCompany(0)"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 0|| inputQuery.auditStatus == 6"
+            @click="onModifySubmit(6)"
+          >提交审核
+          </el-button
+          >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 3|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
+            @click="onModifySubmit(3)"
+          >提交审核
+          </el-button
+          >
+        </div>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 40px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
+              <el-select
+                v-model="inputQuery.customerId"
+                filterable
+                remote
+                clearable="true"
+                :disabled="editType!=0"
+                reserve-keyword
+                placeholder="请输入供应商名称"
+                :remote-method="findMethod"
+                :loading="loading"
+                style="width: 100%;"
+                @change="unitChange"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.customerId"
+                  :label="item.companyName"
+                  :value="item.customerId"
+                >
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item
             >
-                <supCertSetSelectDialog
-                    :certType="certType"
-                    :manufacturerId="manufacturerId"
-                    :customerId="customerId"
-                    :closeDialog="closeLocalDialog"
-                ></supCertSetSelectDialog>
-            </el-dialog>
-        </el-form>
-    </div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="生产企业:" label-width="150px" prop="companyName">
+              <el-input
+                size="small"
+                placeholder="请输入生产企业"
+                v-model="inputQuery.companyName"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="社会信用号:" label-width="150px" prop="creditCode">
+              <el-input
+                size="small"
+                placeholder="请输入社会信用号"
+                v-model="inputQuery.creditCode"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="境内境外企业:" label-width="150px" prop="companyType">
+              <el-select
+                size="small"
+                v-model="inputQuery.companyType"
+                placeholder="请选择境内境外企业"
+                style="width: 100%;"
+                @input="companyTypeChange()"
+              >
+                <el-option label="境内企业" value="1"></el-option>
+                <el-option label="境外企业" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="登记状态:" label-width="150px" prop="registerStatus">
+              <el-select
+                size="small"
+                v-model="inputQuery.registerStatus"
+                placeholder="请选择登记状态"
+                style="width: 100%;"
+              >
+                <el-option label="续存（在营，开业，在册）" value="1"></el-option>
+                <el-option label="吊销" value="2"></el-option>
+                <el-option label="注销" value="3"></el-option>
+                <el-option label="迁出" value="4"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所在地区:" label-width="150px" prop="placeArea">
+              <el-cascader
+                size="small"
+                :options="options"
+                v-model="selectedOptions"
+                placeholder="请选择所在地区"
+                style="width: 100%"
+                @change="handleChange"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="生产地区:" label-width="150px" prop="productionArea">
+              <el-cascader
+                size="small"
+                :options="options"
+                v-model="selectedOptions2"
+                placeholder="请选择生产地区"
+                style="width: 100%"
+                @change="handleChange2"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所在地址:" label-width="150px" prop="placeAddress">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.placeAddress"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="生产地址:" label-width="150px" prop="productionAddress">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.productionAddress"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="代理商名称:" label-width="150px" prop="agentName">
+              <el-input
+                size="small"
+                placeholder="请输入代理商名称"
+                v-model="inputQuery.agentName"
+                :disabled="inputQuery.companyType==1"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="20" class="el-col">
+            <el-form-item label="备注:" label-width="150px" prop="remark">
+              <el-input
+                type="textarea"
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.remark"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="el-card">
+        <div style="float:right ">
+
+          <el-button type="primary" size="mini" icon="search" @click="selectCert"
+          >选入资质证书
+          </el-button
+          >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            @click="addCert()"
+          >添加资质证书
+          </el-button
+          >
+
+        </div>
+        <el-table v-loading="certLoading" :data="certList" style="width: 100%;margin-top: 40px" border
+                  highlight-current-row
+        >
+          <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>
+          <el-table-column label="生效期" prop="vailDate"></el-table-column>
+          <el-table-column label="失效期" prop="expireDate"></el-table-column>
+          <el-table-column label="审核状态" prop="auditStatus" width="120">
+            <template slot-scope="scope">
+              <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+                {{ checkFlag[scope.row.auditStatus] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="status" width="120">
+            <template slot-scope="scope">
+              <el-tag :type="(scope.row.status) | statusType">
+                {{ statusFlag[scope.row.status] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+          <el-table-column label="操作" width="250">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click.native="addCert(scope.row)">编辑</el-button>
+              <el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">预览</el-button>
+              <el-button type="text" size="small"
+                         v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
+                         @click.native="deleteCompanyCert(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
+
+        <pagination
+          v-show="certTotal>0"
+          :total="certTotal"
+          :page.sync="certQuery.page"
+          :limit.sync="certQuery.limit"
+          @pagination="certHandleCurrentChange"
+
+        ></pagination>
+      </el-card>
+
+      <el-dialog
+        title="添加资质证书"
+        :visible.sync="addCertVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+        v-if="addCertVisible"
+        append-to-body
+        @close="closeLocalDialog"
+      >
+        <companyAddCert
+          :closeDialog="closeLocalDialog"
+          :inputQuery="inputQuery"
+          :addType="addType"
+          :editTye="editTye"
+        ></companyAddCert>
+      </el-dialog>
+      <el-dialog
+        title="选入资质证书"
+        :visible.sync="selectCertVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+        v-if="selectCertVisible"
+        append-to-body
+        @close="closeLocalDialog"
+      >
+        <supCertSetSelectDialog
+          :certType="certType"
+          :manufacturerId="manufacturerId"
+          :customerId="customerId"
+          :closeDialog="closeLocalDialog"
+        ></supCertSetSelectDialog>
+      </el-dialog>
+    </el-form>
+  </div>
 </template>
 
 <script>
-import {getCompanyInfo, addOrModifyCompany} from "../../../api/purchase/supManufacturer";
-import {provinceAndCityData, regionData, provinceAndCityDataPlus, regionDataPlus, CodeToText, TextToCode,} from "element-china-area-data";
-import {filterCompanyCert, deleteCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert";
-import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
-import draggable from "vuedraggable";
-import {getSupComapnys} from "@/api/purchase/supCompany";
-import {getUUID} from "@/utils/strUtil";
-import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog";
-
+import { getCompanyInfo, addOrModifyCompany } from '../../../api/purchase/supManufacturer'
+import {
+  provinceAndCityData,
+  regionData,
+  provinceAndCityDataPlus,
+  regionDataPlus,
+  CodeToText,
+  TextToCode
+} from 'element-china-area-data'
+import { filterCompanyCert, deleteCompanyCert, updateCompanyCert } from '../../../api/purchase/companyCert'
+import companyAddCert from '@/views/purchase/cert/supCertAddDialog'
+import draggable from 'vuedraggable'
+import { getSupComapnys, previewImage } from '@/api/purchase/supCompany'
+import { getUUID } from '@/utils/strUtil'
+import supCertSetSelectDialog from '@/views/purchase/cert/supCertSetSelectDialog'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
 export default {
-    name: "supManufacturerEdit",
-    props: {
-        addCloseDialog: {
-            type: Function,
+  name: 'supManufacturerEdit',
+  props: {
+    addCloseDialog: {
+      type: Function,
+      required: true
+    },
+    inputQuery: {
+      type: Object,
+      required: true
+    },
+    editType: {
+      type: Object,
+      required: true
+    },
+    fromType: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      loading: false,
+      classesDisplay: false,
+      selectedOptions: [],
+      selectedOptions2: [],
+      imgViewerVisible: false,
+      imgList: [],
+      options: regionData,
+      rules: {
+
+        customerId: [
+          {
             required: true,
-        },
-        inputQuery: {
-            type: Object,
+            message: '请选择所属供应商',
+            trigger: 'blur'
+          }
+        ],
+
+        companyName: [
+          {
             required: true,
-        },
-        editType: {
-            type: Object,
+            message: '请输入企业名称',
+            trigger: 'blur'
+          }
+        ],
+        creditCode: [
+          {
             required: true,
-        },
-        fromType: {
-            type: Object,
+            message: '请输入统一社会信用代码',
+            trigger: 'blur'
+          }
+        ],
+        companyType: [
+          {
             required: true,
-        }
-    },
-    data() {
-        return {
-            BASE_URL: process.env.VUE_APP_BASE_API,
-            loading: false,
-            classesDisplay: false,
-            selectedOptions: [],
-            selectedOptions2: [],
-            options: regionData,
-            rules: {
-
-                customerId: [
-                    {
-                        required: true,
-                        message: "请选择所属供应商",
-                        trigger: "blur"
-                    }
-                ],
-
-                companyName: [
-                    {
-                        required: true,
-                        message: "请输入企业名称",
-                        trigger: "blur"
-                    }
-                ],
-                creditCode: [
-                    {
-                        required: true,
-                        message: "请输入统一社会信用代码",
-                        trigger: "blur"
-                    }
-                ],
-                companyType: [
-                    {
-                        required: true,
-                        message: "请选择企业类型",
-                        trigger: "change"
-                    }
-                ],
-                registerStatus: [
-                    {
-                        required: true,
-                        message: "请选择登记状态",
-                        trigger: "change"
-                    }
-                ],
-                placeArea: [
-                    {
-                        required: true,
-                        message: "请选择所在地区",
-                        trigger: "change"
-                    }
-                ],
-                placeAddress: [
-                    {
-                        required: true,
-                        message: "请输入所在地址",
-                        trigger: "change"
-                    }
-                ],
-                legalPersonName: [
-                    {
-                        required: true,
-                        message: "请输入法人姓名",
-                        trigger: "change"
-                    }
-                ],
-                legalPersonPapersType: [
-                    {
-                        required: true,
-                        message: "请选择法人证件类型",
-                        trigger: "change"
-                    }
-                ],
-                legalPersonPapersCode: [
-                    {
-                        required: true,
-                        message: "请输入法人证件号码",
-                        trigger: "change"
-                    }
-                ],
-            },
-            uploadUrl: "",
-            fileList: [],
-            fileUrl: "",
-            certFileUrl: "",
-            url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
-            certQuery: {
-                customerId: null,
-                manufacturerIdFk: null,
-                page: 1,
-                limit: 20,
-                type: 2,
-            },
-            certList: [],
-            certTotal: 0,
-            certLoading: false,
-            addCertVisible: false,
-            fromOptions: [],
-            idQuery: {
-                id: "",
-            },
-            addType: "2", //证书类型：1:供应商；2.生产企业；3.产品品种
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            statusFlag: {
-                0: "有效",
-                1: "失效",
-            },
-            editTye: 1,
-            formName: 1,
-            formMap: {
-                1: "新增生产企业资质证书",
-                2: "编辑生产企业资质证书",
-            },
-            manufacturerId: null,
-            customerId: null,
-            selectCertVisible: false,
-            certType: 2,
-        };
+            message: '请选择企业类型',
+            trigger: 'change'
+          }
+        ],
+        registerStatus: [
+          {
+            required: true,
+            message: '请选择登记状态',
+            trigger: 'change'
+          }
+        ],
+        placeArea: [
+          {
+            required: true,
+            message: '请选择所在地区',
+            trigger: 'change'
+          }
+        ],
+        placeAddress: [
+          {
+            required: true,
+            message: '请输入所在地址',
+            trigger: 'change'
+          }
+        ],
+        legalPersonName: [
+          {
+            required: true,
+            message: '请输入法人姓名',
+            trigger: 'change'
+          }
+        ],
+        legalPersonPapersType: [
+          {
+            required: true,
+            message: '请选择法人证件类型',
+            trigger: 'change'
+          }
+        ],
+        legalPersonPapersCode: [
+          {
+            required: true,
+            message: '请输入法人证件号码',
+            trigger: 'change'
+          }
+        ]
+      },
+      uploadUrl: '',
+      fileList: [],
+      fileUrl: '',
+      certFileUrl: '',
+      url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg',
+      certQuery: {
+        customerId: null,
+        manufacturerIdFk: null,
+        page: 1,
+        limit: 20,
+        type: 2
+      },
+      certList: [],
+      certTotal: 0,
+      certLoading: false,
+      addCertVisible: false,
+      fromOptions: [],
+      idQuery: {
+        id: ''
+      },
+      addType: '2', //证书类型：1:供应商；2.生产企业；3.产品品种
+      checkFlag: {
+        0: '草稿',
+        1: '已通过',
+        2: '已拒绝',
+        3: '变更未审核',
+        6: '未审核'
+      },
+      statusFlag: {
+        0: '有效',
+        1: '失效'
+      },
+      editTye: 1,
+      formName: 1,
+      formMap: {
+        1: '新增生产企业资质证书',
+        2: '编辑生产企业资质证书'
+      },
+      manufacturerId: null,
+      customerId: null,
+      selectCertVisible: false,
+      certType: 2
+    }
+  },
+  created() {
+    if (this.editType == 0) {
+      this.inputQuery.manufacturerId = getUUID('')
+    } else {
+      this.certQuery.customerId = this.inputQuery.customerId
+      this.selectedOptions = this.inputQuery.placeAreaCode.split(',')
+      if (this.inputQuery.productionAreaCode != '' && this.inputQuery.productionAreaCode != null && this.inputQuery.productionAreaCode != undefined) {
+        this.selectedOptions2 = this.inputQuery.productionAreaCode.split(',')
+      }
+
+    }
+    this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId
+    this.manufacturerId = this.inputQuery.manufacturerId
+    this.customerId = this.inputQuery.customerId
+    // this.getData();
+    this.getCompanyCertList()
+    this.findMethod()
+    this.uploadUrl = this.BASE_URL + '/udiwms/upload/register/file'
+    this.fileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
+    this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
+  },
+  components: {
+    draggable,
+    companyAddCert, supCertSetSelectDialog, ElImageViewer
+  },
+  methods: {
+    onModifySubmit(type) {
+
+      this.addOrModifyCompany(type)
     },
-    created() {
-        if (this.editType == 0) {
-            this.inputQuery.manufacturerId = getUUID("")
-        } else {
-            this.certQuery.customerId = this.inputQuery.customerId;
-            this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
-            if(this.inputQuery.productionAreaCode!="" && this.inputQuery.productionAreaCode!=null && this.inputQuery.productionAreaCode!=undefined){
-                this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
+    addOrModifyCompany(type) {
+      this.$refs['inputQuery'].validate(valid => {
+        if (valid) {
+          let formData = JSON.parse(JSON.stringify(this.inputQuery))
+          formData.auditStatus = type
+          this.loading = true
+          let urlName = this.editType == 0 ? 'add' : 'update'
+          addOrModifyCompany(formData, urlName).then(response => {
+            this.loading = false
+            if (response.code === 20000) {
+              this.addCloseDialog(true)
+              this.$message.success('保存成功')
+            } else {
+              this.$message.error(response.message)
             }
-
+          })
+        } else {
+          console.log('error submit!!')
+          return false
         }
-        this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
-        this.manufacturerId = this.inputQuery.manufacturerId
-        this.customerId = this.inputQuery.customerId;
-        // this.getData();
-        this.getCompanyCertList();
-        this.findMethod();
-        this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
-        this.fileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-        this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      })
+    },
+    certHandleCurrentChange(val) {
+      this.certQuery.page = val.page
+      this.getCompanyCertList()
+    },
+    companyTypeChange(val) {
+      if (this.inputQuery.companyType == 1 &&  this.inputQuery.agentName!=null) {
+        this.inputQuery.agentName = null
+      }
+    },
+    getCompanyCertList() {
+      this.certLoading = true
+      filterCompanyCert(this.certQuery)
+        .then((response) => {
+          this.certLoading = false
+          this.certList = response.data.list || []
+          this.certTotal = response.data.total
+        })
+        .catch(() => {
+          this.certLoading = false
+          this.certList = []
+        })
     },
-    components: {
-        draggable,
-        companyAddCert, supCertSetSelectDialog
+    addCert(row) {
+      if (this.$isNotBlank(row)) {
+        this.formName = 2
+        this.inputQuery.formData = row
+        this.editTye = 2
+      } else {
+        this.formName = 1
+        this.inputQuery.formData = {}
+        this.editTye = 1
+      }
+      this.addCertVisible = true
     },
-    methods: {
-        onModifySubmit(type) {
 
-            this.addOrModifyCompany(type);
-      },
-      addOrModifyCompany (type){
-          this.$refs["inputQuery"].validate(valid => {
-                   if (valid) {
-
-                  let formData = JSON.parse(JSON.stringify(this.inputQuery));
-                  formData.auditStatus = type;
-                  this.loading = true;
-                  let urlName = this.editType == 0 ? 'add' : 'update';
-                  addOrModifyCompany(formData, urlName).then(response => {
-                      this.loading = false;
-                      if (response.code === 20000) {
-                          this.addCloseDialog(true);
-                          this.$message.success("保存成功");
-                      } else {
-                          this.$message.error(response.message);
-                      }
-                  });
-              } else {
-                  console.log("error submit!!");
-                  return false;
-              }
-          });
-      },
-        certHandleCurrentChange(val) {
-            this.certQuery.page = val.page;
-            this.getCompanyCertList();
-        },
-        getCompanyCertList() {
-            this.certLoading = true;
-            filterCompanyCert(this.certQuery)
-                .then((response) => {
-                    this.certLoading = false;
-                    this.certList = response.data.list || [];
-                    this.certTotal=response.data.total
-                })
-                .catch(() => {
-                    this.certLoading = false;
-                    this.certList = [];
-                });
-        },
-        addCert(row) {
-            if (this.$isNotBlank(row)) {
-                this.formName = 2
-                this.inputQuery.formData = row;
-                this.editTye = 2;
-            } else {
-                this.formName = 1;
-                this.inputQuery.formData = {};
-                this.editTye = 1;
-            }
-            this.addCertVisible = true;
-        },
-
-        selectCert() {
-            this.customerId = this.inputQuery.customerId;
-            this.selectCertVisible = true;
-        },
-
-        toViewCompanyCert(row) {
-            window.open(this.certFileUrl + row.filePath);
-        },
-        deleteCompanyCert(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tquery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                };
-                deleteCompanyCert(tquery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getCompanyCertList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
-        },
-
-
-        disableCert(row, status) {
-            row.status = status;
-            updateCompanyCert(row).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.$message.success("更新成功！");
-                    this.getCompanyCertList();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-
-        },
-
-
-        closeLocalDialog() {
-            this.addCertVisible = false;
-            this.selectCertVisible = false;
-            this.getCompanyCertList();
-        },
-
-
-        findMethod(query) {
-            this.fromOptions = [];
-            let cQuery = {
-                companyName: query,
-            };
-            getSupComapnys(cQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromOptions = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+    selectCert() {
+      this.customerId = this.inputQuery.customerId
+      this.selectCertVisible = true
+    },
+
+    toViewCompanyCert(row) {
+      window.open(this.certFileUrl + row.filePath)
+    },
+    deleteCompanyCert(row) {
+      this.$confirm('是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.certLoading = true
+        let tquery = {
+          id: row.id,
+          filePath: row.filePath
         }
-        ,
-        unitChange(val) {
-            this.certQuery.customerId = val;
-        },
-
-        handleChange(value) {
-            this.inputQuery.placeArea =
-                CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
-            console.log(this.inputQuery.placeArea)
-            this.inputQuery.placeAreaCode = value.toString();
-        },
-        handleChange2(value) {
-            this.inputQuery.productionArea =
-                CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
-            this.inputQuery.productionAreaCode = value.toString();
-        },
-        uploadHandleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
-        uploadHandlePreview(file) {
-            console.log(file);
-            console.log(this.fileList);
-        },
-        uploadHandleExceed(files, fileList) {
-            this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-        },
-        uploadOnchange(file, fileList) {
-            let fileName = file.name;
-            let uid = file.uid
-            let pos = fileName.lastIndexOf(".");
-            let lastName = fileName.substring(pos, fileName.length);
-            if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png") {
-                this.$message.error("上传文件只能是 .jpg,.png 格式");
-                for (let i = 0; i < fileList.length; i++) {//从list删除
-                    if (fileList[i].uid === uid) {
-                        fileList.splice(i, 1)
-                    }
-                }
-                return;
-            }
-            // 限制上传文件的大小
-            const isLt = file.size / 1024 / 1024 / 2 <= 1;
-            if (!isLt) {
-                this.$message.error("上传文件大小不能超过 2MB");
-                for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].uid === uid) {
-                        fileList.splice(i, 1)
-                    }
-                }
-            }
-            return isLt;
-        },
-        uploadHandleSuccess(response, file, fileList) {
-            console.log(response)
+        deleteCompanyCert(tquery)
+          .then((response) => {
+            this.certLoading = false
             if (response.code === 20000) {
-                this.inputQuery.newFilePath = response.data.name;
-                this.onModifySubmit('inputQuery');
+              this.getCompanyCertList()
+              this.$message({
+                type: 'success',
+                message: '删除成功！'
+              })
             } else {
-                this.$message.error("文件上传失败：" + response.message);
+              this.$message.error(response.message)
             }
-        },
-        uploadHandleError() {
+          })
+          .catch(() => {
+            this.certLoading = false
+          })
+      }).catch(() => {
+      })
+    },
+
+    isAssetTypeAnImage(ext) {
+      return [
+        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
+    },
+    showImgViewer(row) {
+      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
+      const m = (e) => {
+        e.preventDefault()
+      }
+      document.body.style.overflow = 'auto'
+      document.removeEventListener('touchmove', m, true)
+    },
+    disableCert(row, status) {
+      row.status = status
+      updateCompanyCert(row).then(response => {
+        this.loading = false
+        if (response.code === 20000) {
+          this.$message.success('更新成功！')
+          this.getCompanyCertList()
+        } else {
+          this.$message.error(response.message)
+        }
+      })
+
+    },
 
-        },
+    closeLocalDialog() {
+      this.addCertVisible = false
+      this.selectCertVisible = false
+      this.getCompanyCertList()
+    },
+
+    findMethod(query) {
+      this.fromOptions = []
+      let cQuery = {
+        companyName: query
+      }
+      getSupComapnys(cQuery)
+        .then((response) => {
+          this.loading = false
+          this.fromOptions = response.data.list || []
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    }
+    ,
+    unitChange(val) {
+      this.certQuery.customerId = val
+    },
 
+    handleChange(value) {
+      this.inputQuery.placeArea =
+        CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]]
+      console.log(this.inputQuery.placeArea)
+      this.inputQuery.placeAreaCode = value.toString()
+    },
+    handleChange2(value) {
+      this.inputQuery.productionArea =
+        CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]]
+      this.inputQuery.productionAreaCode = value.toString()
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
+    uploadHandleRemove(file, fileList) {
+      console.log(file, fileList)
     },
-};
+    uploadHandlePreview(file) {
+      console.log(file)
+      console.log(this.fileList)
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name
+      let uid = file.uid
+      let pos = fileName.lastIndexOf('.')
+      let lastName = fileName.substring(pos, fileName.length)
+      if (lastName.toLowerCase() !== '.jpg' && lastName.toLowerCase() !== '.png') {
+        this.$message.error('上传文件只能是 .jpg,.png 格式')
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1
+      if (!isLt) {
+        this.$message.error('上传文件大小不能超过 30MB')
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      console.log(response)
+      if (response.code === 20000) {
+        this.inputQuery.newFilePath = response.data.name
+        this.onModifySubmit('inputQuery')
+      } else {
+        this.$message.error('文件上传失败：' + response.message)
+      }
+    },
+    uploadHandleError() {
+
+    }
+
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: 'warning',
+        1: 'success',
+        2: 'danger',
+        6: 'warning'
+      }
+      return statusMap[status]
+    }
+  }
+}
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 120px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 120px;
 }
 
 .text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-card {
-    margin-right: 20px;
-    margin-top: 15px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  margin-top: 15px;
+  /*transition: all .5s;*/
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index c9a1f359..a4b40a98 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -30,7 +30,7 @@
           </el-button
           >
           <el-button
-            v-if="editType==1"
+            v-if="editType==1 && auditType!=1"
             type="primary"
             size="mini"
             icon="search"
@@ -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>
@@ -234,7 +235,7 @@
 
         <el-table-column label="操作" width="250">
           <template slot-scope="scope">
-            <el-button v-if="editType==1" type="text" size="small" @click.native="printSupCert(scope.row)">打印</el-button>
+            <el-button v-if="editType==1 && auditType!=1" type="text" size="small" @click.native="printSupCert(scope.row)">打印</el-button>
             <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
             <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
               撤回
@@ -384,6 +385,10 @@ export default {
     editType: {
       type: Object,
       required: true,
+    },
+    auditType: {
+      type: Object,
+      required: true
     }
   },
   data() {
@@ -555,26 +560,17 @@ export default {
       indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row){
-      var varindex= row.filePath.lastIndexOf(".");
-      var varext = row.filePath.substring(varindex+1);
-      var isImage=this.isAssetTypeAnImage(varext);
-      if(isImage==true){
         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.push(response.data);
+            this.imgList=response.data;
           }
         });
         this.imgViewerVisible = true;
         const m = (e) => { e.preventDefault() };
         document.body.style.overflow = 'hidden';
         document.addEventListener("touchmove", m, false); // 禁止页面滑动
-      }else{
-        this.toViewCompanyCert(row);
-      }
-
-
     },
     closeImgViewer(){
       this.imgViewerVisible = false;
@@ -783,7 +779,7 @@ export default {
     },
     printSupCert(row) {
       var selectIds=[row.id];
-      let query = {moduleId: 10};
+      let query = {id: 3};
       this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
@@ -822,7 +818,7 @@ export default {
         this.$message.error("请先选择打印的证书！");
         return
       }
-      let query = {moduleId: 10};
+      let query = {id: 3};
       this.loading = true;
       verifyTemplateFile(query).then((res) => {
         if (res.code === 20000) {
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index af2fe79a..6432d07c 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -1,803 +1,830 @@
 <template>
-    <div>
-        <el-form
-            :model="inputQuery"
-            :rules="rules"
-            ref="inputQuery"
-            label-width="100px"
-            style="margin-top: -30px"
-        >
-            <el-card class="el-card">
-                <div style="float: right">
-
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 0"
-                        @click="selectProduct()"
-                    >选入产品
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 0"
-                        @click="onModifySubmit(0)"
-                    >草稿保存
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 0|| inputQuery.auditStatus == 6"
-                        @click="onModifySubmit(6)"
-                    >提交审核
-                    </el-button
-                    >
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        icon="search"
-                        v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
-                        @click="onModifySubmit(3)"
-                    >提交审核
-                    </el-button
-                    >
-                </div>
-
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top:50px">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
-                            <el-select
-                                v-model="inputQuery.customerId"
-                                filterable
-                                remote
-                                clearable="true"
-                                reserve-keyword
-                                disabled
-                                placeholder="请选择供应商"
-                                :remote-method="findMethod"
-                                :loading="loading"
-                                style="width: 100%;"
-                                @change="supChange"
-                            >
-                                <el-option
-                                    v-for="item in fromOptions"
-                                    :key="item.customerId"
-                                    :label="item.companyName"
-                                    :value="item.customerId"
-                                >
-                                    <span style="float: left">{{ item.companyName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk">
-                            <el-select
-                                v-model="inputQuery.manufacturerIdFk"
-                                filterable
-                                remote
-                                clearable="true"
-                                reserve-keyword
-                                disabled
-                                placeholder="请选择生产企业"
-                                :remote-method="findPMMethod"
-                                :loading="loading"
-                                style="width: 100%;"
-                            >
-                                <el-option
-                                    v-for="item in fromPMOptions"
-                                    :key="item.manufacturerId"
-                                    :label="item.companyName"
-                                    :value="item.manufacturerId"
-                                >
-                                    <span style="float: left">{{ item.companyName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="产品通用名称:" label-width="150px" prop="recordProductName">
-                            <el-input
-                                size="small"
-                                disabled
-                                placeholder="请输入内容"
-                                v-model="inputQuery.recordProductName"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="注册/备案人名称:" label-width="150px" prop="recordPeopleName">
-                            <el-input
-                                size="small"
-                                disabled
-                                placeholder="请输入内容"
-                                v-model="inputQuery.recordPeopleName"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="产品类别:" label-width="150px" prop="hchzsb">
-                            <el-select
-                                size="small"
-                                disabled
-                                v-model="inputQuery.hchzsb"
-                                placeholder="产品类别"
-                                style="width: 100%;"
-                            >
-                                <el-option label="耗材" value="耗材"></el-option>
-                                <el-option label="设备" value="设备"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="器械类别:" label-width="150px" prop="productType">
-                            <el-select
-                                size="small"
-                                v-model="inputQuery.productType"
-                                placeholder="器械类别"
-                                disabled
-                                style="width: 100%;"
-                            >
-                                <el-option label="器械" value="器械"></el-option>
-                                <el-option label="诊断试剂" value="诊断试剂"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="注册/备案号:" label-width="150px" prop="recordCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.recordCode"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10" class="el-col">
-                        <el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                disabled
-                                v-model="inputQuery.productDirectoryCode"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-              <el-row :gutter="20" class="el-row" type="flex">
-                <el-col :span="10" class="el-col">
-                  <el-form-item label="允许无批次号" label-width="150px">
-                    <el-select v-model="inputQuery.allowNoBatch"  style="width: 100%" size="small">
-                      <el-option label="是" :value="true"></el-option>
-                      <el-option label="否" :value="false"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10" class="el-col">
-                  <el-form-item label="允许无失效日期" label-width="150px">
-                    <el-select v-model="inputQuery.allowNoExpire"   style="width: 100%" size="small">
-                      <el-option label="是" :value="true"></el-option>
-                      <el-option label="否" :value="false"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="20" class="el-row" type="flex">
-                <el-col :span="10" class="el-col">
-                  <el-form-item label="允许无生产日期" label-width="150px">
-                    <el-select v-model="inputQuery.allowNoProduct" style="width: 100%" size="small">
-                      <el-option label="是" :value="true"></el-option>
-                      <el-option label="否" :value="false"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10" class="el-col">
-                  <el-form-item label="允许无序列号" label-width="150px">
-                    <el-select v-model="inputQuery.allowNoSerial"  style="width: 100%" size="small">
-                      <el-option label="是" :value="true"></el-option>
-                      <el-option label="否" :value="false"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-
-              <!--                <el-row :gutter="20" class="el-row" type="flex">-->
-<!--                    <el-col :span="10" class="el-col">-->
-<!--                        <el-form-item label="产品描述:" label-width="150px" prop="cpms">-->
-<!--                            <el-input-->
-<!--                                size="small"-->
-<!--                                placeholder="请输入内容"-->
-<!--                                v-model="inputQuery.cpms"-->
-<!--                                @input="change()"-->
-<!--                            ></el-input>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
-<!--                    <el-col :span="10" class="el-col">-->
-<!--                        <el-form-item label="规格型号:" label-width="150px" prop="specification" >-->
-<!--                            <el-input-->
-<!--                                size="small"-->
-<!--                                type="textarea"-->
-<!--                                autosize-->
-<!--                                placeholder="请输入内容"-->
-<!--                                v-model="inputQuery.specification"-->
-<!--                                @input="change()"-->
-<!--                            ></el-input>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
-<!--                </el-row>-->
-
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="20" class="el-col">
-                        <el-form-item label="备注:" label-width="150px" prop="remark">
-                            <el-input
-                                type="textarea"
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.remark"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-card>
-
-        </el-form>
-        <el-card class="el-card">
-            <div style="float:right ">
-                <el-button type="primary" size="mini" icon="search" @click="selectCert"
-                >选入资质证书
-                </el-button
+  <div>
+    <el-form
+      :model="inputQuery"
+      :rules="rules"
+      ref="inputQuery"
+      label-width="150px"
+      style="margin-top: -30px"
+    >
+      <el-card class="el-card">
+        <div style="float: right">
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 0"
+            @click="selectProduct()"
+          >选入物资字典
+          </el-button
+          >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 0"
+            @click="onModifySubmit(0)"
+          >草稿保存
+          </el-button
+          >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 0|| inputQuery.auditStatus == 6"
+            @click="onModifySubmit(6)"
+          >提交审核
+          </el-button
+          >
+          <el-button
+            type="primary"
+            size="mini"
+            icon="search"
+            v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
+            @click="onModifySubmit(3)"
+          >提交审核
+          </el-button
+          >
+        </div>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top:50px">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属供应商:" prop="customerId">
+              <el-select
+                v-model="inputQuery.customerId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                disabled
+                placeholder="请选择供应商"
+                :remote-method="findMethod"
+                :loading="loading"
+                style="width: 100%;"
+                @change="supChange"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.customerId"
+                  :label="item.companyName"
+                  :value="item.customerId"
                 >
-                <el-button
-                    type="primary"
-                    size="mini"
-                    icon="search"
-                    @click="addCert()"
-                >添加资质证书
-                </el-button
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="所属生产企业:" prop="manufacturerIdFk">
+              <el-select
+                v-model="inputQuery.companyName"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                disabled
+                placeholder="请选择生产企业"
+                :remote-method="findPMMethod"
+                :loading="loading"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in fromPMOptions"
+                  :key="item.manufacturerId"
+                  :label="item.companyName"
+                  :value="item.manufacturerId"
                 >
-            </div>
-            <el-table v-loading="certLoading" :data="certList" style="width: 100%;margin-top: 40px"  border highlight-current-row>
-                <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="name"></el-table-column>
-                <el-table-column label="生效期" prop="vailDate"></el-table-column>
-                <el-table-column label="失效期" prop="expireDate"></el-table-column>
-                <el-table-column label="审核状态" prop="auditStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.auditStatus) | statusFilterType">
-                            {{ checkFlag[scope.row.auditStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-                <el-table-column label="状态" prop="status" width="120">
-                        <template slot-scope="scope">
-                            <el-tag :type="(scope.row.status) | statusType">
-                                {{ statusFlag[scope.row.status] }}
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                <el-table-column label="备注" prop="remark"></el-table-column>
-                <el-table-column label="操作"  width="150">
-                    <template slot-scope="scope">
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="addCert(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="toViewCompanyCert(scope.row)"
-                        >预览
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="scope.row.auditStatus === 1"
-                            @click.native="deleteCompanyCert(scope.row)"
-                        >删除
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            v-if="scope.row.auditStatus === 2"
-                            @click.native.stop="rejectInfo(scope.row)"
-                        >说明
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-          <pagination
-            v-show="certTotal>0"
-            :total="certTotal"
-            :page.sync="certQuery.page"
-            :limit.sync="certQuery.limit"
-            @pagination="certHandleCurrentChange"
-
-          ></pagination>
-
-        </el-card>
-
-        <el-dialog
-            title="添加资质证书"
-            :visible.sync="addCertVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="70%"
-            v-if="addCertVisible"
-            append-to-body
-            @close='closeLocalDialog'
-        >
-            <companyAddCert
-                :closeDialog="closeLocalDialog"
-                :inputQuery="inputQuery"
-                :addType="addType"
-                :editTye="editTye"
-            ></companyAddCert>
-        </el-dialog>
-        <el-dialog
-            title="选入资质证书"
-            :visible.sync="selectCertVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="70%"
-            v-if="selectCertVisible"
-            append-to-body
-            @close='closeLocalDialog'
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="产品通用名称:" prop="recordProductName">
+              <el-input
+                size="small"
+                disabled
+                placeholder="请输入内容"
+                v-model="inputQuery.recordProductName"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="注册/备案人名称:" prop="recordPeopleName">
+              <el-input
+                size="small"
+                disabled
+                placeholder="请输入内容"
+                v-model="inputQuery.recordPeopleName"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="产品类别:" prop="hchzsb">
+              <el-select
+                size="small"
+                disabled
+                v-model="inputQuery.hchzsb"
+                placeholder="产品类别"
+                style="width: 100%;"
+              >
+                <el-option label="耗材" value="耗材"></el-option>
+                <el-option label="设备" value="设备"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="器械类别:" prop="qxlb">
+              <el-select
+                size="small"
+                v-model="inputQuery.productType"
+                placeholder="器械类别"
+                disabled
+                style="width: 100%;"
+              >
+                <el-option label="器械" value="器械"></el-option>
+                <el-option label="诊断试剂" value="诊断试剂"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="10" class="el-col">
+            <el-form-item label="注册/备案号:" prop="recordCode">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.recordCode"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" class="el-col">
+            <el-form-item label="器械目录分类编码:" prop="productDirectoryCode">
+              <el-input
+                size="small"
+                placeholder="请输入内容"
+                disabled
+                v-model="inputQuery.productDirectoryCode"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <!--        <el-row :gutter="20" class="el-row" type="flex">-->
+        <!--          <el-col :span="10" class="el-col">-->
+        <!--            <el-form-item label="产品描述:"  prop="cpms">-->
+        <!--              <el-input-->
+        <!--                size="small"-->
+        <!--                placeholder="请输入内容"-->
+        <!--                v-model="inputQuery.cpms"-->
+        <!--                @input="change()"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="10" class="el-col">-->
+        <!--            <el-form-item label="规格型号:"  prop="specification">-->
+        <!--              <el-input-->
+        <!--                size="small"-->
+        <!--                type="textarea"-->
+        <!--                autosize-->
+        <!--                placeholder="请输入内容"-->
+        <!--                v-model="inputQuery.specification"-->
+        <!--                @input="change()"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="20" class="el-col">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                type="textarea"
+                size="small"
+                placeholder="请输入内容"
+                v-model="inputQuery.remark"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+    </el-form>
+    <el-card class="el-card">
+      <div style="float:right ">
+        <el-button type="primary" size="mini" icon="search" @click="selectCert"
+        >选入资质证书
+        </el-button
         >
-            <supCertSetSelectDialog
-                :certType="certType"
-                :manufacturerId="manufacturerId"
-                :productId="productId"
-                :customerId="customerId"
-                :closeDialog="closeLocalDialog"
-            ></supCertSetSelectDialog>
-        </el-dialog>
-
-
-        <el-dialog
-            title="选入产品"
-            :visible.sync="selectSingleProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="70%"
-            v-if="selectSingleProductVisible"
-            append-to-body
-            @close='closeLocalDialog'
+        <el-button
+          type="primary"
+          size="mini"
+          icon="search"
+          @click="addCert()"
+        >添加资质证书
+        </el-button
         >
-            <companyProducts
-                :selectType="selectType"
-                :closeSelDialog="closeSelDialog"
-            ></companyProducts>
-        </el-dialog>
-
-    </div>
+      </div>
+      <el-table v-loading="certLoading" :data="certList" style="width: 100%;margin-top: 40px" border
+                highlight-current-row>
+        <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>
+        <el-table-column label="生效期" prop="vailDate"></el-table-column>
+        <el-table-column label="失效期" prop="expireDate"></el-table-column>
+        <el-table-column label="审核状态" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.auditStatus) | statusFilterType">
+              {{ checkFlag[scope.row.auditStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" prop="status" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.status) | statusType">
+              {{ statusFlag[scope.row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native="addCert(scope.row)"
+            >编辑
+            </el-button
+            >
+            <el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">预览</el-button>
+            <el-button
+              type="text"
+              size="small"
+              :disabled="scope.row.auditStatus === 1"
+              @click.native="deleteCompanyCert(scope.row)"
+            >删除
+            </el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.auditStatus === 2"
+              @click.native.stop="rejectInfo(scope.row)"
+            >说明
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
+                       :url-list="imgList"/>
+      <pagination
+        v-show="certTotal>0"
+        :total="certTotal"
+        :page.sync="certQuery.page"
+        :limit.sync="certQuery.limit"
+        @pagination="certHandleCurrentChange"
+
+      ></pagination>
+
+    </el-card>
+
+    <el-dialog
+      title="添加资质证书"
+      :visible.sync="addCertVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="70%"
+      v-if="addCertVisible"
+      append-to-body
+      @close='closeLocalDialog'
+    >
+      <companyAddCert
+        :closeDialog="closeLocalDialog"
+        :inputQuery="inputQuery"
+        :addType="addType"
+        :editTye="editTye"
+      ></companyAddCert>
+    </el-dialog>
+    <el-dialog
+      title="选入资质证书"
+      :visible.sync="selectCertVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="70%"
+      v-if="selectCertVisible"
+      append-to-body
+      @close='closeLocalDialog'
+    >
+      <supCertSetSelectDialog
+        :certType="certType"
+        :manufacturerId="manufacturerId"
+        :productId="productId"
+        :customerId="customerId"
+        :closeDialog="closeLocalDialog"
+      ></supCertSetSelectDialog>
+    </el-dialog>
+
+
+    <el-dialog
+      title="选入物资字典信息"
+      :visible.sync="selectSingleProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="70%"
+      v-if="selectSingleProductVisible"
+      append-to-body
+      @close='closeLocalDialog'
+    >
+      <companyProducts
+        :selectType="selectType"
+        :closeSelDialog="closeSelDialog"
+      ></companyProducts>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
-import {getRegistrationInfo, addOrModifyRegistration, bindProduct} from "../../../api/purchase/suppliersRegistrationBasic";
+import {
+  getRegistrationInfo,
+  addOrModifyRegistration,
+  bindProduct
+} from "../../../api/purchase/suppliersRegistrationBasic";
 import {regionDataPlus} from "element-china-area-data";
 import draggable from "vuedraggable";
-import {getSupComapnys} from "@/api/purchase/supCompany";
+import {getSupComapnys, previewImage} from '@/api/purchase/supCompany'
 import {getCompanyList} from "@/api/purchase/supManufacturer";
 import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
 import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
 import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog";
 import companyProducts from "@/views/purchase/company/companyProducts";
 import {getUUID} from "@/utils/strUtil";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer"
 
 export default {
-    name: "supProductEditDialog",
-    props: {
-        closeRegistrationDialog: {
-            type: Function,
+  name: "supProductEditDialog",
+  props: {
+    closeRegistrationDialog: {
+      type: Function,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+    editType: {
+      type: Object,
+      required: true,
+    },
+    currentManufacturer: {
+      type: Object,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      fromOptions: [],
+      fromPMOptions: [],
+      imgViewerVisible: false,
+      imgList: [],
+      pmQuery: {
+        customerId: null,
+        companyName: null,
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      classesDisplay: false,
+      cuStatus: 0,
+      selectedOptions: [],
+      selectedOptions2: [],
+      options: regionDataPlus,
+      rules: {
+
+        customerId: [
+          {
             required: true,
-        },
-        inputQuery: {
-            type: Object,
+            message: "请选择供应商",
+            trigger: "change"
+          }
+        ],
+
+
+        // manufacturerIdFk: [
+        //     {
+        //         required: true,
+        //         message: "请选择生产企业",
+        //         trigger: "change"
+        //     }
+        // ],
+
+        recordCode: [
+          {
             required: true,
-        },
-        editType: {
-            type: Object,
+            message: "请输入注册/备案号",
+            trigger: "blur"
+          }
+        ],
+        recordProductName: [
+          {
             required: true,
-        },
-        currentManufacturer: {
-            type: Object,
+            message: "请输入注册/备案产品名称",
+            trigger: "blur"
+          }
+        ],
+        productManageType: [
+          {
             required: true,
+            message: "请选择医疗器械管理类别",
+            trigger: "change"
+          }
+        ],
+        productType: [
+          {
+            required: true,
+            message: "请选择器械类别",
+            trigger: "change"
+          }
+        ],
+        recordPeopleName: [
+          {
+            required: true,
+            message: "请输入注册/备案人名称",
+            trigger: "change"
+          }
+        ],
+        // productDirectoryCode: [
+        //     {
+        //         required: true,
+        //         message: "请输入器械目录分类编码",
+        //         trigger: "change"
+        //     }
+        // ],
+        specification: [
+          {
+            required: true,
+            message: "请输入规格型号",
+            trigger: "change"
+          }
+        ],
+      },
+      fileList: [],
+      fileList2: [],
+
+      certQuery: {
+        customerId: null,
+        manufacturerIdFk: null,
+        page: 1,
+        limit: 20
+      },
+      certList: [],
+      certTotal: 0,
+      certLoading: false,
+      addCertVisible: false,
+      certFileUrl: "",
+      addType: "3", //证书类型：1:供应商；2.生产企业；3.产品品种
+      checkFlag: {
+        0: "草稿",
+        1: "已通过",
+        2: "已拒绝",
+        3: "变更未审核",
+        6: "未审核",
+      },
+      editTye: 1,
+      statusFlag: {
+        0: "有效",
+        1: "失效",
+      },
+      manufacturerId: null,
+      productId: null,
+      customerId: null,
+      selectCertVisible: false,
+      selectSingleProductVisible: false,
+      selectType: 1,
+      certType: 3,
+    };
+  },
+  created() {
+    if (this.editType == 0) {
+      this.inputQuery.productId = getUUID("");
+      this.inputQuery.customerId = this.currentManufacturer.customerId;
+      this.inputQuery.companyName = this.currentManufacturer.companyName;
+
+    } else {
+      this.getCompanyCertList();
+      this.pmQuery.customerId = this.inputQuery.customerId;
+      this.inputQuery.companyName = this.currentManufacturer.companyName;
+
+    }
+    this.cuStatus = this.inputQuery.cuStatus;
+    this.manufacturerId = this.inputQuery.manufacturerId
+    this.productId = this.inputQuery.productId
+    this.findMethod();
+    this.findPMMethod();
+    this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+
+  },
+  components: {
+    draggable, companyAddCert, supCertSetSelectDialog, companyProducts, ElImageViewer
+  },
+  methods: {
+    onModifySubmit(val) {
+      if (val != 0) {
+        if (this.cuStatus != 1) {
+          this.$message.error("生产企业未通过审核不能提交！");
+          return;
         }
+      }
+      if(val==3){
+        this.$confirm( "已审核通过，是否需要重新提交变更", {
+          confirmButtonText: "确定",
+          type: "warning",
+          showCancelButton: false,
+        })
+          .then(() => {
+            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;
+              }
+            });
+          });
+      }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;
+          }
+        });
+      }
     },
-    data() {
-        return {
-          BASE_URL: process.env.VUE_APP_BASE_API,
-            fromOptions: [],
-            fromPMOptions: [],
-            pmQuery: {
-                customerId: null,
-                companyName: null,
-                page: 1,
-                limit: 10,
-            },
-            loading: false,
-            classesDisplay: false,
-            cuStatus:0,
-            selectedOptions: [],
-            selectedOptions2: [],
-            options: regionDataPlus,
-            rules: {
-
-                customerId: [
-                    {
-                        required: true,
-                        message: "请选择供应商",
-                        trigger: "change"
-                    }
-                ],
-
-
-                manufacturerIdFk: [
-                    {
-                        required: true,
-                        message: "请选择生产企业",
-                        trigger: "change"
-                    }
-                ],
-
-                recordCode: [
-                    {
-                        required: true,
-                        message: "请输入注册/备案号",
-                        trigger: "blur"
-                    }
-                ],
-                recordProductName: [
-                    {
-                        required: true,
-                        message: "请输入注册/备案产品名称",
-                        trigger: "blur"
-                    }
-                ],
-                productManageType: [
-                    {
-                        required: true,
-                        message: "请选择医疗器械管理类别",
-                        trigger: "change"
-                    }
-                ],
-                productType: [
-                    {
-                        required: true,
-                        message: "请选择器械类别",
-                        trigger: "change"
-                    }
-                ],
-                recordPeopleName: [
-                    {
-                        required: true,
-                        message: "请输入注册/备案人名称",
-                        trigger: "change"
-                    }
-                ],
-                productDirectoryCode: [
-                    {
-                        required: true,
-                        message: "请输入器械目录分类编码",
-                        trigger: "change"
-                    }
-                ],
-                specification: [
-                    {
-                        required: true,
-                        message: "请输入规格型号",
-                        trigger: "change"
-                    }
-                ],
-            },
-            fileList: [],
-            fileList2: [],
-
-            certQuery: {
-                customerId: null,
-                manufacturerIdFk: null,
-                page: 1,
-                limit: 20
-            },
-            certList: [],
-            certTotal: 0,
-            certLoading: false,
-            addCertVisible: false,
-            certFileUrl: "",
-            addType: "3", //证书类型：1:供应商；2.生产企业；3.产品品种
-            checkFlag: {
-                0: "草稿",
-                1: "已通过",
-                2: "已拒绝",
-                3: "变更未审核",
-                6: "未审核",
-            },
-            editTye: 1,
-            statusFlag: {
-                0: "有效",
-                1: "失效",
-            },
-            manufacturerId: null,
-            productId: null,
-            customerId: null,
-            selectCertVisible: false,
-            selectSingleProductVisible: false,
-            selectType: 1,
-            certType: 3,
-        };
+    toViewCompanyCert(row) {
+      window.open(this.certFileUrl + row.filePath);
     },
-    created() {
-        if (this.editType == 0) {
-            this.inputQuery.productId = getUUID("");
-            this.inputQuery.customerId = this.currentManufacturer.customerId;
-            this.inputQuery.manufacturerIdFk = this.currentManufacturer.manufacturerId;
+    rejectInfo(row) {
+      this.$confirm(row.auditComment, "拒绝说明", {
+        confirmButtonText: "确定",
+        type: "warning",
+        showCancelButton: false,
+      })
+        .then(() => {
+        });
 
-        } else {
-            this.getCompanyCertList();
-            this.pmQuery.customerId = this.inputQuery.customerId;
-
-        }
-        this.cuStatus=this.inputQuery.cuStatus;
-        this.manufacturerId = this.inputQuery.manufacturerIdFk
-        this.productId = this.inputQuery.productId
-        this.findMethod();
-        this.findPMMethod();
+    },
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        companyName: query,
+      };
+      getSupComapnys(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    supChange(val) {
+      this.pmQuery.customerId = val;
+      this.findPMMethod();
+    },
+    findPMMethod(key) {
+      this.fromPMOptions = [];
+      this.pmQuery.companyName = key;
+      getCompanyList(this.pmQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromPMOptions = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromPMOptions = [];
+          this.total = 0;
+        });
+    },
+    closeLocalDialog() {
+      this.addCertVisible = false;
+      this.selectCertVisible = false;
+      this.getCompanyCertList();
+    },
+    isAssetTypeAnImage(ext) {
+      return [
+        'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
+    },
+    showImgViewer(row) {
         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;
+      const m = (e) => {
+        e.preventDefault()
+      };
+      document.body.style.overflow = 'auto';
+      document.removeEventListener("touchmove", m, true);
+    },
 
+    closeSelDialog(val) {
+      if (val != null) {
+        let query = {
+          productId: this.inputQuery.productId,
+          relIdFk: val,
+          manufacturerId: this.inputQuery.manufacturerId,
+          customerId: this.inputQuery.customerId,
+          companyName: this.inputQuery.companyName,
+          auditStatus: this.inputQuery.auditStatus
+
+        };
+        bindProduct(query).then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.inputQuery = response.data;
+            this.inputQuery.manufacturerId=this.inputQuery.manufacturerIdFk
+            this.selectSingleProductVisible = false;
+          } else {
+            this.$message.error(response.message);
+          }
+        });
+      }
     },
-    components: {
-        draggable, companyAddCert, supCertSetSelectDialog,companyProducts
+
+    addCert(row) {
+      if (this.$isNotBlank(row)) {
+        this.formName = 2
+        this.inputQuery.formData = row;
+        this.editTye = 2;
+      } else {
+        this.formName = 1;
+        this.editTye = 1;
+        this.inputQuery.formData = {};
+      }
+      this.addCertVisible = true;
     },
-    methods: {
-        onModifySubmit(val) {
-            if(val!=0){
-                if(this.cuStatus!=1){
-                this.$message.error("生产企业未通过审核不能提交！");
-                return;
-               }
-            }
-            this.$refs['inputQuery'].validate(valid => {
-                if (valid) {
-                    // this.inputQuery.auditStatus = val;
-
-
-                    let formData = JSON.parse(JSON.stringify(this.inputQuery));
-                    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) {
-            window.open(this.certFileUrl + row.filePath);
-        },
-        rejectInfo(row) {
-            this.$confirm(row.auditComment, "拒绝说明", {
-                confirmButtonText: "确定",
-                type: "warning",
-                showCancelButton: false,
-            })
-                .then(() => {
-                });
 
-        },
-        findMethod(query) {
-            this.fromOptions = [];
-            let cQuery = {
-                companyName: query,
-            };
-            getSupComapnys(cQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromOptions = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        supChange(val) {
-            this.pmQuery.customerId = val;
-            this.findPMMethod();
-        },
-        findPMMethod(key) {
-            this.fromPMOptions = [];
-            this.pmQuery.companyName = key;
-            getCompanyList(this.pmQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.fromPMOptions = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.fromPMOptions = [];
-                    this.total = 0;
-                });
-        },
-        closeLocalDialog() {
-            this.addCertVisible = false;
-            this.selectCertVisible = false;
-            this.getCompanyCertList();
-        },
-
-
-        closeSelDialog(val) {
-            if (val != null) {
-                let query = {
-                    productId: this.inputQuery.productId,
-                    relIdFk: val,
-                    manufacturerId: this.inputQuery.manufacturerIdFk,
-                    customerId: this.inputQuery.customerId,
-                    auditStatus: this.inputQuery.auditStatus,
-
-                };
-                bindProduct(query).then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.inputQuery = response.data;
-                        this.selectSingleProductVisible = false;
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                });
-            }
-        },
+    selectCert() {
+      this.customerId = this.inputQuery.customerId;
+      this.selectCertVisible = true;
+    },
 
-        addCert(row) {
-            if (this.$isNotBlank(row)) {
-                this.formName = 2
-                this.inputQuery.formData = row;
-                this.editTye = 2;
+    deleteCompanyCert(row) {
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.certLoading = true;
+        let tquery = {
+          id: row.id,
+          filePath: row.filePath,
+        };
+        deleteCompanyCert(tquery)
+          .then((response) => {
+            this.certLoading = false;
+            if (response.code === 20000) {
+              this.getCompanyCertList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
             } else {
-                this.formName = 1;
-                this.editTye = 1;
-                this.inputQuery.formData = {};
+              this.$message.error(response.message);
             }
-            this.addCertVisible = true;
-        },
-
-        selectCert() {
-            this.customerId = this.inputQuery.customerId;
-            this.selectCertVisible = true;
-        },
-
-        deleteCompanyCert(row) {
-            this.$confirm("是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.certLoading = true;
-                let tquery = {
-                    id: row.id,
-                    filePath: row.filePath,
-                };
-                deleteCompanyCert(tquery)
-                    .then((response) => {
-                        this.certLoading = false;
-                        if (response.code === 20000) {
-                            this.getCompanyCertList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                        this.certLoading = false;
-                    });
-            }).catch(() => {
-            });
-        },
-        certHandleCurrentChange(val) {
-            this.certQuery.page = val.page;
-            this.getCompanyCertList();
-        },
-        getCompanyCertList() {
-            this.certLoading = true;
-            this.certQuery.customerId = this.inputQuery.customerId;
-            this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
-            this.certQuery.productIdFk = this.inputQuery.productId;
-            filterCompanyCert(this.certQuery)
-                .then((response) => {
-                    this.certLoading = false;
-                    this.certList = response.data.list || [];
-                    this.certTotal=response.data.total
-                })
-                .catch(() => {
-                    this.certLoading = false;
-                    this.certList = [];
-                });
-        },
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    },
+    certHandleCurrentChange(val) {
+      this.certQuery.page = val.page;
+      this.getCompanyCertList();
+    },
+    getCompanyCertList() {
+      this.certLoading = true;
+      this.certQuery.customerId = this.inputQuery.customerId;
+      this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
+      this.certQuery.productIdFk = this.inputQuery.productId;
+      filterCompanyCert(this.certQuery)
+        .then((response) => {
+          this.certLoading = false;
+          this.certList = response.data.list || [];
+          this.certTotal = response.data.total
+        })
+        .catch(() => {
+          this.certLoading = false;
+          this.certList = [];
+        });
+    },
 
 
-        selectProduct() {
-            this.selectSingleProductVisible = true;
-        },
+    selectProduct() {
+      this.selectSingleProductVisible = true;
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
+        6: "warning",
+      };
+      return statusMap[status];
     },
+  },
 
 };
 </script>
 <style>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 120px;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 120px;
 }
 
 .text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-card {
-    margin-right: 20px;
-    margin-top: 15px;
-    /*transition: all .5s;*/
+  margin-right: 20px;
+  margin-top: 15px;
+  /*transition: all .5s;*/
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 </style>