提交 4c9f336b 编写于 作者: zhaosheng.zhang's avatar zhaosheng.zhang

fix: 问题修复

上级 41d0b257
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<p v-if="isAssistantTime(scope)"> <p v-if="isAssistantTime(scope)">
距自动取消还剩 距自动取消还剩
</p> </p>
<p>{{ goTime(scope.row.assistantTime) }}</p> <p>{{ updateCountdown(scope.row.assistantTime) }}</p>
</div> </div>
</div> </div>
<div v-else-if="scope.column.property == 'receptionTime'"> <div v-else-if="scope.column.property == 'receptionTime'">
...@@ -457,6 +457,25 @@ ...@@ -457,6 +457,25 @@
|| scope.row.status === 23 || scope.row.status === 24 || scope.row.status === 25 || scope.row.status === 23 || scope.row.status === 24 || scope.row.status === 25
|| scope.row.status === 26) || scope.row.status === 26)
) return true; ) return true;
},
// 48小时倒计时
updateCountdown(endTime) {
if (!endTime) return '';
const currentTime = new Date().getTime();
const newEndTime = new Date().getTime() + endTime;
const timeLeft = newEndTime - currentTime;
if (timeLeft >= 0) {
let hours = Math.floor((timeLeft / (1000 * 60 * 60)) % 24);
let minutes = Math.floor((timeLeft / (1000 * 60)) % 60);
let seconds = Math.floor((timeLeft / 1000) % 60);
hours = hours > 9 ? hours : '0' + hours;
minutes = minutes > 9 ? minutes : '0' + minutes;
seconds = seconds > 9 ? seconds : '0' + seconds;
return `${hours} : ${minutes} : ${seconds}`;
} else {
return '';
}
} }
}, },
}; };
......
...@@ -758,7 +758,7 @@ ...@@ -758,7 +758,7 @@
<el-input <el-input
v-model="formData.diagnoseAdvice" v-model="formData.diagnoseAdvice"
type="textarea" type="textarea"
placeholder="请输入更新建议(更新后原建议将被删除)" placeholder="请输入诊断建议(更新后原建议将被删除)"
:disabled="editorType == 2" :disabled="editorType == 2"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
...@@ -774,7 +774,7 @@ ...@@ -774,7 +774,7 @@
<el-input <el-input
v-model="formData.tcmAdvice" v-model="formData.tcmAdvice"
type="textarea" type="textarea"
placeholder="请输入更新建议(更新后原建议将被删除)" placeholder="请输入中药建议(更新后原建议将被删除)"
:disabled="editorType == 2" :disabled="editorType == 2"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
...@@ -790,7 +790,7 @@ ...@@ -790,7 +790,7 @@
<el-input <el-input
v-model="formData.westernAdvice" v-model="formData.westernAdvice"
type="textarea" type="textarea"
placeholder="请输入更新建议(更新后原建议将被删除)" placeholder="请输入西药建议(更新后原建议将被删除)"
:disabled="editorType == 2" :disabled="editorType == 2"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
...@@ -806,7 +806,7 @@ ...@@ -806,7 +806,7 @@
<el-input <el-input
v-model="formData.inspectionAdvice" v-model="formData.inspectionAdvice"
type="textarea" type="textarea"
placeholder="请输入更新建议(更新后原建议将被删除)" placeholder="请输入检查建议(更新后原建议将被删除)"
:disabled="editorType == 2" :disabled="editorType == 2"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
...@@ -822,7 +822,7 @@ ...@@ -822,7 +822,7 @@
<el-input <el-input
v-model="formData.lifeAdvice" v-model="formData.lifeAdvice"
type="textarea" type="textarea"
placeholder="请输入更新建议(更新后原建议将被删除)" placeholder="请输入生活建议(更新后原建议将被删除)"
:disabled="editorType == 2" :disabled="editorType == 2"
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
......
...@@ -370,13 +370,14 @@ ...@@ -370,13 +370,14 @@
class="t-b" class="t-b"
> >
<el-select <el-select
v-model="searchParam.diagnoseChannel" v-model="searchParam.diagnoseChannelList"
placeholder="请选择问诊方式" placeholder="请选择问诊方式"
clearable clearable
multiple
style="width: 220px" style="width: 220px"
> >
<el-option <el-option
v-for="item of diagnoseChannelList" v-for="item of newDiagnoseChannelList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -702,7 +703,7 @@ export default { ...@@ -702,7 +703,7 @@ export default {
orderPlacer: '', orderPlacer: '',
matchingWay: null, matchingWay: null,
consultRoadList: [], consultRoadList: [],
diagnoseChannel: null, diagnoseChannelList: [],
patientName: null, patientName: null,
}, },
noteList: [], noteList: [],
...@@ -726,7 +727,7 @@ export default { ...@@ -726,7 +727,7 @@ export default {
value: 2, value: 2,
}, },
], ],
diagnoseChannelList: DIAGNOSE_CHANNEL, newDiagnoseChannelList: DIAGNOSE_CHANNEL,
nextPersonList: [ nextPersonList: [
{ {
label: '基层医生', label: '基层医生',
...@@ -1200,7 +1201,7 @@ export default { ...@@ -1200,7 +1201,7 @@ export default {
inNewTimeObj: {}, inNewTimeObj: {},
consultRoadList: [], consultRoadList: [],
patientName: null, patientName: null,
diagnoseChannel: null diagnoseChannelList: []
}); });
this.getsearch(); this.getsearch();
}, },
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册