Skip to content

P
pica-admin-consultation
提交 eca39963 编写于 作者: vino's avatar vino
浏览文件
操作

Merge branch 'dev-20210702' of... 

Merge branch 'dev-20210702' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702

 Conflicts:
	src/views/IM/diagnosis-admin/diagnosis-list-new.vue
上级 80ea64fe 3807ac1c
隐藏空白字符变更
内嵌 并排
正在显示 包含 81 行增加 和 49 行删除
src/views/IM/diagnosis-admin/diagnosis-editor.vue
浏览文件 @ eca39963
......@@ -291,7 +291,7 @@
<!-- -->
<br/>
<h1 v-if="true && true">结算信息</h1>
<h1 v-if="showSettlement">结算信息</h1>
<el-form-item label="接诊服务费" v-if="formData.receptionServiceFeeStr" prop="receptionServiceFeeStr">
￥{{formData.receptionServiceFeeStr}}
</el-form-item>
......@@ -412,38 +412,40 @@
<h1>操作日志</h1>
<el-table
:data="logData"
style="width: 100%">
class="log-info">
<el-table-column
prop="time"
prop="operateTime"
width="180"
label="变更时间">
</el-table-column>
<el-table-column
prop="operator"
prop="operateUserName"
label="变更人"
width="180">
width="120">
</el-table-column>
<el-table-column
prop="content"
prop="to"
label="变更后内容">
</el-table-column>
<el-table-column
prop="preContent"
prop="from"
label="变更前内容">
</el-table-column>
</el-table>
<br/>
<!--<br/>
<el-row :gutter="0" type="flex" justify="end" align="center">
<el-pagination
class="log-info-pagin"
@size-change="handlelogSizeChange"
@current-change="handlelogCurrentChange"
:current-page="logCurrentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:page-sizes="[5, 10, 20, 50]"
:page-size="5"
layout="total, sizes, prev, pager, next, jumper"
:total="logTotalCount">
</el-pagination>
</el-row>
</el-row>-->
<!-- -->
</el-form>
......@@ -597,10 +599,16 @@ export default {
{ required: true, message: '请输入诊断建议', trigger: 'change' }
],
worthlessReason: [{
max: 1000, message: '最大长度 1000 个字符', trigger: 'blur'
required: true, max: 1000, message: '必填项，最大长度 1000 个字符', trigger: 'change'
}],
otherRemark: [{
max: 1000, message: '最大长度 1000 个字符', trigger: 'blur'
required: true, max: 1000, message: '必填项，最大长度 1000 个字符', trigger: 'change'
}],
patInFlag: [{
required: true, message: '必填项'
}],
valueFlag : [{
required: true, message: '必填项'
}]
},
endDateOpt: {
......@@ -620,43 +628,43 @@ export default {
}
},
logData: [{
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}, {
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}, {
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}, {
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}, {
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}, {
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}, {
time: '2016-05-02',
operator: '赵丽颖',
content: '问诊状态由已完成变成已结算',
preContent: '助诊医生时间不匹配'
operateTime: '2016-05-02',
operateUserName: '赵丽颖',
to: '问诊状态由已完成变成已结算',
from: '助诊医生时间不匹配'
}],
logCurrentPage: 1,
logTotalCount: 0
// logCurrentPage: 1,
// logTotalCount: 0
}
},
created() {
......@@ -667,6 +675,10 @@ export default {
mounted() {
},
computed: {
showSettlement () {
let { formData } = this;
return formData.receptionServiceFeeStr || formData.receptionPayType || formData.receptionSettleTime || formData.assistantServiceFeeStr || formData.assistantPayType || formData.assistantSettleTime
},
getReceptionPayType () {
return PAY_TYPE[this.formData.receptionPayType]
},
......@@ -713,6 +725,7 @@ export default {
this.$message.info('请稍后重试')
}
this.getDoctorList()
this.queryOperationLogs()
}).catch(() => {
this.$message.info('请稍后重试')
});
......@@ -729,9 +742,21 @@ export default {
}
}).catch(() => {
this.loading = false
this.$message.info('请稍后重试')
});
},
queryOperationLogs() {
let url = `/diagnose/admin/diagnose/log/${this.diagnoseLogId}`
this.GET(url).then(res => {
if (res.code == '000000') {
this.logData = res.data
}
// 非交互性功能接口不提示
}).catch(() => {
this.loading = false
})
},
// 预约开始时间选择时
continueBeginChange(val) {
if(this.formData.appointEndTime) {
......@@ -856,12 +881,12 @@ export default {
return newArr
},
// log
handlelogSizeChange (val) {
console.log('每页val条')
},
handlelogCurrentChange (val) {
console.log('当前页为val')
}
// handlelogSizeChange (val) {
// console.log('每页val条')
// },
// handlelogCurrentChange (val) {
// console.log('当前页为val')
// }
// @size-change="handlelogSizeChange"
// @current-change="handlelogCurrentChange"
// :current-page="logCurrentPage"
......@@ -898,6 +923,13 @@ export default {
.set-width {
width: 300px;
}
.log-info {
margin: 15px auto;
width: calc(100% - 30px);
}
.log-info-pagin {
margin: 0 15px;
}
}
.btn-wrap {
padding: 40px 0 60px;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或