From 733337c94876b2f7f7e781781f6e1ba69508f584 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 12 Mar 2023 17:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5bug=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |  6 +++
 .../basic/product/UdiInfoSelectLocalUdi.vue   | 39 +++++++++++++++++++
 src/views/basic/product/UdiInfoSelectRel.vue  | 39 +++++++++++++++++++
 src/views/purchase/cert/supCertAudit.vue      |  9 ++++-
 .../purchase/cert/supCertSetSelectDialog.vue  |  2 +-
 .../purchase/cert/supCertificationAdd.vue     |  7 +++-
 .../purchase/company/companyProducts.vue      |  9 ++---
 .../purchase/product/supProductEditDialog.vue | 13 ++++---
 .../supplier/company/basicCompanyProducts.vue |  1 +
 .../company/basicCompanyProductsImport.vue    |  2 +
 .../supplier/products/supProductsSubmit.vue   | 12 ++++--
 .../thirdSys/product/thrProductsDetail.vue    |  2 +-
 12 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a27d0b6..0bfff01 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -13,6 +13,8 @@
           <span
             style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
         </div>
+        <span style="font-weight: 500;color:rgb(51 48 48);">{{this.companyName}}</span>
+        <span style="font-weight: 500;color:rgb(51 48 48);">({{this.userName}})</span>
         <search id="header-search" class="right-menu-item"/>
         <screenfull id="screenfull" class="right-menu-item hover-effect"/>
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -124,6 +126,8 @@ export default {
       userInfo: {},
       deptList: [],
       invList: [],
+      userName:'',
+      companyName:'',
       formRules: {
         locDeptCode: [
           {required: true, message: "请选择当前部门", trigger: "blur"}
@@ -270,6 +274,8 @@ export default {
 
   },
   created() {
+    this.userName=this.$store.getters.name;
+    this.companyName=this.$store.getters.companyName;
       this.userInfo = {
         id: store.getters.adminId,
         locInvCode: store.getters.locInvCode,
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index b4dccbc..f1d2427 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -88,6 +88,10 @@
             >选入
             </el-button
             >
+            <el-button type="primary" icon="el-icon-search" @click="getSuperSeaech" size="mini"
+            >国家同步库查询
+            </el-button
+            >
           </el-button-group>
         </div>
         <el-divider style="margin: 15px"></el-divider>
@@ -333,6 +337,7 @@
 
 <script>
 import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
+import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
 
@@ -426,6 +431,40 @@ export default {
       this.unionQuery.page = 1;
       this.getList();
     },
+    getSuperSeaech() {
+
+      this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.unionQuery.nameCode == "") {
+            this.$message.warning("请输入完成DI信息进行查询！");
+            return;
+          }
+          this.loading = true;
+          superSearch(this.unionQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.udidlList = response.data.list || [];
+                this.total = response.data.total || 0;
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
+        })
+        .catch(() => {
+        });
+
+
+    },
 
     getList() {
       if (
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index 4df745f..1e7d154 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -80,6 +80,10 @@
             <el-button icon="el-icon-view" type="primary" @click="hideThrSearch">显示/隐藏搜索栏</el-button>
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="searchErpList">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getSuperSeaech" size="mini"
+            >国家同步库查询
+            </el-button
+            >
           </el-button-group>
         </div>
         <el-divider style="margin: 15px"></el-divider>
@@ -277,6 +281,7 @@
 
 <script>
 import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
+import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi} from "@/api/basic/product/udiRelevance";
 import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
 import {getInvbasdoc} from "@/api/basic/product/getErps";
@@ -430,6 +435,40 @@ export default {
     serchList() {
       this.unionQuery.page = 1;
       this.getList();
+    },
+    getSuperSeaech() {
+
+      this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.unionQuery.nameCode == "") {
+            this.$message.warning("请输入完成DI信息进行查询！");
+            return;
+          }
+          this.loading = true;
+          superSearch(this.unionQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.udidlList = response.data.list || [];
+                this.total = response.data.total || 0;
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
+        })
+        .catch(() => {
+        });
+
+
     },
     getList() {
       if (
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index e4c778c..73d169b 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -74,6 +74,7 @@
         <el-dialog
             :title="formMap[formName]"
             :visible.sync="supCompanyVisible"
+            :before-close="close"
             width="80%"
             v-if="supCompanyVisible"
             @close='closeDialog'
@@ -517,13 +518,17 @@ export default {
             this.manufacturerList = [];
             this.getManufacturerList();
         },
+      close(){
+        this.getList();
+        this.supCompanyVisible=false;
+      },
       headClose(){
         this.addInfoVisible = false;
         this.getManufacturerList();
       },
         onManufacturerSubmit() {
-            this.manufacturerList = [];
-            this.getManufacturerList();
+          this.onManufacturerReset();
+          this.addInfoVisible=false;
         },
         hideSearch2() {
            this.showSearch2 = !this.showSearch2;
diff --git a/src/views/purchase/cert/supCertSetSelectDialog.vue b/src/views/purchase/cert/supCertSetSelectDialog.vue
index b73f547..cb5fdd8 100644
--- a/src/views/purchase/cert/supCertSetSelectDialog.vue
+++ b/src/views/purchase/cert/supCertSetSelectDialog.vue
@@ -146,7 +146,7 @@ export default {
                 manufacturerIdFk: this.manufacturerId,
                 productIdFk: this.productId,
                 supCertSetEntities: this.multipleSelection,
-                customerId: this.customerId,
+                customerId:this.$store.getters.customerId,
             };
             selectAllCert(postQuery)
                 .then(response => {
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index a47b8eb..9079bc3 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -328,6 +328,7 @@ export default {
         },
         getList() {
             this.loading = true;
+          this.filterQuery.customerId=this.$store.getters.customerId
             getCompanyBySup(this.filterQuery)
                 .then((response) => {
                     this.loading = false;
@@ -457,6 +458,7 @@ export default {
                 this.registrationId = row.id;
                 this.curProductQuery = row;
                 this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus;
+                this.curProductQuery.manufacturerId=this.registrationQuery.manufacturerIdFk
                 this.formName = "update";
                 this.editProductType = 1;
             } else {
@@ -464,7 +466,8 @@ export default {
                 this.formName = "add";
                 this.curProductQuery = {
                     auditStatus: 0,
-                    cuStatus:this.currentManufacturer.auditStatus
+                    cuStatus:this.currentManufacturer.auditStatus,
+                  manufacturerId:this.registrationQuery.manufacturerIdFk
                 };
             }
             this.registrationVisible = true;
@@ -505,7 +508,7 @@ export default {
             this.enterpriseId = null;
             this.registrationId = null;
             this.getList();
-            this.registrationList = [];
+           // this.registrationList = [];
         },
         getRegistrationList() {
             this.registrationLoading = true;
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 715ac28..c4a8fc6 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -48,8 +48,7 @@
           </el-button-group>
         </div>
         <el-divider style="margin: 15px"></el-divider>
-        <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange"  border highlight-current-row>
-            <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+        <el-table v-loading="loading" :data="list" style="width: 100%" row-click="handleSelectionChange"  border highlight-current-row>
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
             <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
@@ -348,7 +347,7 @@ export default {
                 cpmctymc: null,
                 ggxh: null
             },
-            multipleSelection: [],
+            multipleSelection: {},
             editDialogVisible: false,
             selectUdiDialogVisible: false,
             selectErpDialogVisible: false,
@@ -434,11 +433,11 @@ export default {
 
         selectExport() {
             var selectData = this.multipleSelection;
-          if (selectData == null || selectData.length == 0) {
+          if (selectData == null ) {
             this.$message.warning("请先选入产品！");
             return;
           }
-          this.closeSelDialog(selectData[0].id);
+          this.closeSelDialog(selectData.id);
 
         },
         allExport() {
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index 7d5d494..f10d86c 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -78,7 +78,7 @@
                     <el-col :span="10" class="el-col">
                         <el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk">
                             <el-select
-                                v-model="inputQuery.manufacturerIdFk"
+                                v-model="inputQuery.companyName"
                                 filterable
                                 remote
                                 clearable="true"
@@ -143,7 +143,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="10" class="el-col">
-                        <el-form-item label="器械类别:" label-width="150px" prop="productType">
+                        <el-form-item label="器械类别:" label-width="150px" prop="qxlb">
                             <el-select
                                 size="small"
                                 v-model="inputQuery.productType"
@@ -532,15 +532,16 @@ export default {
         if (this.editType == 0) {
             this.inputQuery.productId = getUUID("");
             this.inputQuery.customerId = this.currentManufacturer.customerId;
-            this.inputQuery.manufacturerIdFk = this.currentManufacturer.manufacturerId;
+            this.inputQuery.companyName = this.currentManufacturer.companyName;
 
         } else {
             this.getCompanyCertList();
             this.pmQuery.customerId = this.inputQuery.customerId;
+            this.inputQuery.companyName = this.currentManufacturer.companyName;
 
         }
         this.cuStatus=this.inputQuery.cuStatus;
-        this.manufacturerId = this.inputQuery.manufacturerIdFk
+        this.manufacturerId = this.inputQuery.manufacturerId
         this.productId = this.inputQuery.productId
         this.findMethod();
         this.findPMMethod();
@@ -644,10 +645,12 @@ export default {
                     auditStatus: this.inputQuery.auditStatus
 
                 };
+              localStorage.setItem('key',this.inputQuery.companyName)
                 bindProduct(query).then(response => {
                     this.loading = false;
                     if (response.code === 20000) {
-                        this.inputQuery = response.data;
+                      let cname= localStorage.getItem('key')
+                      this.inputQuery.companyName=cname;
                         this.selectSingleProductVisible = false;
                     } else {
                         this.$message.error(response.message);
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index d4a84d2..607dab3 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -60,6 +60,7 @@
           <div class="top-right-btn">
           <el-button-group style="display:flex;">
             <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button  type="primary" icon="el-icon-refresh"    @click="onReset"   >重置 </el-button>
               <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
               <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
             </el-button-group>
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index f4cbb7f..1e9093f 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -547,6 +547,7 @@ export default {
 
 
             postQuery: {
+                price:null,
                 customerId: null,
                 uuids: [],
                 rlIds: [],
@@ -682,6 +683,7 @@ export default {
             }
             this.postQuery.rlIds.splice(0);
             this.postQuery.rlIds.push(selectData.id);
+            this.postQuery.price=this.repEditQuery.price;
             this.allExport();
 
         },
diff --git a/src/views/supplier/products/supProductsSubmit.vue b/src/views/supplier/products/supProductsSubmit.vue
index 275cf18..15b280e 100644
--- a/src/views/supplier/products/supProductsSubmit.vue
+++ b/src/views/supplier/products/supProductsSubmit.vue
@@ -37,7 +37,7 @@
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="外部系统:">
-                    <el-select v-model="filterQuery.thirdSysFk" style="width: 90%"  placeholder="请选择第三方系统" @change="thirdSysChange">
+                    <el-select v-model="filterQuery.thirdSys" style="width: 90%"  placeholder="请选择第三方系统" @change="thirdSysChange">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.value"
@@ -154,6 +154,7 @@ export default {
                 page: 1,
                 limit: 20,
             },
+          mainThirdSys:'',
             total: 0,
             thirdSys: [],
             thirdSysDetail: null,
@@ -207,7 +208,7 @@ export default {
             this.curRow = row;
         },
         getList() {
-            if (this.filterQuery.thirdSysFk == null) {
+            if (this.filterQuery.thirdSys == null) {
                 this.$message.warning("请先选择第三方系统！")
                 return;
             }
@@ -287,7 +288,12 @@ export default {
             getBasicThirdSys(query)
                 .then((response) => {
                     this.thirdSys = response.data.list || [];
-                    this.filterQuery.thirdSys = this.thirdSys[0].thirdId;
+                  for(var i=0;i<this.thirdSys.length;i++){
+                    if(this.thirdSys[i].mainSys){
+                      this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+                      this.mainThirdSys = this.thirdSys[i].thirdId;
+                    }
+                  }
                     this.uploadData.thirdSys = this.filterQuery.thirdSys;
                     this.getThirdSysDetail();
                     this.selectSysParam();
diff --git a/src/views/thirdSys/product/thrProductsDetail.vue b/src/views/thirdSys/product/thrProductsDetail.vue
index 460d5ea..b45705c 100644
--- a/src/views/thirdSys/product/thrProductsDetail.vue
+++ b/src/views/thirdSys/product/thrProductsDetail.vue
@@ -4,7 +4,7 @@
                 <el-row type="flex">
                     <el-col :span="11" class="el-col">
                       <el-form-item label="第三方系统" prop="thirdSysFk">
-                            <el-input style="width: 90%" size="small" :disabled="true" v-model="data.thirdSysName"></el-input>
+                            <el-input style="width: 90%" size="small" :disabled="true" v-model="data.thirdName"></el-input>
                       </el-form-item>
                     </el-col>
                 </el-row>