From 135a92a2cfa351d11fbefd3939fec0a8e602a3c5 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 31 Dec 2024 18:29:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8C=BB=E5=85=B1=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                           | 2 +-
 src/views/supplier/companyDrug/basicCompanyproductEdit.vue | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 2554ec7..439bc9b 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://192.168.0.166:9993'
+VUE_APP_BASE_API = 'http://192.168.0.43:9993'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 89f7125..2cff4a5 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -16,8 +16,9 @@
             <el-table-column label="注册号" prop="registerNo" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" v-if="type != 2">
+<!--              :disabled="scope.row.thirdId==rowData.nameCode"-->
               <template slot-scope="scope">
-                <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==rowData.nameCode">
+                <el-button type="text" @click="addSelectErp(scope.row)" >
                   关联
                 </el-button>
                 <el-button type="text" @click.native.stop="removeErp(scope.row)"
@@ -734,7 +735,7 @@ import {
 import { filterClassify } from '@/api/purchase/classifyCode'
 import { filterByUuid, levelByUuid } from '@/api/basic/product/udiInfo'
 // import selectChargesProjectDialog from './selectChargesProjectDialog'
-// import chooseHouseDrug from './chooseHouseDrug'
+import chooseHouseDrug from "@/views/basic/product/drug/chooseHouseDrug";
 
 export default {
   name: 'basicCompanyproductEdit',
@@ -770,7 +771,7 @@ export default {
     }
   },
   // components: {selectChargesProjectDialog, chooseHouseDrug},
-  // components: { chooseHouseDrug},
+  components: { chooseHouseDrug},
   data() {
     return {
       ybDrugDetail: {},