From 493eb8e4e1b4320192e5c4f3076dfdaefaac58da Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 30 Jun 2023 12:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=B5=84=E8=B4=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/cert/supCertAudit.vue      | 89 ++++++++++++-------
 .../product/supProductAuditDialog.vue         | 16 ++--
 2 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index c2c69ef..49c2064 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -49,14 +49,28 @@
         </el-table-column>
 
 
-        <el-table-column label="生产企业资质证书" prop="checkStatus" width="180">
+<!--        <el-table-column label="生产企业资质证书" prop="checkStatus" width="180">-->
+<!--          <template slot-scope="scope">-->
+
+<!--            <el-tag type="danger" v-if="scope.row.checkStatus==0">-->
+<!--              未审核-->
+<!--            </el-tag>-->
+<!--            <el-tag type="success" v-if="scope.row.checkStatus==1">-->
+<!--              已审核-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column label="生产企业资质证书" prop="auditStatus" width="180">
           <template slot-scope="scope">
 
-            <el-tag type="danger" v-if="scope.row.checkStatus==0">
-              未审核
+            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+              未添加证书
             </el-tag>
-            <el-tag type="success" v-if="scope.row.checkStatus==1">
-              已审核
+            <el-tag type="warning" v-if="scope.row.failCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+              已全部审核
             </el-tag>
           </template>
         </el-table-column>
@@ -163,8 +177,8 @@
       <el-table v-loading="loadManufacturerLoading" :data="manufacturerList" style="width: 100%" ref="table"
                 highlight-current-row border @row-click="supManufacturerClick">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="生产企业名称" prop="ylqxzcrbarmc" width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column label="统一社会信用代码" prop="tyshxydm"show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业名称" prop="companyName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="统一社会信用代码" prop="creditCode"show-overflow-tooltip></el-table-column>
 <!--        <el-table-column label="注册/备案证号" prop="zczbhhzbapzbh"show-overflow-tooltip></el-table-column>-->
         <el-table-column label="企业类型" prop="companyType" width="120">
           <template slot-scope="scope">
@@ -202,10 +216,10 @@
 
         <el-table-column label="操作" width="120">
           <template slot-scope="scope">
-<!--            <el-button type="text" size="small"-->
-<!--                       v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"-->
-<!--                       @click.native.stop="addInfoDialog(scope.row)">审核-->
-<!--            </el-button>-->
+            <el-button type="text" size="small"
+                       v-if="scope.row.auditStatus ==6 || scope.row.auditStatus ==3|| scope.row.auditStatus ==4"
+                       @click.native.stop="addInfoDialog(scope.row)">审核
+            </el-button>
             <el-button type="text" size="small"
                        v-if="scope.row.auditStatus !=6 && scope.row.auditStatus !=3 && scope.row.auditStatus !=4"
                        @click.native.stop="addInfoDialog(scope.row)">详情
@@ -283,11 +297,12 @@
       <el-table v-loading="registrationLoading" :data="registrationList" border highlight-current-row
                 style="width: 100%">
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案人名称" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="所属供应商" prop="companyName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
+<!--        <el-table-column label="所属供应商" prop="companyName" show-overflow-tooltip></el-table-column>-->
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -574,26 +589,29 @@ export default {
       this.supCompanyVisible = false;
     },
 
+    // supCompanyClick(row) {
+    //   this.filterManufacturerQuery.customerId = row.id;
+    //   this.registrationList = [];
+    //   this.onManufacturerReset();
+    // },
     supCompanyClick(row) {
-      this.filterManufacturerQuery.customerId = row.id;
+      this.filterManufacturerQuery.customerId = row.customerId;
       this.registrationList = [];
       this.onManufacturerReset();
     },
 
-
     /**-------------------------生产企业资质--------------------------*/
     onManufacturerReset() {
       let companyIdFk = this.filterManufacturerQuery.customerId;
-      // let customerId = this.filterManufacturerQuery.customerId;
-
+      let customerId = this.filterManufacturerQuery.customerId;
       this.filterManufacturerQuery = {
-        customerId: "",
+        customerId: customerId,
         companyIdFk:companyIdFk,
         companyName: "",
         creditCode: "",
         placeArea: "",
         page: 1,
-        // auditStatus: "21",
+        auditStatus: "21",
         limit: 10,
       };
       this.manufacturerList = [];
@@ -617,8 +635,7 @@ export default {
     },
     getManufacturerList() {
       this.manufacturerLoading = true;
-      // this.filterManufacturerQuery.productStatus = 1;
-      // this.filterManufacturerQuery.companyIdFk=this.list.id
+      this.filterManufacturerQuery.productStatus = 1;
 
       getCompanyList(this.filterManufacturerQuery)
         .then((response) => {
@@ -663,25 +680,37 @@ export default {
       this.getManufacturerList();
     },
 
+    // supManufacturerClick(row) {
+    //   //bur的id
+    //   this.registrationQuery.customerId = row.id;
+    //   //sm的manufacturerId
+    //   this.registrationQuery.manufacturerIdFk = row.manufacturerId;
+    //   this.onReset2();
+    // },
     supManufacturerClick(row) {
-      //bur的id
-      this.registrationQuery.customerId = row.id;
-      //sm的manufacturerId
+      this.registrationQuery.customerId = row.customerId;
       this.registrationQuery.manufacturerIdFk = row.manufacturerId;
       this.onReset2();
     },
 
 
     /**-------------------------配送产品资质--------------------------*/
+    // onReset2() {
+    //
+    //   let burId = this.registrationQuery.customerId;
+    //   let manufacturerIdFk = this.registrationQuery.manufacturerIdFk;
+    //
+    //   this.registrationQuery = {
+    //     // customerId: customerId,
     onReset2() {
 
-      let burId = this.registrationQuery.customerId;
+      let customerId = this.registrationQuery.customerId;
       let manufacturerIdFk = this.registrationQuery.manufacturerIdFk;
 
       this.registrationQuery = {
-        // customerId: customerId,
+        customerId: customerId,
         manufacturerIdFk: manufacturerIdFk,
-        burId: burId,
+        // burId: burId,
         recordProductName: "",
         recordCode: "",
         recordPeopleName: "",
diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue
index 1b19624..c180f52 100644
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@@ -104,11 +104,11 @@
             </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="cpmctymc">
               <el-input
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.recordProductName" disabled
+                v-model="inputQuery.cpmctymc" 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="recordPeopleName">
+            <el-form-item label="注册/备案人名称:" label-width="150px" prop="ylqxzcrbarmc">
               <el-input
                 size="small"
                 placeholder="请输入内容" disabled
-                v-model="inputQuery.recordPeopleName"
+                v-model="inputQuery.ylqxzcrbarmc"
                 @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="productDirectoryCode">
+            <el-form-item label="器械目录分类编码:" label-width="150px" prop="flbm">
               <el-input
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.productDirectoryCode" disabled
+                v-model="inputQuery.flbm" 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="specification">
+            <el-form-item label="规格型号:" label-width="150px" prop="ggxh">
               <el-input
                 type="textarea"
                 size="small"
                 placeholder="请输入内容"
-                v-model="inputQuery.specification" disabled
+                v-model="inputQuery.ggxh" disabled
                 @input="change()"
               ></el-input>
             </el-form-item>