Просмотр исходного кода

feature:不开启总的计费按钮送样也不显示计费

liuzhenlin 6 дней назад
Родитель
Сommit
d15fd87cb4
2 измененных файлов с 9 добавлено и 9 удалено
  1. 8 8
      .env.production
  2. 1 1
      src/view/instr/sampleAppoint.vue

+ 8 - 8
.env.production

@@ -16,14 +16,14 @@ VITE_API_WECHAT = /wechat/
 VITE_TENANT = default
 
 # 微服务地址
-VITE_ADMIN = dashoo.labsop.admin-36000
-VITE_FINANCE = dashoo.labsop.finance-36000
-VITE_SCI = dashoo.labsop.scientific-36000
-VITE_WORKFLOW = dashoo.labsop.workflow-36000
-VITE_INSTR_ADMIN = dashoo.labsop.apparatus-36000
-VITE_LEARNING = dashoo.labsop.learning-36000
-VITE_PLATFORM_API = dashoo.labsop.platform-36000
-VITE_LABORATORY: dashoo.labsop.laboratory-36000
+VITE_ADMIN = dashoo.labsop.admin-54000
+VITE_FINANCE = dashoo.labsop.finance-54000
+VITE_SCI = dashoo.labsop.scientific-54000
+VITE_WORKFLOW = dashoo.labsop.workflow-54000
+VITE_INSTR_ADMIN = dashoo.labsop.apparatus-54000
+VITE_LEARNING = dashoo.labsop.learning-54000
+VITE_PLATFORM_API = dashoo.labsop.platform-54000
+VITE_LABORATORY: dashoo.labsop.laboratory-54000
 
 
 #公共配置

+ 1 - 1
src/view/instr/sampleAppoint.vue

@@ -190,7 +190,7 @@ const getChargeConfig = async () => {
   const [err, res]: ToResponse = await to(instApi.getSettingDetail({ ...params }))
   if (err) return
   state.InstCfgCharge = res?.data.config.enable && !res?.data.config.sampleFreeEnable
-  if (res?.data?.config?.sampleCountEnable) {
+  if (res?.data?.config?.sampleCountEnable && res?.data?.config?.enable) {
     state.form.sampleItem = res?.data?.config?.sampleItemPrice || []
     state.form.sampleItem = state.form.sampleItem.map((item) => {
       return {