Merge remote-tracking branch 'origin/master'

src/api/purchase/companyCert.js

@@ -3,7 +3,8 @@ import axios from "@/utils/request";
 export function filterCompanyCert(query) {
     return axios(
         {
-            url: "/sup/company/cert/filterList",
+            // url: "/sup/company/cert/filterList",
+            url: "/sup/company/cert/filter",
             method: "get",
             params: query
         }

src/views/purchase/product/supProductAuditDialog.vue

@@ -41,9 +41,9 @@
 
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
           <el-col :span="10" class="el-col">
-            <el-form-item label="所属供应商:" label-width="150px" prop="companyName">
+            <el-form-item label="所属供应商:" label-width="150px" prop="customerId">
               <el-select
-                v-model="inputQuery.companyName"
+                v-model="inputQuery.customerId"
                 filterable
                 remote
                 clearable="true"
@@ -66,9 +66,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="所属生产企业:" label-width="150px" prop="ylqxzcrbarmc">
+            <el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk">
               <el-select
-                v-model="inputQuery.ylqxzcrbarmc"
+                v-model="inputQuery.manufacturerIdFk"
                 filterable
                 remote
                 clearable="true"
@@ -94,21 +94,21 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="注册/备案号:" label-width="150px" prop="zczbhhzbapzbh">
+            <el-form-item label="注册/备案号:" label-width="150px" prop="recordCode">
               <el-input
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.zczbhhzbapzbh" disabled
+                v-model="inputQuery.recordCode" disabled
                 @input="change()"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10" class="el-col">
-            <el-form-item label="注册/备案产品名称:" label-width="150px" prop="cpmctymc">
+            <el-form-item label="注册/备案产品名称:" label-width="150px" prop="recordProductName">
               <el-input
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.cpmctymc" disabled
+                v-model="inputQuery.recordProductName" disabled
                 @input="change()"
               ></el-input>
             </el-form-item>
@@ -117,11 +117,11 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="注册/备案人名称:" label-width="150px" prop="ylqxzcrbarmc">
+            <el-form-item label="注册/备案人名称:" label-width="150px" prop="recordPeopleName">
               <el-input
                 size="small"
                 placeholder="请输入内容" disabled
-                v-model="inputQuery.ylqxzcrbarmc"
+                v-model="inputQuery.recordPeopleName"
                 @input="change()"
               ></el-input>
             </el-form-item>
@@ -171,11 +171,11 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="10" class="el-col">
-            <el-form-item label="器械目录分类编码:" label-width="150px" prop="flbm">
+            <el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode">
               <el-input
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.flbm" disabled
+                v-model="inputQuery.productDirectoryCode" disabled
                 @input="change()"
               ></el-input>
             </el-form-item>
@@ -184,12 +184,12 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="20" class="el-col">
-            <el-form-item label="规格型号:" label-width="150px" prop="ggxh">
+            <el-form-item label="规格型号:" label-width="150px" prop="productDirectoryCode">
               <el-input
                 type="textarea"
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.ggxh" disabled
+                v-model="inputQuery.productDirectoryCode" disabled
                 @input="change()"
               ></el-input>
             </el-form-item>