diff --git a/public/config.json b/public/config.json
index f987e7a..a919abd 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.109:9906",
-    "SERVER_IP": "http://192.168.0.109:9906",
+    "BASE_URL": "http://127.0.0.1:9906",
+    "SERVER_IP": "http://127.0.0.1:9906",
     "hosp_name": "福建省XX市医院"
 }
 
diff --git a/src/api/purchase/classifyCode.js b/src/api/purchase/classifyCode.js
new file mode 100644
index 0000000..af5ff56
--- /dev/null
+++ b/src/api/purchase/classifyCode.js
@@ -0,0 +1,11 @@
+import axios from "../../utils/axios";
+
+export function filterClassify(query) {
+    return axios(
+        {
+            url: "/spms/classify/code/filter",
+            method: "get",
+            params: query
+        }
+    );
+}
diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue
index 4a47389..b3685c8 100644
--- a/src/views/basic/basicCompany.vue
+++ b/src/views/basic/basicCompany.vue
@@ -43,10 +43,9 @@
                         type="primary"
                         size="mini"
                         icon="search"
-
                         v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
                         @click="onModifySubmit(4)"
-                    >提交变更
+                    >提交审核
                     </el-button
                     >
                 </div>
@@ -196,10 +195,10 @@
                                 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
                             >
+                            <!--                            v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -216,23 +215,23 @@
                             </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
-                            >
+                            <!--                            <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>
@@ -430,12 +429,12 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
 
             statusFlag: {
-                0: "正常",
+                0: "启用",
                 1: "禁用",
             },
             formName: 1,
@@ -504,7 +503,7 @@ export default {
             } else {                //编辑保存
                 this.$refs["inputQuery"].validate(valid => {
                     if (valid) {
-                        this.$confirm("是否提交变更?", "提示", {
+                        this.$confirm("企业信息已通过审核，是否确认重新提交审核？", "提示", {
                             confirmButtonText: "确定",
                             cancelButtonText: "取消",
                             type: "warning",
@@ -651,7 +650,7 @@ export default {
         statusType(status) {
             const statusMap = {
                 0: "success",
-                1: "warning",
+                1: "danger",
             };
             return statusMap[status];
         },
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
index 6ec2ee2..3494174 100644
--- a/src/views/basic/basicCompanyProductsImport.vue
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -48,7 +48,7 @@
                 :header-cell-class-name="cellClass"
                 @current-change="handleSelectionChange"
             >
-               <el-table-column label width="45">
+                <el-table-column label width="45">
                     <template slot-scope="scope">
                         <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
                     </template>
@@ -835,7 +835,7 @@ export default {
     },
     data() {
         return {
-            radioCheck:null,
+            radioCheck: null,
             filterQuery: {
                 customerId: null,
                 ylqxzcrbarmc: "",
@@ -898,7 +898,7 @@ export default {
 
     methods: {
         onReset() {
-            this.radioCheck=null;
+            this.radioCheck = null;
             this.$router.push({
                 path: "",
             });
@@ -967,11 +967,11 @@ export default {
             });
         },
 
-      cellClass(row){
-          if (row.columnIndex === 0) {
-          return 'disabledCheck'
+        cellClass(row) {
+            if (row.columnIndex === 0) {
+                return 'disabledCheck'
             }
-         },
+        },
         selectExport() {
 
             var selectData = this.multipleSelection;
@@ -979,7 +979,7 @@ export default {
                 this.$message.warning("请先选入产品！");
                 return;
             }
-            if (this.repEditQuery.price<0) {
+            if (this.repEditQuery.price < 0) {
                 this.$message.error("产品价格不能小于0元！");
                 return;
             }
@@ -1048,7 +1048,7 @@ export default {
                 });
         },
         handleSelectionChange(selection) {
-            this.radioCheck=selection.id;
+            this.radioCheck = selection.id;
             this.curSelectDi = selection;
             if (selection.length > 1) {
                 this.$refs.diList.clearSelection();
@@ -1185,9 +1185,10 @@ export default {
 </script>
 <style scoped>
 
-.el-table .disabledCheck .cell .el-checkbox .el-checkbox__input{
+.el-table .disabledCheck .cell .el-checkbox .el-checkbox__input {
     display: none !important;
 }
+
 .itemTag {
     float: left;
     text-align: left;
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index b9b0ef1..63b97fe 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -1,261 +1,265 @@
 <template>
-    <div>
+  <div>
 
-        <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
-            <el-descriptions-item>
-                <template slot="label">
-                    产品名称
-                </template>
-                {{ idQuery.cpmctymc }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-                <template slot="label">
-                    产品标识
-                </template>
-                {{ idQuery.nameCode }}
-            </el-descriptions-item>
+    <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">
+          产品名称
+        </template>
+        {{ idQuery.cpmctymc }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          产品标识
+        </template>
+        {{ idQuery.nameCode }}
+      </el-descriptions-item>
 
-            <el-descriptions-item>
-                <template slot="label">
-                    批次号
-                </template>
-                {{ idQuery.batchNo }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-                <template slot="label">
-                    规格型号
-                </template>
-                {{ idQuery.ggxh }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-                <template slot="label">
-                    生产日期
-                </template>
-                {{ idQuery.productionDate }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-                <template slot="label">
-                    失效日期
-                </template>
-                {{ idQuery.expireDate }}
-            </el-descriptions-item>
-        </el-descriptions>
+      <el-descriptions-item>
+        <template slot="label">
+          批次号
+        </template>
+        {{ idQuery.batchNo }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          规格型号
+        </template>
+        {{ idQuery.ggxh }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          生产日期
+        </template>
+        {{ idQuery.productionDate }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          失效日期
+        </template>
+        {{ idQuery.expireDate }}
+      </el-descriptions-item>
+    </el-descriptions>
 
-        <el-form :inline="true" :model="query" class="query-form" size="mini">
-            <el-form-item class="query-form-item">
-                <el-input v-model="query.code" placeholder="条码查询"></el-input>
-            </el-form-item>
+    <el-form :inline="true" :model="query" class="query-form" size="mini">
+      <el-form-item class="query-form-item">
+        <el-input v-model="query.code" placeholder="条码查询"></el-input>
+      </el-form-item>
 
-            <el-form-item>
-                <el-button-group>
-                    <el-button type="primary" icon="search" @click="search"
-                    >查询
-                    </el-button
-                    >
-                </el-button-group>
-            </el-form-item>
-        </el-form>
-        <el-table v-loading="loading" :data="codeArry" style="width: 100%">
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-                label="条码"
-                prop="originCode"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column label="单据类型" prop="action" width="150">
-                <template slot-scope="scope">
-                    <span>{{ getActionName(scope.row.action) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="出入库类型"
-                prop="mainActionStr"
-                width="150"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                label="入库数量"
-                prop="inCount"
-                width="150"
-                show-overflow-tooltip
-            ></el-table-column>
+      <el-form-item>
+        <el-button-group>
+          <el-button type="primary" icon="search" @click="search"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="codeArry" style="width: 100%">
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+          label="条码"
+          prop="originCode"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="单据类型" prop="action" width="150">
+        <template slot-scope="scope">
+          <span>{{ getActionName(scope.row.action) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="出入库类型"
+          prop="mainActionStr"
+          width="150"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="入库数量"
+          prop="inCount"
+          width="150"
+          show-overflow-tooltip
+      ></el-table-column>
 
-            <el-table-column
-                label="出库数量"
-                prop="outCount"
-                width="150"
-                show-overflow-tooltip
-            ></el-table-column>
+      <el-table-column
+          label="出库数量"
+          prop="outCount"
+          width="150"
+          show-overflow-tooltip
+      ></el-table-column>
 
-            <el-table-column
-                label="订单日期"
-                prop="updateTime"
-                width="150"
-                show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-                label="所属订单"
-                prop="orderIdFk"
-                width="200"
-                show-overflow-tooltip
-            ></el-table-column>
-        </el-table>
+      <el-table-column
+          label="订单日期"
+          prop="updateTime"
+          width="150"
+          show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+          label="所属订单"
+          prop="orderIdFk"
+          width="200"
+          show-overflow-tooltip
+      ></el-table-column>
+    </el-table>
 
-        <el-pagination
-            :page-size="query.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next,total"
-            :total="total"
-            :current-page="query.page"
-        >
-        </el-pagination>
-    </div>
+    <el-pagination
+        :page-size="query.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next,total"
+        :total="total"
+        :current-page="query.page"
+    >
+    </el-pagination>
+  </div>
 </template>
 
 <script>
 import {
-    filterDetailProducts, statDetailProducts
+  filterDetailProducts, statDetailProducts
 } from "../../api/inventory/InvPreInProducts";
 import store from "../../store";
 import draggable from "vuedraggable";
 import {getBussinessType} from "../../api/basic/bussinessType";
 
 export default {
-    name: "idQuery",
-    props: {
-        idQuery: {
-            type: Object,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    idQuery: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            query: {
-                batchNo: null,
-                productIdFk: null,
-                customerId: null,
-                page: 1,
-                limit: 20,
-            },
-            codeArry: [],
-            total: 0,
-            loading: true,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            busTypes: [],
-            statData: {},
-        };
+  },
+  data() {
+    return {
+      query: {
+        batchNo: null,
+        productIdFk: null,
+        customerId: null,
+        page: 1,
+        limit: 20,
+      },
+      codeArry: [],
+      total: 0,
+      loading: true,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      busTypes: [],
+      statData: {},
+    };
+  },
+  components: {
+    draggable,
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.query = {
+        productIdFk: null,
+        customerId: null,
+        page: 1,
+        limit: 20,
+      };
+      this.getCodeList();
     },
-    components: {
-        draggable,
+    onSubmit() {
+      this.$router.push({
+        path: "",
+        query: this.query,
+      });
+      this.getCodeList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.query = {
-                productIdFk: null,
-                customerId: null,
-                page: 1,
-                limit: 20,
-            };
-            this.getCodeList();
-        },
-        onSubmit() {
-            this.$router.push({
-                path: "",
-                query: this.query,
-            });
-            this.getCodeList();
-        },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            this.getCodeList();
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getCodeList();
-        },
-        search() {
-            this.query.page = 1;
-            this.getCodeList();
-        },
-        getCodeList() {
-            this.loading = true;
-            this.query.productIdFk = this.idQuery.relIdFk;
-            this.query.batchNo = this.idQuery.batchNo;
-            this.query.supId = this.idQuery.supId;
-            this.query.invStorageCode = this.idQuery.invStorageCode;
-            filterDetailProducts(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.loading = false;
-                    this.codeArry = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+    handleSizeChange(val) {
+      this.query.limit = val;
+      this.getCodeList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getCodeList();
+    },
+    search() {
+      this.query.page = 1;
+      this.getCodeList();
+    },
+    getCodeList() {
+      this.loading = true;
+      this.query.orderIdFk = this.idQuery.orderIdFk;
 
-        getStat() {
-            this.query.productIdFk = this.idQuery.relIdFk;
-            this.query.batchNo = this.idQuery.batchNo;
-            this.query.customerId = store.getters.customerId;
-            this.query.invStorageCode = this.idQuery.invStorageCode;
-            statDetailProducts(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    this.loading = false;
-                    this.statData = response.data;
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+      let query = {
+        orderIdFk: this.idQuery.orderIdFk
+      }
+      /*  this.query.batchNo = this.idQuery.batchNo;
+        this.query.supId = this.idQuery.supId;
+        this.query.invStorageCode = this.idQuery.invStorageCode;*/
+      filterDetailProducts(query) //查找该单号下的所有条码
+          .then((response) => {
+            this.loading = false;
+            this.codeArry = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+
+    getStat() {
+      this.query.productIdFk = this.idQuery.relIdFk;
+      this.query.batchNo = this.idQuery.batchNo;
+      this.query.customerId = store.getters.customerId;
+      this.query.invStorageCode = this.idQuery.invStorageCode;
+      statDetailProducts(this.query) //查找该单号下的所有条码
+          .then((response) => {
+            this.loading = false;
+            this.statData = response.data;
+          })
+          .catch(() => {
+            this.loading = false;
+          });
 
-        },
+    },
 
-        intentBack() {
-            //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
-            this.$router.go(-1);
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].action === action) {
-                    return this.busTypes[i].name;
-                }
-            }
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getBussinessType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
-                });
-        },
+    intentBack() {
+      //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
+      this.$router.go(-1);
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+    getActionName(action) {
+      for (let i = 0; i < this.busTypes.length; i++) {
+        if (this.busTypes[i].action === action) {
+          return this.busTypes[i].name;
+        }
+      }
     },
-    created() {
-        this.getBusType();
-        this.getCodeList();
-        this.getStat();
+    getBusType() {
+      let query = {
+        enabled: true,
+      };
+      getBussinessType(query)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.filterQuery.billAction = this.busTypes[0].action;
+            // this.getList();
+          })
+          .catch(() => {
+          });
     },
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getBusType();
+    this.getCodeList();
+    this.getStat();
+  },
 };
 </script>
 
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index d6ddc9f..7bd7d36 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -86,14 +86,17 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
-                                 width="120"></el-table-column>
+                                 width="180"></el-table-column>
 
                 <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
-                                 width="120"></el-table-column>
+                                 width="180"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
                 <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
+
+                <el-table-column label="所属单号" prop="orderIdFk" v-if="showSup"
+                                 show-overflow-tooltip width="180"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -142,7 +145,7 @@
 <script>
 import {
     filterProducts,
-    deleteProducts,clearAllProducts
+    deleteProducts, clearAllProducts
 } from "../../api/inventory/InvPreInProducts";
 import draggable from "vuedraggable";
 import codeDetail from "./InvPreInProductsDetail";
@@ -181,7 +184,7 @@ export default {
             dialogVisible: false,
             deleteLoading: false,
             busTypes: [],
-            idQuery: null,
+            idQuery: {},
             showSup: false,
         };
     },
@@ -282,14 +285,14 @@ export default {
         },
 
 
-        clearAll(){
+        clearAll() {
             this.$confirm("此操作将永久清空所有预验收库存信息, 是否继续?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
             })
                 .then(() => {
-                    let query={id:1};
+                    let query = {id: 1};
 
                     clearAllProducts(query)
                         .then((response) => {
@@ -335,9 +338,7 @@ export default {
         },
 
         intentDetail(row) {
-
             this.idQuery = row;
-            // this.idQuery.supId = null;
             this.idQuery.customerId = null;
             this.codeDetailVisible = true;
         },
diff --git a/src/views/inventory/supInvPreInProducts.vue b/src/views/inventory/supInvPreInProducts.vue
index ffb3ec9..0941ef2 100644
--- a/src/views/inventory/supInvPreInProducts.vue
+++ b/src/views/inventory/supInvPreInProducts.vue
@@ -47,6 +47,9 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.orderIdFk" placeholder="单据号"></el-input>
+                    </el-form-item>
                     <el-form-item>
                         <el-button-group>
                             <el-button
@@ -90,27 +93,27 @@
 
                 <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
                                  width="120"></el-table-column>
-<!--                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
-<!--                                 show-overflow-tooltip width="120"></el-table-column>-->
-<!--                <el-table-column label="操作" width="120" fixed="right">-->
-<!--                    <template slot-scope="scope">-->
-<!--                        <el-button-->
-<!--                            type="text"-->
-<!--                            size="small"-->
-<!--                            @click.native.stop="intentDetail(scope.row)"-->
-<!--                        >详情-->
-<!--                        </el-button-->
-<!--                        >-->
+                <!--                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
+                <!--                                 show-overflow-tooltip width="120"></el-table-column>-->
+                <!--                <el-table-column label="操作" width="120" fixed="right">-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        <el-button-->
+                <!--                            type="text"-->
+                <!--                            size="small"-->
+                <!--                            @click.native.stop="intentDetail(scope.row)"-->
+                <!--                        >详情-->
+                <!--                        </el-button-->
+                <!--                        >-->
 
-<!--                        <el-button-->
-<!--                            type="text"-->
-<!--                            size="small"-->
-<!--                            @click.native.stop="deleteDialog(scope.row.id)"-->
-<!--                        >删除-->
-<!--                        </el-button-->
-<!--                        >-->
-<!--                    </template>-->
-<!--                </el-table-column>-->
+                <!--                        <el-button-->
+                <!--                            type="text"-->
+                <!--                            size="small"-->
+                <!--                            @click.native.stop="deleteDialog(scope.row.id)"-->
+                <!--                        >删除-->
+                <!--                        </el-button-->
+                <!--                        >-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
             </el-table>
         </el-card>
 
@@ -140,7 +143,7 @@
 <script>
 import {
     filterProducts,
-    deleteProducts,clearAllProducts
+    deleteProducts, clearAllProducts
 } from "../../api/inventory/InvPreInProducts";
 import draggable from "vuedraggable";
 import codeDetail from "./InvPreInProductsDetail";
@@ -280,14 +283,14 @@ export default {
         },
 
 
-        clearAll(){
+        clearAll() {
             this.$confirm("此操作将永久清空所有预验收库存信息, 是否继续?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
             })
                 .then(() => {
-                    let query={id:1};
+                    let query = {id: 1};
 
                     clearAllProducts(query)
                         .then((response) => {
diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue
index ed7a15c..55705bd 100644
--- a/src/views/purchase/supCertAddDialog.vue
+++ b/src/views/purchase/supCertAddDialog.vue
@@ -1,144 +1,165 @@
 <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 :gutter="20">
-                    <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"></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="name">
-                            <el-input v-model="formData.code" auto-complete="off"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20">
-                    <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"
-                                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"
-                                value-format="yyyy-MM-dd"
-                                style="width: 100%"
-                                placeholder="请选择失效期">
-                            </el-date-picker>
-
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-
-                <el-row :gutter="20">
-                    <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-col :span="3">
-                        <div class="ao-text">
-                            <span>文件：</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item>
-                            <el-upload
-                                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="false">
-                                <el-button slot="trigger" size="small" type="primary">{{ 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-row :gutter="20">-->
-                <!--                    <el-col :span="4">-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="16">-->
-                <!--                        <div style="color: red">-->
-                <!--                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                </el-row>-->
-
-                <el-row :gutter="20">
-                </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 :gutter="20">
+          <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="name">
+              <el-input v-model="formData.code" auto-complete="off"
+                        :disabled="formData.auditStatus == 1"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <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 :gutter="20">
+          <el-col :span="3">
+            <div class="ao-text">
+              <span>状态：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="need">
+              <el-select v-model="formData.status" style="width: 100%">
+                <el-option label="禁用" :value=1></el-option>
+                <el-option label="启用" :value=0></el-option>
+              </el-select>
+            </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="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 :gutter="20">
+          <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="false">
+                <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>
 </template>
 
 <script>
@@ -147,208 +168,229 @@ import store from "../../store";
 import {BASE_URL} from "../../config/app";
 import {insertCompanyCert, updateCompanyCert} from "../../api/purchase/companyCert";
 import ThrInvWarehouse from "@/views/thrsys/ThrInvWarehouse";
+import {removeRl} from "@/api/basic/udiRelevance";
 
 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 {
-            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"}
-                ],
-            },
-            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.$isNotBlank(this.formData.filePath)) {
-
-                        if (this.$refs.upload.uploadFiles.length > 0) {
-                            this.$refs.upload.submit();
-                        } else {
-                            this.onSubmit();
-                        }
-
-                    } else {
-                        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;
-            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;
-            }
-
-            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;
-                this.onSubmit();
-            } else {
-                this.$message.error("文件上传失败：" + response.message);
-            }
-        },
-        uploadHandleError() {
-
-        },
-
-        toViewCompanyCert() {
-            this.certFileUrl = 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 {
+      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"}
+        ],
+      },
+      loading: false,
+      uploadUrl: "",
+      fileList: [],
+      headers: {},
+      choiceFile: "选取文件",
+
+    };
+  },
+  components: {
+    draggable,
+  },
+  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 = 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 this.formData = this.inputQuery.formData;
-
-
-        if (this.formData.filePath != null) {
-            this.choiceFile = "更换文件";
+
+    onConfirmSubmit(val) {
+      this.formData.repeatUpload = val;
+      if (this.$isNotBlank(this.formData.filePath)) {
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
+        } else {
+          this.onSubmit();
+        }
+
+      } else {
+        if (this.$refs.upload.uploadFiles.length > 0) {
+          this.$refs.upload.submit();
         } else {
-            this.choiceFile = "选取文件";
+          this.$message.warning(`请选择文件`);
         }
+      }
+
+    },
+
+    onSubmit() {
+      this.loading = true;
+      this.formData.customerId = this.inputQuery.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;
+        this.onSubmit();
+      } else {
+        this.$message.error("文件上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+
+    toViewCompanyCert() {
+      this.certFileUrl = 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 = 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 this.formData = this.inputQuery.formData;
+
+
+    if (this.formData.filePath != null) {
+      this.choiceFile = "更换文件";
+    } 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/supCertAudit.vue b/src/views/purchase/supCertAudit.vue
index b616583..c1ffb94 100644
--- a/src/views/purchase/supCertAudit.vue
+++ b/src/views/purchase/supCertAudit.vue
@@ -349,7 +349,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             supCompanyVisible: false,
diff --git a/src/views/purchase/supCertSearch.vue b/src/views/purchase/supCertSearch.vue
index 9b52782..122e5e1 100644
--- a/src/views/purchase/supCertSearch.vue
+++ b/src/views/purchase/supCertSearch.vue
@@ -349,7 +349,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             supCompanyVisible: false,
diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue
index e3d2534..b9c143c 100644
--- a/src/views/purchase/supCertSet.vue
+++ b/src/views/purchase/supCertSet.vue
@@ -57,8 +57,6 @@
 
                 <el-form :model="currentSup" :rules="formRules" ref="dataForm">
                     <el-row>
-
-
                         <el-col :span="3">
                             <div class="ao-text">
                                 <span>证书名称：</span>
@@ -77,7 +75,7 @@
                             </div>
                         </el-col>
                         <el-col :span="8">
-                            <el-form-item prop="require">
+                            <el-form-item prop="need">
                                 <el-select v-model="currentSup.need">
                                     <el-option label="是" :value=true></el-option>
                                     <el-option label="否" :value=false></el-option>
@@ -132,17 +130,17 @@
             <el-table v-loading="loading" :data="manufacturerList" style="width: 100%">
                 <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="require" s>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.need] }}</span>
-                    </template>
-                </el-table-column>
                 <el-table-column label="产地" prop="foreign">
                     <template slot-scope="scope">
                         <span>{{ foreignMap[scope.row.foreign] }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="说明" prop="remark"></el-table-column>
+                <el-table-column label="状态" prop="require">
+                    <template slot-scope="scope">
+                        <span>{{ statusMap[scope.row.need] }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -177,10 +175,8 @@
                 v-if="addManufacturerDialogVisible"
             >
 
-                <el-form :model="currentManufacturer" :rules="formRules" ref="dataForm">
+                <el-form :model="currentManufacturer" :rules="formManufactureRules" ref="dataManufacturerForm">
                     <el-row>
-
-
                         <el-col :span="3">
                             <div class="ao-text">
                                 <span>证书名称：</span>
@@ -188,38 +184,38 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item prop="name">
-                                <el-input v-model="currentManufacturer.name" auto-complete="off"></el-input>
+                                <el-input v-model="currentManufacturer.name" auto-complete="off"
+                                          :disabled="currentManufacturer.need"></el-input>
                             </el-form-item>
                         </el-col>
-
-
                         <el-col :span="3">
                             <div class="ao-text">
-                                <span>是否必传：</span>
+                                <span>产地：</span>
                             </div>
                         </el-col>
                         <el-col :span="8">
-                            <el-form-item prop="require">
-                                <el-select v-model="currentManufacturer.need" style="width: 100%">
-                                    <el-option label="是" :value=true></el-option>
-                                    <el-option label="否" :value=false></el-option>
+                            <el-form-item prop="foreign">
+                                <el-select v-model="currentManufacturer.foreign" style="width: 100%"
+                                           :disabled="currentManufacturer.need">
+                                    <el-option label="全部" :value="1"></el-option>
+                                    <el-option label="国外" :value="2"></el-option>
+                                    <el-option label="国内" :value="3"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
+
                     </el-row>
                     <el-row>
-
                         <el-col :span="3">
                             <div class="ao-text">
-                                <span>产地：</span>
+                                <span>是否禁用：</span>
                             </div>
                         </el-col>
                         <el-col :span="8">
-                            <el-form-item prop="require">
-                                <el-select v-model="currentManufacturer.foreign" 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-form-item prop="need">
+                                <el-select v-model="currentManufacturer.need" style="width: 100%">
+                                    <el-option label="是" :value=true></el-option>
+                                    <el-option label="否" :value=false></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -270,11 +266,6 @@
             <el-table v-loading="productLoading" :data="productList" style="width: 100%">
                 <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="need" s>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.need] }}</span>
-                    </template>
-                </el-table-column>
                 <el-table-column label="产地" prop="imports">
                     <template slot-scope="scope">
                         <span>{{ foreignMap[scope.row.imports] }}</span>
@@ -284,7 +275,16 @@
                 </el-table-column>
                 <el-table-column label="产品类别" prop="hchzsb">
                 </el-table-column>
+
+                <el-table-column label="分类编码" prop="flbm">
+                </el-table-column>
+
                 <el-table-column label="说明" prop="remark"></el-table-column>
+                <el-table-column label="状态" prop="need" s>
+                    <template slot-scope="scope">
+                        <span>{{ statusMap[scope.row.need] }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -337,14 +337,14 @@
 
                         <el-col :span="3">
                             <div class="ao-text">
-                                <span>是否必传：</span>
+                                <span>是否禁用：</span>
                             </div>
                         </el-col>
                         <el-col :span="8">
-                            <el-form-item prop="require">
+                            <el-form-item prop="need">
                                 <el-select v-model="currentProduct.need" style="width: 100%">
-                                    <el-option label="是" :value=true></el-option>
-                                    <el-option label="否" :value=false></el-option>
+                                    <el-option label="禁用" :value=true></el-option>
+                                    <el-option label="启用" :value=false></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -414,6 +414,42 @@
                             </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="require">
+                                <el-select
+                                    v-model="currentProduct.flbmList"
+                                    filterable
+                                    remote
+                                    clearable="true"
+                                    style="width: 100%"
+                                    multiple
+                                    reserve-keyword
+                                    placeholder="请选择"
+                                    :remote-method="classifySearch"
+                                    :loading="loading"
+                                >
+                                    <el-option
+                                        v-for="item in classifyList"
+                                        :key="item.code"
+                                        :label="item.name"
+                                        :value="item.code">
+                                        <span>{{ item.code }}</span>
+                                        <span>{{ item.name }}</span>
+                                    </el-option>
+                                </el-select>
+
+
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                 </el-form>
                 <div style="text-align: center">
                     <el-button type="primary" size="small" icon="search" @click="onAddProductSubmit"
@@ -434,6 +470,7 @@
 
 <script>
 import {filterCertSet, delSupCertCert, modifySupCertSet, addSupCertSet} from "@/api/purchase/supCertSet";
+import {filterClassify} from "@/api/purchase/classifyCode"
 
 export default {
     data() {
@@ -459,14 +496,27 @@ export default {
                 update: "编辑配送企业资质设置",
             },
 
-            /**--------生产企业资质设置  0--------------*/
+            formRules: {
+                name: [
+                    {required: true, message: "证书名称", trigger: "blur"}
+                ],
+                need: [
+                    {required: true, message: "请选择是否必传", trigger: "blur"}
+                ],
+
+            },
+
+            /**--------生产企业资质设置  --------------*/
             manufacturerList: [],
             manufacturerQuery: {
                 type: 2,
                 page: 1,
                 limit: 20
             },
-
+            statusMap: {
+                true: "禁用",
+                false: "启用",
+            },
             foreignMap: {
                 "1": "全部",
                 "2": "国外",
@@ -483,6 +533,15 @@ export default {
                 update: "编辑生产企业资质设置",
             },
 
+            formManufactureRules: {
+                name: [
+                    {required: true, message: "证书名称", trigger: "blur"}
+                ],
+                need: [
+                    {required: true, message: "请选择是否禁用", trigger: "blur"}
+                ],
+            },
+
             /**--------产品资质设置--------------*/
             productList: [],
             productQuery: {
@@ -500,6 +559,9 @@ export default {
                 update: "编辑产品资质设置",
             },
 
+            classifyList: [],
+            mutilData: [],
+            inputKey: null,
 
         };
     },
@@ -524,6 +586,8 @@ export default {
                     this.total = 0;
                 });
         },
+
+
         handleEdit(row) {
             this.formName = "update";
             this.currentSup = row;
@@ -547,25 +611,31 @@ export default {
             this.addDialogVisible = true;
         },
         onAddSubmit() {
-            this.addDialogVisible = false;
-            if (this.formName == "add") {
-                this.currentSup.type = 1;
-                addSupCertSet(this.currentSup)
-                    .then((response) => {
-                        this.getList();
-                    })
-                    .catch(() => {
-                    });
-            } else {
-                modifySupCertSet(this.currentSup).then((res) => {
-                    if (res.code == 20000) {
-                        this.getList();
-                        this.$message.success("保存成功！");
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.addDialogVisible = false;
+                    if (this.formName == "add") {
+                        this.currentSup.type = 1;
+                        addSupCertSet(this.currentSup)
+                            .then((response) => {
+                                this.getList();
+                            })
+                            .catch(() => {
+                            });
                     } else {
-                        this.$message.error(res.message);
+                        modifySupCertSet(this.currentSup).then((res) => {
+                            if (res.code == 20000) {
+                                this.getList();
+                                this.$message.success("保存成功！");
+                            } else {
+                                this.$message.error(res.message);
+                            }
+                        })
                     }
-                })
-            }
+                }
+            });
+
+
         },
         cancelDialog() {
             this.addDialogVisible = false;
@@ -612,25 +682,31 @@ export default {
             this.addManufacturerDialogVisible = true;
         },
         onAddManufacturerSubmit() {
-            this.addManufacturerDialogVisible = false;
-            if (this.formManufacturerName == "add") {
-                this.currentManufacturer.type = 2;
-                addSupCertSet(this.currentManufacturer)
-                    .then((response) => {
-                        this.getManufacturerList();
-                    })
-                    .catch(() => {
-                    });
-            } else {
-                modifySupCertSet(this.currentManufacturer).then((res) => {
-                    if (res.code == 20000) {
-                        this.getManufacturerList();
-                        this.$message.success("保存成功！");
+
+            this.$refs["dataManufacturerForm"].validate(valid => {
+                if (valid) {
+                    this.addManufacturerDialogVisible = false;
+                    if (this.formManufacturerName == "add") {
+                        this.currentManufacturer.type = 2;
+                        addSupCertSet(this.currentManufacturer)
+                            .then((response) => {
+                                this.getManufacturerList();
+                            })
+                            .catch(() => {
+                            });
                     } else {
-                        this.$message.error(res.message);
+                        modifySupCertSet(this.currentManufacturer).then((res) => {
+                            if (res.code == 20000) {
+                                this.getManufacturerList();
+                                this.$message.success("保存成功！");
+                            } else {
+                                this.$message.error(res.message);
+                            }
+                        })
                     }
-                })
-            }
+                }
+            });
+
         },
 
 
@@ -654,6 +730,8 @@ export default {
             this.currentProduct = row;
             this.addProductDialogVisible = true;
 
+            this.classifyFirstSearch(this.currentProduct.flbm);
+
         },
         handleProductDel(row) {
             let query = {
@@ -672,28 +750,62 @@ export default {
             this.addProductDialogVisible = true;
         },
         onAddProductSubmit() {
-            this.addProductDialogVisible = false;
-            if (this.formProductName == "add") {
-                this.currentProduct.type = 3;
-                addSupCertSet(this.currentProduct)
-                    .then((response) => {
-                        this.getProductList();
-                    })
-                    .catch(() => {
-                    });
-            } else {
-                modifySupCertSet(this.currentProduct).then((res) => {
-                    if (res.code == 20000) {
-                        this.getProductList();
-                        this.$message.success("保存成功！");
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.addProductDialogVisible = false;
+                    if (this.formProductName == "add") {
+                        this.currentProduct.type = 3;
+                        addSupCertSet(this.currentProduct)
+                            .then((response) => {
+                                this.getProductList();
+                            })
+                            .catch(() => {
+                            });
                     } else {
-                        this.$message.error(res.message);
+                        modifySupCertSet(this.currentProduct).then((res) => {
+                            if (res.code == 20000) {
+                                this.getProductList();
+                                this.$message.success("保存成功！");
+                            } else {
+                                this.$message.error(res.message);
+                            }
+                        })
                     }
-                })
-            }
+                }
+            })
+
         },
 
 
+        classifyFirstSearch(key) {
+            let query = {
+                inFilter: key,
+            }
+            filterClassify(query)
+                .then(response => {
+                    this.loading = false;
+                    this.classifyList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.classifyList = [];
+                });
+        },
+
+        classifySearch(key) {
+            let query = {
+                key: key,
+            }
+            filterClassify(query)
+                .then(response => {
+                    this.loading = false;
+                    this.classifyList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.classifyList = [];
+                });
+        },
     },
     filters: {},
     mounted() {
diff --git a/src/views/purchase/supCertSetSelectDialog.vue b/src/views/purchase/supCertSetSelectDialog.vue
index 9b2769c..3ed93db 100644
--- a/src/views/purchase/supCertSetSelectDialog.vue
+++ b/src/views/purchase/supCertSetSelectDialog.vue
@@ -14,11 +14,34 @@
                 <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="require" s>
+                <el-table-column label="是否必传" prop="require" v-if="certType == 1">
                     <template slot-scope="scope">
                         <span>{{ enableMap[scope.row.need] }}</span>
                     </template>
                 </el-table-column>
+
+                <el-table-column label="产地" prop="foreign" v-if="certType == 2">
+                    <template slot-scope="scope">
+                        <span>{{ foreignMap[scope.row.foreign] }}</span>
+                    </template>
+                </el-table-column>
+
+
+                <el-table-column label="产地" prop="imports" v-if="certType == 3">
+                    <template slot-scope="scope">
+                        <span>{{ foreignMap[scope.row.imports] }}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="产品类型" prop="cplx" v-if="certType == 3">
+                </el-table-column>
+                <el-table-column label="产品类别" prop="hchzsb" v-if="certType == 3">
+                </el-table-column>
+
+                <el-table-column label="分类编码" prop="flbm" v-if="certType == 3">
+                </el-table-column>
+
+
                 <el-table-column label="说明" prop="remark"></el-table-column>
             </el-table>
             <el-pagination
@@ -47,7 +70,7 @@ export default {
             type: Function,
             required: true,
         },
-        certType: {
+        certType: {                 //类型：（1.供应商，2.生产企业，3，产品)
             type: Object,
             required: true,
         },
@@ -79,6 +102,12 @@ export default {
             list: [],
             total: 0,
             loading: false,
+            foreignMap: {
+                "1": "全部",
+                "2": "国外",
+                "3": "国内",
+
+            },
         };
     },
     methods: {
diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue
index 91b654e..55eb482 100644
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@@ -256,7 +256,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             loading: false,
diff --git a/src/views/purchase/supCompanyAdd.vue b/src/views/purchase/supCompanyAdd.vue
index dc2cfb3..6ac3ff7 100644
--- a/src/views/purchase/supCompanyAdd.vue
+++ b/src/views/purchase/supCompanyAdd.vue
@@ -155,7 +155,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
 
diff --git a/src/views/purchase/supCompanyAduditDialog.vue b/src/views/purchase/supCompanyAduditDialog.vue
index 22e166a..0519b3d 100644
--- a/src/views/purchase/supCompanyAduditDialog.vue
+++ b/src/views/purchase/supCompanyAduditDialog.vue
@@ -352,7 +352,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             certAuditVisible: false,
diff --git a/src/views/purchase/supCompanyAudit.vue b/src/views/purchase/supCompanyAudit.vue
index da1549b..b9676d8 100644
--- a/src/views/purchase/supCompanyAudit.vue
+++ b/src/views/purchase/supCompanyAudit.vue
@@ -144,7 +144,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
 
diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue
index fbbd494..82f839c 100644
--- a/src/views/purchase/supCompanyEditDialog.vue
+++ b/src/views/purchase/supCompanyEditDialog.vue
@@ -380,7 +380,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             editTye: 1,
diff --git a/src/views/purchase/supCompanySearch.vue b/src/views/purchase/supCompanySearch.vue
index c5d66bb..0de0ff7 100644
--- a/src/views/purchase/supCompanySearch.vue
+++ b/src/views/purchase/supCompanySearch.vue
@@ -136,7 +136,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
 
diff --git a/src/views/purchase/supManufacturerAdd.vue b/src/views/purchase/supManufacturerAdd.vue
index c99e7b1..3fd113c 100644
--- a/src/views/purchase/supManufacturerAdd.vue
+++ b/src/views/purchase/supManufacturerAdd.vue
@@ -163,7 +163,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             loading: false,
diff --git a/src/views/purchase/supManufacturerAudit.vue b/src/views/purchase/supManufacturerAudit.vue
index 1572e69..6cc1e91 100644
--- a/src/views/purchase/supManufacturerAudit.vue
+++ b/src/views/purchase/supManufacturerAudit.vue
@@ -147,7 +147,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             loading: false,
diff --git a/src/views/purchase/supManufacturerAuditDialog.vue b/src/views/purchase/supManufacturerAuditDialog.vue
index 8a29fd0..9b9db92 100644
--- a/src/views/purchase/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/supManufacturerAuditDialog.vue
@@ -400,7 +400,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             certAuditVisible: false,
diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue
index 3bec213..d83afc6 100644
--- a/src/views/purchase/supManufacturerEditDialog.vue
+++ b/src/views/purchase/supManufacturerEditDialog.vue
@@ -1,327 +1,327 @@
 <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="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(4)"
-                    >提交变更
-                    </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: 30px">
-                    <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="remark"></el-table-column>
-                    <el-table-column label="操作" fixed="right" width="250">
-                        <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>
-                <el-pagination
-                    :page-size="certQuery.limit"
-                    @current-change="certHandleCurrentChange"
-                    layout="prev, pager, next"
-                    :total="certTotal"
+  <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="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(4)"
+          >提交变更
+          </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"
                 >
-                </el-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
             >
-                <supCertSetSelectDialog
-                    :certType="certType"
-                    :manufacturerId="manufacturerId"
-                    :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%;"
+              >
+                <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: 30px">
+          <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="remark"></el-table-column>
+          <el-table-column label="操作" fixed="right" width="250">
+            <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>
+        <el-pagination
+            :page-size="certQuery.limit"
+            @current-change="certHandleCurrentChange"
+            layout="prev, pager, next"
+            :total="certTotal"
+        >
+        </el-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"
+            :closeDialog="closeLocalDialog"
+        ></supCertSetSelectDialog>
+      </el-dialog>
+    </el-form>
+  </div>
 </template>
 
 <script>
 import {getCompanyInfo, addOrModifyCompany} from "../../api/purchase/supManufacturer";
 import {
-    provinceAndCityData,
-    regionData,
-    provinceAndCityDataPlus,
-    regionDataPlus,
-    CodeToText,
-    TextToCode,
+  provinceAndCityData,
+  regionData,
+  provinceAndCityDataPlus,
+  regionDataPlus,
+  CodeToText,
+  TextToCode,
 } from "element-china-area-data";
 import {BASE_URL} from "../../config/app";
 import {filterCompanyCert, deleteCompanyCert, updateCompanyCert} from "../../api/purchase/companyCert";
@@ -333,399 +333,402 @@ import {getUUID} from "@/utils/strUtil";
 import supCertSetSelectDialog from "@/views/purchase/supCertSetSelectDialog";
 
 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 {
+      loading: false,
+      classesDisplay: false,
+      selectedOptions: [],
+      selectedOptions2: [],
+      options: regionDataPlus,
+      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,
-        },
-        inputQuery: {
-            type: Object,
+            message: "请选择登记状态",
+            trigger: "change"
+          }
+        ],
+        placeArea: [
+          {
             required: true,
-        },
-        editType: {
-            type: Object,
+            message: "请选择所在地区",
+            trigger: "change"
+          }
+        ],
+        placeAddress: [
+          {
             required: true,
-        },
-        fromType: {
-            type: Object,
+            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: "未审核",
+      },
+      editTye: 1,
+      formName: 1,
+      formMap: {
+        1: "新增生产企业资质证书",
+        2: "编辑生产企业资质证书",
+      },
+      manufacturerId: 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(",");
+      this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
+
+    }
+    this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
+    this.manufacturerId = this.inputQuery.manufacturerId
+    // this.getData();
+    this.getCompanyCertList();
+    this.findMethod();
+    this.uploadUrl = BASE_URL + "/udiwms/upload/register/file";
+    this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+    this.certFileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+  },
+  components: {
+    draggable,
+    companyAddCert, supCertSetSelectDialog
+  },
+  methods: {
+    onModifySubmit(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;
         }
+      });
     },
-    data() {
-        return {
-            loading: false,
-            classesDisplay: false,
-            selectedOptions: [],
-            selectedOptions2: [],
-            options: regionDataPlus,
-            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: "已拒绝",
-                4: "变更未审核",
-                6: "未审核",
-            },
-            editTye: 1,
-            formName: 1,
-            formMap: {
-                1: "新增生产企业资质证书",
-                2: "编辑生产企业资质证书",
-            },
-            manufacturerId: null,
-            selectCertVisible: false,
-            certType: 2,
-        };
+    certHandleCurrentChange(val) {
+      this.certQuery.page = val;
+      this.getCompanyCertList();
+    },
+    getCompanyCertList() {
+      this.certLoading = true;
+      filterCompanyCert(this.certQuery)
+          .then((response) => {
+            this.certLoading = false;
+            this.certList = response.data.list || [];
+          })
+          .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.editTye = 1;
+      }
+      this.addCertVisible = true;
     },
-    created() {
-        if (this.editType == 0) {
-            this.inputQuery.manufacturerId = getUUID("")
-        } else {
-            this.certQuery.customerId = this.inputQuery.customerId;
-            this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
-            this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
 
-        }
-        this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
-        this.manufacturerId = this.inputQuery.manufacturerId
-        // this.getData();
-        this.getCompanyCertList();
-        this.findMethod();
-        this.uploadUrl = BASE_URL + "/udiwms/upload/register/file";
-        this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-        this.certFileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+    selectCert() {
+      this.selectCertVisible = true;
     },
-    components: {
-        draggable,
-        companyAddCert, supCertSetSelectDialog
+
+    toViewCompanyCert(row) {
+      window.open(this.certFileUrl + row.filePath);
     },
-    methods: {
-        onModifySubmit(type) {
-
-            this.$refs["inputQuery"].validate(valid => {
-                if (valid) {
-                    this.inputQuery.auditStatus = type;
-                    this.loading = true;
-                    let urlName = this.editType == 0 ? 'add' : 'update';
-                    addOrModifyCompany(this.inputQuery, 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;
-            this.getCompanyCertList();
-        },
-        getCompanyCertList() {
-            this.certLoading = true;
-            filterCompanyCert(this.certQuery)
-                .then((response) => {
-                    this.certLoading = false;
-                    this.certList = response.data.list || [];
-                })
-                .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: "删除成功！",
                 });
-        },
-        addCert(row) {
-            if (this.$isNotBlank(row)) {
-                this.formName = 2
-                this.inputQuery.formData = row;
-                this.editTye = 2;
-            } else {
-                this.formName = 1;
-                this.editTye = 1;
-            }
-            this.addCertVisible = true;
-        },
-
-        selectCert() {
-            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);
-                }
+              } 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;
-                });
-        }
-        ,
-        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)
-            if (response.code === 20000) {
-                this.inputQuery.newFilePath = response.data.name;
-                this.onModifySubmit('inputQuery');
-            } else {
-                this.$message.error("文件上传失败：" + response.message);
-            }
-        },
-        uploadHandleError() {
+    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;
     },
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "warning",
-                1: "success",
-                2: "danger",
-                6: "warning",
-            };
-            return statusMap[status];
-        },
+
+    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)
+      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/supManufacturerSearch.vue b/src/views/purchase/supManufacturerSearch.vue
index cb7de20..e283b85 100644
--- a/src/views/purchase/supManufacturerSearch.vue
+++ b/src/views/purchase/supManufacturerSearch.vue
@@ -149,7 +149,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             loading: false,
diff --git a/src/views/purchase/supProductAdd.vue b/src/views/purchase/supProductAdd.vue
index 33277ee..76e0880 100644
--- a/src/views/purchase/supProductAdd.vue
+++ b/src/views/purchase/supProductAdd.vue
@@ -176,7 +176,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             list: [],
diff --git a/src/views/purchase/supProductAudit.vue b/src/views/purchase/supProductAudit.vue
index d17179f..eafa552 100644
--- a/src/views/purchase/supProductAudit.vue
+++ b/src/views/purchase/supProductAudit.vue
@@ -160,7 +160,7 @@ export default {
           0: "草稿",
           1: "已通过",
           2: "已拒绝",
-          4: "变更未审核",
+          3: "变更未审核",
           6: "未审核",
       },
       list: [],
diff --git a/src/views/purchase/supProductAuditDialog.vue b/src/views/purchase/supProductAuditDialog.vue
index c669b23..b9814e7 100644
--- a/src/views/purchase/supProductAuditDialog.vue
+++ b/src/views/purchase/supProductAuditDialog.vue
@@ -420,7 +420,7 @@ export default {
           0: "草稿",
           1: "已通过",
           2: "已拒绝",
-          4: "变更未审核",
+          3: "变更未审核",
           6: "未审核",
       },
 
diff --git a/src/views/purchase/supProductEditDialog.vue b/src/views/purchase/supProductEditDialog.vue
index 4b7bfa3..343fa48 100644
--- a/src/views/purchase/supProductEditDialog.vue
+++ b/src/views/purchase/supProductEditDialog.vue
@@ -43,7 +43,7 @@
                         icon="search"
                         v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
                         @click="onModifySubmit(4)"
-                    >提交变更
+                    >提交审核
                     </el-button
                     >
                 </div>
@@ -104,56 +104,35 @@
 
                 <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="recordProductName">
+                        <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-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="recordPeopleName">
                             <el-input
                                 size="small"
+                                disabled
                                 placeholder="请输入内容"
                                 v-model="inputQuery.recordPeopleName"
                                 @input="change()"
                             ></el-input>
                         </el-form-item>
                     </el-col>
-                    <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"
-                                @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%;"
@@ -169,6 +148,7 @@
                                 size="small"
                                 v-model="inputQuery.productType"
                                 placeholder="器械类别"
+                                disabled
                                 style="width: 100%;"
                             >
                                 <el-option label="器械" value="器械"></el-option>
@@ -180,38 +160,40 @@
 
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="10" class="el-col">
-                        <el-form-item label="商品条码:" label-width="150px" prop="sptm">
+                        <el-form-item label="注册/备案号:" label-width="150px" prop="recordCode">
                             <el-input
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="inputQuery.sptm"
+                                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="ybbm">
+                        <el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode">
                             <el-input
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="inputQuery.ybbm"
+                                disabled
+                                v-model="inputQuery.productDirectoryCode"
                                 @input="change()"
                             ></el-input>
                         </el-form-item>
                     </el-col>
+                    <!--                    <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"-->
+                    <!--                                @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="measname">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.measname"
-                                @input="change()"
-                            ></el-input>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="10" class="el-col">
                         <el-form-item label="产品描述:" label-width="150px" prop="cpms">
                             <el-input
@@ -222,23 +204,12 @@
                             ></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="productDirectoryCode">
-                            <el-input
-                                size="small"
-                                placeholder="请输入内容"
-                                v-model="inputQuery.productDirectoryCode"
-                                @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-form-item label="规格型号:" label-width="150px" prop="specification" >
                             <el-input
                                 size="small"
+                                type="textarea"
+                                autosize
                                 placeholder="请输入内容"
                                 v-model="inputQuery.specification"
                                 @input="change()"
@@ -247,6 +218,7 @@
                     </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">
@@ -528,7 +500,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             editTye: 1,
diff --git a/src/views/purchase/supProductSearch.vue b/src/views/purchase/supProductSearch.vue
index 135cffb..7653a99 100644
--- a/src/views/purchase/supProductSearch.vue
+++ b/src/views/purchase/supProductSearch.vue
@@ -171,7 +171,7 @@ export default {
                 0: "草稿",
                 1: "已通过",
                 2: "已拒绝",
-                4: "变更未审核",
+                3: "变更未审核",
                 6: "未审核",
             },
             list: [],
diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue
index c49d134..ce888b1 100644
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@@ -39,7 +39,7 @@
                             <el-button-group>
                                 <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                                 <el-button type="primary" icon="search" @click="search">查询</el-button>
-                                <el-button type="primary" icon="search" @click="combine">确定</el-button>
+                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
                             </el-button-group>
                         </el-form-item>
                     </el-row>
@@ -54,9 +54,14 @@
                     @current-change="handleChange"
                     ref="multipleTable"
                 >
-                    <el-table-column
-                        type="selection"
-                        width="55">
+                    <!--                    <el-table-column-->
+                    <!--                        type="selection"-->
+                    <!--                        width="55">-->
+                    <!--                    </el-table-column>-->
+                    <el-table-column label width="45">
+                        <template slot-scope="scope">
+                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+                        </template>
                     </el-table-column>
                     <el-table-column label="序号" type="index"></el-table-column>
                     <el-table-column
@@ -127,6 +132,21 @@
         >
             <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
         </el-dialog>
+
+        <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
+            <el-form :model="form">
+                <el-form-item label="" prop="isGive">
+                    <el-radio-group v-model="currentCert">
+                        <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="selectCert">确 定</el-button>
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+            </div>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -164,13 +184,13 @@ export default {
                 erpName: "",
                 keys: [],
             },
+            radioCheck: null,
             dataList: [],
             pageTotal: 1,
             total: 1,
             currentRow: null,
             loading: false,
             udiRlDetailVisible: false,
-            multipleUdiSelection: [],
             thirdSys: [],
             thirdSysFk: null,
             busTypes: [],
@@ -208,6 +228,10 @@ export default {
             },
             orderEditor: false,
             orderId: "",
+            currentCert: null,
+            certList: [],
+            dialogFormVisible: false,
+            multipleSelection: null,
         };
     },
     methods: {
@@ -243,7 +267,9 @@ export default {
             this.getList();
         },
         handleChange(val) {
+            this.radioCheck = val.id;
             this.currentRow = val;
+            this.multipleSelection = val
         },
         handleDetailClick(row) {
             this.currentRow = row;
@@ -287,40 +313,59 @@ export default {
         intentBack() {
             this.closeDialog();
         },
-        combine() {
-            let selection = this.$refs.multipleTable.selection;
-            if (selection.length < 1) {
+
+
+        confirmSelect() {
+            if (this.multipleSelection == null) {
                 this.$message.error('未选择产品');
                 return;
             }
-            let ids = [];
+            let str = this.multipleSelection.zczbhhzbapzbh;
+            if (str.search(",") != -1) {
+                this.currentCert = null;
+                this.certList = str.split(',');
+                this.dialogFormVisible = true;
+            } else {
+                this.combine();
+            }
+        },
 
-            selection.forEach((obj, index) => {
-                let data = {
-                    relId: obj.rlId,
-                }
-                ids.push(data);
-            });
+        combine() {
+            let ids = [];
+            let data = {
+                relId: this.multipleSelection.rlId,
+            }
+            ids.push(data);
             this.loading = true;
             let tQuery = {
                 datas: ids,
                 stockOrderLists: this.data.stockOrderLists,
+                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
             };
             getStockOrderDetailInstrumentById(tQuery).then((response) => {
                 this.loading = false;
                 if (response.code === 20000) {
-                   
                     this.closeDialog(response.data);
                 } else {
-                    this.$message.error(response.message);
+                    if (response.code == 601) {
+                        this.$alert(response.message, "提示", {
+                            confirmButtonText: "确定",
+                        });
+                    } else
+                        this.$message.error(response.message);
                 }
             }).catch(() => {
                 this.loading = false;
             });
 
         },
-        handleSelectionUdiChange(val) {
-            this.multipleUdiSelection = val;
+
+        selectCert() {
+            if (this.currentCert == null) {
+                this.$message.error("请先选择对应的注册证！");
+            }
+            this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+            this.combine();
         },
     },
     components: {udiRlDetailDialog},