集采问题修改

.env.development

@@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 # 开发环境配置
 ENV = 'development'
 
-VUE_APP_BASE_API = 'http://127.0.0.1:9993'
+VUE_APP_BASE_API = 'http://192.168.0.166:9993'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'

.env.production

@@ -32,7 +32,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
 
 # 长泰医院
-VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
@@ -51,6 +51,9 @@ VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
 # 南靖
 # VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
 
+# 东山
+VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 

src/views/basic/business/stockOrder.vue

@@ -87,7 +87,7 @@
       <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
                 @row-click="getStockOrderDetailList" ref="multipleTable"
                 :default-sort="defaultSort"
-                @sort-change="handleSortChange" >
+                @sort-change="handleSortChange">
         <el-table-column type="selection" width="55">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -153,7 +153,7 @@
           </template>
         </el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="生产企业" prop="manufacturer"></el-table-column>
         <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
       </el-table>
 

src/views/supplier/company/basicCompanyProductsImport.vue

@@ -420,6 +420,18 @@
               ></el-input>
             </div>
           </el-col>
+          <el-col :span="12">
+            <div class="text item">
+              <div class="itemTag">
+                <span>是否可集采:&nbsp;</span>
+              </div>
+
+              <el-radio-group v-model="repEditQuery.groupBuy"  style="margin-top: 10px">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </div>
+          </el-col>
         </el-row>
 
 
@@ -549,7 +561,8 @@
             </div>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8 && repEditQuery.basicPrductRemak6=='1'">
+          <el-col :span="12" class="el-col"
+                  v-if="productRemarkSet.remarkEnable8 && repEditQuery.basicPrductRemak6=='1'">
             <div class="text item">
               <div class="itemTag">
                 <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>

src/views/supplier/products/supAddDiProductSelectUdi.vue

@@ -197,6 +197,18 @@
                         v-model="editQuery.price"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="是否可集采:"
+              prop="groupBuy"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.groupBuy">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>