Skip to content

P
pica-admin-consultation
提交 e52b8b4c 编写于 作者: changdi.hao's avatar changdi.hao
浏览文件
操作

Merge branch 'dev-20210517' into 'release' 

Dev 20210517

See merge request !11
上级 8e7e4da2 27510d15
隐藏空白字符变更
内嵌 并排
正在显示 包含 73 行增加 和 17 行删除
src/views/IM/diagnosis-admin/assist-list.vue
浏览文件 @ e52b8b4c
......@@ -78,25 +78,28 @@
<el-table-column prop="userName" label="助诊医生" min-width="100" align="left"></el-table-column>
<el-table-column prop="mobile" label="手机号" min-width="100" align="left"></el-table-column>
<el-table-column prop="address" label="地区" min-width="100" align="left"></el-table-column>
<el-table-column prop="hospitalName" label="医院" min-width="100" align="left"></el-table-column>
<el-table-column prop="hospitalName" label="所在机构" min-width="100" align="left"></el-table-column>
<el-table-column prop="department" label="科室" min-width="100" align="left"></el-table-column>
<el-table-column prop="title" label="职称" min-width="100" align="left"></el-table-column>
<el-table-column prop="audioCommissionTypeStr" label="语音分佣规则" min-width="120" align="left"></el-table-column>
<el-table-column prop="audioPrice" label="语音分佣" min-width="100" align="left">
<template slot-scope="scope">
<span>{{scope.row.audioPrice | priceNum}}</span>
<span v-if="scope.row.audioCommissionType == 1">{{scope.row.audioPrice | priceNum}}%</span>
<span v-if="scope.row.audioCommissionType == 2">{{scope.row.audioPrice | priceNum}}元</span>
</template>
</el-table-column>
<el-table-column prop="videoCommissionTypeStr" label="视频分佣规则" min-width="120" align="left"></el-table-column>
<el-table-column prop="videoPrice" label="视频分佣" min-width="100" align="left">
<template slot-scope="scope">
<span>{{scope.row.videoPrice | priceNum}}</span>
<span v-if="scope.row.videoCommissionType == 1">{{scope.row.videoPrice | priceNum}}%</span>
<span v-if="scope.row.videoCommissionType == 2">{{scope.row.videoPrice | priceNum}}元</span>
</template>
</el-table-column>
<el-table-column prop="imgCommissionTypeStr" label="图文分佣规则" min-width="120" align="left"></el-table-column>
<el-table-column prop="imgPrice" label="图文分佣" min-width="100" align="left">
<template slot-scope="scope">
<span>{{scope.row.imgPrice | priceNum}}</span>
<span v-if="scope.row.imgCommissionType == 1">{{scope.row.imgPrice | priceNum}}%</span>
<span v-if="scope.row.imgCommissionType == 2">{{scope.row.imgPrice | priceNum}}元</span>
</template>
</el-table-column>
<!-- <el-table-column prop="price" label="价格(元)" min-width="60" align="left">-->
......@@ -109,7 +112,7 @@
<!-- <span>{{scope.row.status | statusFilter}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="createdTime" label="注册时间" min-width="160" align="left">
<el-table-column prop="createdTime" label="创建时间" min-width="160" align="left">
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="150">
<template slot-scope="scope">
......@@ -126,7 +129,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchParam.pageNo"
:page-sizes="[10, 15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
:page-sizes="[15, 30, 50, 100, 200]"
:page-size="searchParam.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows">
......@@ -275,7 +278,7 @@ export default {
commissionType: 0,
startTime: "",
endTime: "",
pageSize: 10,
pageSize: 15,
pageNo: 1
},
batchUpdatePriceFlag: false,
......@@ -526,7 +529,7 @@ export default {
commissionType: 0,
startTime: "",
endTime: "",
pageSize: 10,
pageSize: 15,
pageNo: 1
};
this.rangeTime = "";
......@@ -617,6 +620,40 @@ export default {
// this.getProfit(row);
},
initAdd(){
this.POST(`/diagnose/commission/rule/info`, {userType: "2", defaultFlag: 1}).then(res => {
if (res.code == "000000") {
vm.initData = res.data;
vm.model.audioCommissionType = res.data.audioCommissionType;
if(vm.model.audioCommissionType == 1){
vm.model.audioPrice1 = vm.priceNum(res.data.audioPrice);
}
else if(vm.model.audioCommissionType == 2){
vm.model.audioPrice2 = vm.priceNum(res.data.audioPrice);
}
vm.model.videoCommissionType = res.data.videoCommissionType;
if(vm.model.videoCommissionType == 1){
vm.model.videoPrice1 = vm.priceNum(res.data.videoPrice);
}
else if(vm.model.videoCommissionType == 2){
vm.model.videoPrice2 = vm.priceNum(res.data.videoPrice);
}
vm.model.imgCommissionType = res.data.imgCommissionType;
if(vm.model.imgCommissionType == 1){
vm.model.imgPrice1 = vm.priceNum(res.data.imgPrice);
}
else if(vm.model.imgCommissionType == 2){
vm.model.imgPrice2 = vm.priceNum(res.data.imgPrice);
}
}else {
this.$message({
message: res.message,
type: "error"
})
}
});
},
getProfit(row){
this.POST(`/diagnose/doctorService/profit`, {doctorId: row.doctorId, serviceType: row.serviceType}).then(res => {
......@@ -668,13 +705,14 @@ export default {
vm.model.imgPrice = "";
vm.model.imgPrice1 = undefined;
vm.model.imgPrice2 = undefined;
vm.initAdd();
}
},
//搜索
remoteMethod(val) {
if (val.length >= 2) {
// console.log('搜索',val)
this.GET(`/doctor/doctorExpert/doctorInfoByNameLike?name=${val}`)
this.GET(`/diagnose/commission/downDoctor/doctorInfoByNameLike?name=${val}`)
.then(function (res) {
if (res.code == '000000') {
// let data = JSON.parse(JSON.stringify(res.data.data));//通过这个实现深拷贝
......
src/views/IM/diagnosis-admin/diagnosis-editor.vue
浏览文件 @ e52b8b4c
......@@ -75,7 +75,7 @@
</el-form-item>
<el-form-item label="预约时间" prop="appointBeginTime" >
<el-date-picker
:disabled="formData.status == 4 || editorType== 2"
:disabled="true"
type="datetime"
placeholder="开始时间"
v-model="formData.appointBeginTime"
......@@ -88,7 +88,7 @@
</el-date-picker>
<span>-</span>
<el-date-picker
:disabled="formData.status == 4 || editorType== 2"
:disabled="true"
type="datetime"
placeholder="结束时间"
v-model="formData.appointEndTime"
......@@ -180,7 +180,7 @@
<h1>接诊信息</h1>
<el-form-item label="接诊医生" prop="doctorName">
<!-- <el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>-->
<el-select @change="doctorChanged($event)" v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" :disabled="editorType== 2 || this.formData.status == 4">
<el-select @change="doctorChanged($event)" filterable v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" :disabled="editorType== 2 || this.formData.status == 4">
<el-option v-for="item of doctorList" :key="item.doctorId" :label="item.doctorName" :value="item.doctorId"></el-option>
</el-select>
</el-form-item>
......@@ -323,6 +323,7 @@ export default {
idCardType: 1,
idCard: '',
birthdayStr: '',
birthday: '',
sex: 1,
patientMobilePhone: '',
//助诊信息
......@@ -546,7 +547,9 @@ export default {
},
save() {
this.$refs.form.validate((valid) => {
let url = `/diagnose/admin/diagnose/update`
let url = `/diagnose/admin/diagnose/update`;
this.formData.birthday = new Date(this.formData.birthdayStr);
// this.formData.birthday = this.formData.birthdayStr;
let params = JSON.parse(JSON.stringify(this.formData))
params.illnessImageUrls = this.$refs.imgComponent ? [...this.$refs.imgComponent.setNewArr()] : []
params.illnessAudioUrls = this.$refs.musicComponent ? [...this.$refs.musicComponent.setNewArr()] : []
......@@ -560,6 +563,11 @@ export default {
if (res.code == "000000") {
this.$message.success('保存成功');
this.$router.back()
} else {
this.$message({
message: res.message,
type: "error"
})
}
});
return
......@@ -573,6 +581,11 @@ export default {
if (res.code == "000000") {
this.$message.success('保存成功');
// this.$router.back()
} else {
this.$message({
message: res.message,
type: "error"
})
}
});
} else {
......@@ -628,4 +641,4 @@ export default {
}
}
</style>
\ No newline at end of file
</style>
src/views/IM/diagnosis-admin/service-list.vue
浏览文件 @ e52b8b4c
......@@ -118,7 +118,12 @@
</template>
</el-table-column>
<el-table-column prop="commissionTypeStr" label="接诊分佣方式" min-width="120" align="left"></el-table-column>
<el-table-column prop="commissionFee" label="分佣金额（元）" min-width="120" align="left"></el-table-column>
<el-table-column prop="commissionFee" label="分佣金额（元）" min-width="120" align="left">
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.commissionType == 1">{{scope.row.commissionFee}}%</span>-->
<!-- <span v-if="scope.row.commissionType == 2">{{scope.row.commissionFee}}元</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="status" label="状态" min-width="80" align="left">
<template slot-scope="scope">
<span>{{scope.row.status | statusFilter}}</span>
......@@ -143,7 +148,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchParam.pageNo"
:page-sizes="[10, 15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
:page-sizes="[15, 30, 50, 100, 200]"
:page-size="searchParam.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows">
......@@ -214,7 +219,7 @@ export default {
status: 0,
startTime: "",
endTime: "",
pageSize: 10,
pageSize: 15,
pageNo: 1
},
batchUpdatePriceFlag: false,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或