Merge remote-tracking branch 'origin/master'

src/views/inout/IoSupAduitOrder.vue

@@ -524,7 +524,7 @@ export default {
       this.filterQuery = {
         id: "",
         billNo: null,
-        statusType: "audited",
+        statusType: "checkSuccess",
         mainAction: null,
         action: null,
         page: 1,

src/views/purchase/cert/supCertAudit.vue

@@ -513,7 +513,8 @@ export default {
         this.getManufacturerList();
       },
         onManufacturerSubmit() {
-          this.onManufacturerReset();
+          //this.onManufacturerReset();
+          this.getManufacturerList();
           this.addInfoVisible=false;
         },
         hideSearch2() {

src/views/supplier/products/supProductsAddDi.vue

@@ -57,9 +57,9 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="产品标识" prop="code" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="standard" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册证编号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册证编号" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="审核状态" prop="status" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ checkMap[scope.row.status] }}</span>