xinyilu/NurseStationOperateUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: xinyilu:913267ac4811f090462caee1252527b1d407b74d
Branches Tags
xinyilu:master
..
compare: xinyilu:b84587905724f7bae54d03e4a28d20677493acd6
Branches Tags
xinyilu:master

No commits in common. "913267ac4811f090462caee1252527b1d407b74d" and "b84587905724f7bae54d03e4a28d20677493acd6" have entirely different histories.
913267ac48 ... b845879057

5 changed files with 29 additions and 59 deletions
Show Stats Expand all files Collapse all files

2
.env.development
View File

@ -6,7 +6,7 @@ ENV = 'development'
# 泉医到家运营管理平台/开发环境 # 泉医到家运营管理平台/开发环境
# VUE_APP_BASE_API = '/dev-api' # VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn' VUE_APP_BASE_API = 'http://192.168.16.76:8080'
# 路由懒加载 # 路由懒加载

2
.env.production
View File

@ -5,4 +5,4 @@ VUE_APP_TITLE = 泉医到家运营管理平台
ENV = 'production' ENV = 'production'
# 泉医到家运营管理平台/生产环境 # 泉医到家运营管理平台/生产环境
VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn' VUE_APP_BASE_API = 'http://192.168.16.30:8088'

2
src/views/system/goodsOrder/index.vue
View File

@ -277,7 +277,9 @@
v-model="orderList.compositeScore" v-model="orderList.compositeScore"
style="padding-top: 7px" style="padding-top: 7px"
disabled disabled
show-score
text-color="#ff9900" text-color="#ff9900"
score-template="{value}"
></el-rate> ></el-rate>
<el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input> <el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input>
</div> </div>

50
src/views/system/order/index.vue
View File

@ -24,7 +24,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable> <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
<el-option <el-option
v-for="item in orderStatuslist" v-for="item in orderStatuslist"
:key="item.value" :key="item.value"
@ -34,7 +34,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单类型" prop="orderStatus"> <el-form-item label="订单类型" prop="orderStatus">
<el-select v-model="queryParams.orderType" placeholder="请选择订单状态" clearable> <el-select v-model="queryParams.orderType" placeholder="请选择订单状态">
<el-option <el-option
v-for="item in ordertypelist" v-for="item in ordertypelist"
:key="item.value" :key="item.value"
@ -190,15 +190,7 @@
<div class="text">{{query.itemServeDurationUnit}}</div> <div class="text">{{query.itemServeDurationUnit}}</div>
</el-form-item> </el-form-item>
<el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'"> <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
<div class="text" style="border:none"> <div class="text">{{query.compositeScore}}</div>
<el-rate
v-if="query.compositeScore"
v-model="query.compositeScore"
style="padding-top: 7px"
disabled
text-color="#ff9900"
></el-rate>
</div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="评价满意度" label="评价满意度"
@ -215,12 +207,14 @@
</el-form-item> </el-form-item>
<el-form-item label="健康状况" prop="diseaseName"> <el-form-item label="健康状况" prop="diseaseName">
<div <div
class="textr" class="text"
style="height:100px;line-height:26px;overflow: scroll"
>{{query.diseaseName}}</div> >{{query.diseaseName}}</div>
</el-form-item> </el-form-item>
<el-form-item label="服务地址" prop="serviceAddress"> <el-form-item label="服务地址" prop="serviceAddress">
<div <div
class="textr" class="text"
style="height:100px;line-height:26px;overflow: scroll"
>{{query.serviceAddress}}</div> >{{query.serviceAddress}}</div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -549,7 +543,6 @@
v-if="!lookedit" v-if="!lookedit"
v-model="timevalue" v-model="timevalue"
type="daterange" type="daterange"
:picker-options="setDateRange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@ -587,6 +580,9 @@
<el-form-item label="护理项目时长" prop="itemServeDurationUnit"> <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
<div class="text">{{query.itemServeDurationUnit}}</div> <div class="text">{{query.itemServeDurationUnit}}</div>
</el-form-item> </el-form-item>
<el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
<div class="text">{{query.compositeScore}}</div>
</el-form-item>
<el-form-item <el-form-item
label="评价满意度" label="评价满意度"
prop="evaluateSatisfaction" prop="evaluateSatisfaction"
@ -594,20 +590,10 @@
> >
<div class="text">{{query.evaluateSatisfaction}}</div> <div class="text">{{query.evaluateSatisfaction}}</div>
</el-form-item> </el-form-item>
<el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
<el-rate
v-if="query.compositeScore"
v-model="query.compositeScore"
style="padding-top: 7px"
disabled
text-color="#ff9900"
></el-rate>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="margin-right: 50px"> <div slot="footer" class="dialog-footer" style="margin-right: 50px">
<el-button @click="editinnerVisible = false" v-if="!lookedit">取 消</el-button> <el-button @click="editinnerVisible = false">取 消</el-button>
<el-button type="primary" @click="editsubmitForm" v-if="!lookedit">确 定</el-button> <el-button type="primary" @click="editsubmitForm">确 定</el-button>
<el-button type="primary" @click="editinnerVisible = false" v-if="lookedit">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -646,18 +632,6 @@ export default indexjs;
padding: 0 15px; padding: 0 15px;
border: 1px solid #e6ebf5; border: 1px solid #e6ebf5;
} }
.textr {
width: 250px;
padding-left: 15px;
font-size: 14px;
border-radius: 4px;
padding: 0 15px;
border: 1px solid #e6ebf5;
color: black;
height: 100px;
line-height: 26px;
overflow: scroll;
}
::v-deep .el-dialog { ::v-deep .el-dialog {
margin-top: 30px !important; margin-top: 30px !important;
} }

32
src/views/system/order/indexjs.js
View File

@ -15,12 +15,6 @@ export default {
name: "order", name: "order",
data() { data() {
return { return {
setDateRange: {
disabledDate: time => {
// 禁用今天之前的日期【当前天可选】
return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
}
},
timevalue: [], timevalue: [],
map: null, map: null,
baseurl: process.env.VUE_APP_BASE_API, baseurl: process.env.VUE_APP_BASE_API,
@ -318,11 +312,11 @@ export default {
} else if (res.data.evaluateSatisfaction == "SATISFIED") { } else if (res.data.evaluateSatisfaction == "SATISFIED") {
this.query.evaluateSatisfaction = "满意"; this.query.evaluateSatisfaction = "满意";
} else if (res.data.evaluateSatisfaction == "DISSATISFIED") { } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
this.query.evaluateSatisfaction = "差"; this.query.evaluateSatisfaction = "不满意";
} else if (res.data.evaluateSatisfaction == "VERYSATISFIED") { } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
this.query.evaluateSatisfaction = "非常满意"; this.query.evaluateSatisfaction = "非常满意";
} else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") { } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
this.query.evaluateSatisfaction = "非常差"; this.query.evaluateSatisfaction = "非常不满意";
} }
this.loading = false; this.loading = false;
this.editinnerVisible = true; this.editinnerVisible = true;
@ -351,17 +345,17 @@ export default {
res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '否' : '' res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '否' : ''
if (row.orderStatus == 'EVALUATED') { if (row.orderStatus == 'EVALUATED') {
if (res.data) { if (res.data) {
if (res.data.evaluateSatisfaction == "COMMONLY") { if (res.data.evaluateSatisfaction == 'COMMONLY') {
this.query.evaluateSatisfaction = "一般"; this.query.evaluateSatisfaction = '一般'
} else if (res.data.evaluateSatisfaction == "SATISFIED") { } else if (res.data.evaluateSatisfaction == 'SATISFIED') {
this.query.evaluateSatisfaction = "满意"; this.query.evaluateSatisfaction = '满意'
} else if (res.data.evaluateSatisfaction == "DISSATISFIED") { } else if (res.data.evaluateSatisfaction == 'DISSATISFIED') {
this.query.evaluateSatisfaction = "差"; this.query.evaluateSatisfaction = '不满意'
} else if (res.data.evaluateSatisfaction == "VERYSATISFIED") { } else if (res.data.evaluateSatisfaction == 'VERYSATISFIED') {
this.query.evaluateSatisfaction = "非常满意"; this.query.evaluateSatisfaction = '非常满意'
} else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") { } else if (res.data.evaluateSatisfaction == 'VERYDISSATISFIED') {
this.query.evaluateSatisfaction = "非常差"; this.query.evaluateSatisfaction = '非常不满意'
} }
this.loading = false this.loading = false
this.innerVisible4 = true; this.innerVisible4 = true;
setTimeout(() => { setTimeout(() => {