Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
6a4567a5cd
@ -6,9 +6,7 @@ ENV = 'development'
|
|||||||
|
|
||||||
# 泉医到家运营管理平台/开发环境
|
# 泉医到家运营管理平台/开发环境
|
||||||
# VUE_APP_BASE_API = '/dev-api'
|
# VUE_APP_BASE_API = '/dev-api'
|
||||||
VUE_APP_BASE_API = 'http://192.168.16.49:8080'
|
VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn'
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -5,4 +5,4 @@ VUE_APP_TITLE = 泉医到家运营管理平台
|
|||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
# 泉医到家运营管理平台/生产环境
|
# 泉医到家运营管理平台/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn'
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
var baseurl = "http://192.168.16.30:8080";
|
var baseurl = "https://quanyidaojia.xinelu.cn";
|
||||||
|
|
||||||
export default baseurl
|
export default baseurl
|
||||||
@ -1,6 +1,5 @@
|
|||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
|
|
||||||
|
|
||||||
import Cookies from 'js-cookie'
|
import Cookies from 'js-cookie'
|
||||||
|
|
||||||
import Element from 'element-ui'
|
import Element from 'element-ui'
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
v-show="showSearch"
|
v-show="showSearch"
|
||||||
label-width="110px"
|
label-width="110px"
|
||||||
>
|
>
|
||||||
<el-form-item label="护理站名称" prop="nurseStationId" label-width="100px">
|
<el-form-item label="护理站名称" prop="nurseStationId" >
|
||||||
<el-button type class="stationbtn" @click="ParamsStation(true)">
|
<el-button type class="stationbtn" @click="ParamsStation(true)">
|
||||||
{{
|
{{
|
||||||
queryParams.nurseStationName
|
queryParams.nurseStationName
|
||||||
@ -340,7 +340,6 @@
|
|||||||
<el-table-column property="nurseStationConsumableId" label="耗材包名称" align="center">
|
<el-table-column property="nurseStationConsumableId" label="耗材包名称" align="center">
|
||||||
<template slot-scope="scope">{{ scope.row.consumableDetail }}</template>
|
<template slot-scope="scope">{{ scope.row.consumableDetail }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column property="consumableCount" label="耗材包数量" align="center">
|
<el-table-column property="consumableCount" label="耗材包数量" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input
|
<el-input
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user