修改
This commit is contained in:
parent
45daf04233
commit
b4faaeba91
@ -102,7 +102,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-edit"
|
icon="el-icon-edit"
|
||||||
v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
|
v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
|
||||||
@click="seeedit(scope.row)"
|
@click="seelookedit(scope.row,false)"
|
||||||
>编辑</el-button>
|
>编辑</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
@ -111,6 +111,13 @@
|
|||||||
v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
|
v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
|
||||||
@click="Confirmcompletion(scope.row)"
|
@click="Confirmcompletion(scope.row)"
|
||||||
>确认完成</el-button>
|
>确认完成</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-zoom-in"
|
||||||
|
v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'EVALUATED'"
|
||||||
|
@click="seelookedit(scope.row,true)"
|
||||||
|
>查看</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
@ -412,61 +419,73 @@
|
|||||||
<el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
|
<el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
|
||||||
<el-form-item label="订单填写人姓名" prop="orderWriteName">
|
<el-form-item label="订单填写人姓名" prop="orderWriteName">
|
||||||
<input
|
<input
|
||||||
|
v-if="!lookedit"
|
||||||
class="text"
|
class="text"
|
||||||
type="text"
|
type="text"
|
||||||
v-model="query.orderWriteName"
|
v-model="query.orderWriteName"
|
||||||
placeholder="请输入姓名"
|
placeholder="请输入姓名"
|
||||||
maxlength="5"
|
maxlength="5"
|
||||||
/>
|
/>
|
||||||
|
<div class="text" v-else>{{query.orderWriteName}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="姓名" prop="caregiverName">
|
<el-form-item label="姓名" prop="caregiverName">
|
||||||
<input
|
<input
|
||||||
class="text"
|
class="text"
|
||||||
|
v-if="!lookedit"
|
||||||
type="text"
|
type="text"
|
||||||
v-model="query.caregiverName"
|
v-model="query.caregiverName"
|
||||||
placeholder="请输入姓名"
|
placeholder="请输入姓名"
|
||||||
maxlength="5"
|
maxlength="5"
|
||||||
/>
|
/>
|
||||||
|
<div class="text" v-else>{{query.caregiverName}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="电话" prop="caregiverPhone">
|
<el-form-item label="电话" prop="caregiverPhone">
|
||||||
<input
|
<input
|
||||||
|
v-if="!lookedit"
|
||||||
class="text"
|
class="text"
|
||||||
type="text"
|
type="text"
|
||||||
v-model="query.caregiverPhone"
|
v-model="query.caregiverPhone"
|
||||||
placeholder="请输入电话"
|
placeholder="请输入电话"
|
||||||
maxlength="11"
|
maxlength="11"
|
||||||
/>
|
/>
|
||||||
|
<div class="text" v-else>{{query.caregiverPhone}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="医院名称" prop="hospitalName">
|
<el-form-item label="医院名称" prop="hospitalName">
|
||||||
<input
|
<input
|
||||||
|
v-if="!lookedit"
|
||||||
class="text"
|
class="text"
|
||||||
type="text"
|
type="text"
|
||||||
v-model="query.hospitalName"
|
v-model="query.hospitalName"
|
||||||
placeholder="请输入医院名称"
|
placeholder="请输入医院名称"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
|
<div class="text" v-else>{{query.hospitalName}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="科室名称" prop="departmentName">
|
<el-form-item label="科室名称" prop="departmentName">
|
||||||
<input
|
<input
|
||||||
|
v-if="!lookedit"
|
||||||
class="text"
|
class="text"
|
||||||
type="text"
|
type="text"
|
||||||
v-model="query.departmentName"
|
v-model="query.departmentName"
|
||||||
placeholder="请输入科室名称"
|
placeholder="请输入科室名称"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
|
<div class="text" v-else>{{query.departmentName}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="病床号" prop="hospitalBedNumber">
|
<el-form-item label="病床号" prop="hospitalBedNumber">
|
||||||
<input
|
<input
|
||||||
|
v-if="!lookedit"
|
||||||
class="text"
|
class="text"
|
||||||
type="text"
|
type="text"
|
||||||
v-model="query.hospitalBedNumber"
|
v-model="query.hospitalBedNumber"
|
||||||
placeholder="请输入病床号"
|
placeholder="请输入病床号"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
|
<div class="text" v-else>{{query.hospitalBedNumber}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="时间" prop="time">
|
<el-form-item label="时间" prop="time">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-if="query.companionDays==1"
|
v-if="query.companionDays==1&&!lookedit"
|
||||||
v-model="timevalue"
|
v-model="timevalue"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
@ -476,7 +495,7 @@
|
|||||||
@change="timechange"
|
@change="timechange"
|
||||||
></el-date-picker>
|
></el-date-picker>
|
||||||
<div
|
<div
|
||||||
v-else
|
v-if="query.companionDays!=1||lookedit"
|
||||||
class="text"
|
class="text"
|
||||||
>{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}</div>
|
>{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -516,49 +535,7 @@
|
|||||||
>
|
>
|
||||||
<div class="text">{{query.evaluateSatisfaction}}</div>
|
<div class="text">{{query.evaluateSatisfaction}}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
|
||||||
label="服务到岗照片"
|
|
||||||
prop="onDutyPictureUrl"
|
|
||||||
v-if="
|
|
||||||
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<img class="img" :src="baseurl + query.onDutyPictureUrl" alt />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
|
||||||
label="服务结束照片"
|
|
||||||
prop="serviceEndPictureUrl"
|
|
||||||
v-if="
|
|
||||||
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<img class="img" :src="baseurl + query.serviceEndPictureUrl" alt />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
|
||||||
label="用户确认签名"
|
|
||||||
prop="userSignaturePictureUrl"
|
|
||||||
v-if="
|
|
||||||
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<img class="img" :src="baseurl + query.userSignaturePictureUrl" alt />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item
|
|
||||||
label="预约服务位置"
|
|
||||||
v-if="
|
|
||||||
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<el-input v-model="query.serviceLocationName" disabled style="width: 250px" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
</el-form>
|
||||||
<div
|
|
||||||
id="container"
|
|
||||||
v-if="
|
|
||||||
this.query.orderStatus == 'COMPLETE' ||
|
|
||||||
this.query.orderStatus == 'EVALUATED'
|
|
||||||
"
|
|
||||||
></div>
|
|
||||||
<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">取 消</el-button>
|
<el-button @click="editinnerVisible = false">取 消</el-button>
|
||||||
<el-button type="primary" @click="editsubmitForm">确 定</el-button>
|
<el-button type="primary" @click="editsubmitForm">确 定</el-button>
|
||||||
@ -585,6 +562,7 @@ export default {
|
|||||||
name: "order",
|
name: "order",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
lookedit: undefined,
|
||||||
map: null,
|
map: null,
|
||||||
baseurl: process.env.VUE_APP_BASE_API,
|
baseurl: process.env.VUE_APP_BASE_API,
|
||||||
orderStatuslist: [
|
orderStatuslist: [
|
||||||
@ -856,7 +834,7 @@ export default {
|
|||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
},
|
},
|
||||||
//编辑
|
//编辑
|
||||||
seeedit(row) {
|
seelookedit(row) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
const id = row.orderNo;
|
const id = row.orderNo;
|
||||||
this.map = null;
|
this.map = null;
|
||||||
@ -887,22 +865,13 @@ export default {
|
|||||||
}
|
}
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.editinnerVisible = true;
|
this.editinnerVisible = true;
|
||||||
setTimeout(() => {
|
|
||||||
this.init(this.query);
|
|
||||||
}, 500);
|
|
||||||
} else {
|
} else {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.editinnerVisible = true;
|
this.editinnerVisible = true;
|
||||||
setTimeout(() => {
|
|
||||||
this.init(this.query);
|
|
||||||
}, 500);
|
|
||||||
}
|
}
|
||||||
} else if (row.orderStatus == "COMPLETE") {
|
} else if (row.orderStatus == "COMPLETE") {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.editinnerVisible = true;
|
this.editinnerVisible = true;
|
||||||
setTimeout(() => {
|
|
||||||
this.init(this.query);
|
|
||||||
}, 500);
|
|
||||||
} else {
|
} else {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.editinnerVisible = true;
|
this.editinnerVisible = true;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user