提交 0203a22e 编写于 作者: lyf's avatar lyf

修改代码格式

上级 4871e4dd
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
prop="statusRemark" prop="statusRemark"
> >
<el-col :span="15"> <el-col :span="15">
<el-select <el-select
v-model="model.statusRemark" v-model="model.statusRemark"
style="width: 135%" style="width: 135%"
...@@ -81,7 +79,7 @@ ...@@ -81,7 +79,7 @@
type: Boolean, type: Boolean,
default: false, default: false,
}, },
rematchingOptions:{ rematchingOptions: {
type: Array, type: Array,
default: null, default: null,
}, },
...@@ -110,14 +108,13 @@ ...@@ -110,14 +108,13 @@
}, },
}; };
}, },
watch:{ watch: {
rematchingOptions(val, oldval) { rematchingOptions(val) {
console.log(val); console.log(val);
this.model.statusRemark = val[0] ? val[0] : ''; this.model.statusRemark = val[0] ? val[0] : '';
} },
}, },
created() { created() {
vm = this; vm = this;
}, },
methods: { methods: {
...@@ -150,13 +147,13 @@ ...@@ -150,13 +147,13 @@
}, },
getBlurData(e) { getBlurData(e) {
this.model.statusRemark = e.target.value; this.model.statusRemark = e.target.value;
} },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.message{ .message {
color: #f56c6c; color: #f56c6c;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
......
...@@ -32,39 +32,38 @@ ...@@ -32,39 +32,38 @@
props: { props: {
isDisable: { isDisable: {
type: Boolean, type: Boolean,
default: false default: false,
}, },
imgList: { imgList: {
type: Array, type: Array,
default: ()=>{ default: () => {
return [] return [];
} },
} },
}, },
data() { data() {
return { return {
dialogImageUrl: '', dialogImageUrl: '',
dialogVisible: false, dialogVisible: false,
imgArr: [ imgArr: [],
],
headers: { headers: {
token: localStorage.getItem('token'), token: localStorage.getItem('token'),
}, },
actionurl: '#', actionurl: '#',
accept: '.png,.jpeg' accept: '.png,.jpeg',
}; };
}, },
watch:{ watch: {
imgList(newv) { imgList(newv) {
this.imgArr = newv; this.imgArr = newv;
} },
}, },
created() { created() {
this.actionurl = getBaseUrl('/diagnose/illness/file'); this.actionurl = getBaseUrl('/diagnose/illness/file');
}, },
methods: { methods: {
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log(file) console.log(file);
this.imgArr = fileList; this.imgArr = fileList;
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
...@@ -78,28 +77,25 @@ ...@@ -78,28 +77,25 @@
} 个文件` } 个文件`
); );
}, },
fileUpload(file) { fileUpload(file) {},
},
sucess(response, file, fileList) { sucess(response, file, fileList) {
this.imgArr = fileList; this.imgArr = fileList;
}, },
setNewArr() { setNewArr() {
const newArr = []; const newArr = [];
if (this.imgArr && this.imgArr.length) { if (this.imgArr && this.imgArr.length) {
this.imgArr.forEach(item => { this.imgArr.forEach((item) => {
if (item.response) { if (item.response) {
newArr.push(item.response.data); newArr.push(item.response.data);
} else if(item.url && item.from) { } else if (item.url && item.from) {
newArr.push(item.url); newArr.push(item.url);
} }
}); });
} }
return newArr; return newArr;
} },
}, },
}; };
</script> </script>
<style> <style></style>
</style>
\ No newline at end of file
...@@ -33,13 +33,15 @@ ...@@ -33,13 +33,15 @@
class="el-upload__tip music-box" class="el-upload__tip music-box"
> >
<audio <audio
v-for="(item) of musicArr" v-for="item of musicArr"
:key="item.uid" :key="item.uid"
ref="audioWrap" ref="audioWrap"
class="audio" class="audio"
controls controls
:src="musicUrl(item)" :src="musicUrl(item)"
>您的浏览器不支持mp3播放</audio> >
您的浏览器不支持mp3播放
</audio>
</ul> </ul>
</el-upload> </el-upload>
</div> </div>
...@@ -51,14 +53,14 @@ ...@@ -51,14 +53,14 @@
props: { props: {
isDisable: { isDisable: {
type: Boolean, type: Boolean,
default: false default: false,
}, },
musicList: { musicList: {
type: Array, type: Array,
default: ()=>{ default: () => {
return [] return [];
} },
} },
}, },
data() { data() {
return { return {
...@@ -70,13 +72,13 @@ ...@@ -70,13 +72,13 @@
token: localStorage.getItem('token'), token: localStorage.getItem('token'),
}, },
loading: false, loading: false,
accept: '.mp3,.mpeg' accept: '.mp3,.mpeg',
}; };
}, },
watch:{ watch: {
musicList(newv) { musicList(newv) {
this.musicArr = newv || []; this.musicArr = newv || [];
} },
}, },
created() { created() {
this.musicArr = this.musicList; this.musicArr = this.musicList;
...@@ -100,7 +102,6 @@ ...@@ -100,7 +102,6 @@
this.loading = false; this.loading = false;
clearTimeout(time); clearTimeout(time);
}, 1000); }, 1000);
}, },
sucess(fileList) { sucess(fileList) {
this.musicArr = fileList; this.musicArr = fileList;
...@@ -110,23 +111,22 @@ ...@@ -110,23 +111,22 @@
this.loading = false; this.loading = false;
}, },
// 上传mp3 // 上传mp3
beforeMusicUpload() { beforeMusicUpload() {},
},
setNewArr() { setNewArr() {
const newArr = []; const newArr = [];
if (this.musicArr && this.musicArr.length) { if (this.musicArr && this.musicArr.length) {
this.musicArr.forEach(item => { this.musicArr.forEach((item) => {
if (item.response) { if (item.response) {
newArr.push(item.response.data.domainPath + item.response.data.path); newArr.push(
} else if(item.url && item.from) { item.response.data.domainPath + item.response.data.path
);
} else if (item.url && item.from) {
newArr.push(item.url); newArr.push(item.url);
} }
}); });
} }
return newArr; return newArr;
}, },
}, },
}; };
</script> </script>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
bottom: 0; bottom: 0;
right: 0; right: 0;
background: #000; background: #000;
opacity: .3; opacity: 0.3;
} }
.audio { .audio {
display: block; display: block;
...@@ -161,6 +161,6 @@ ...@@ -161,6 +161,6 @@
} }
.el-upload-list { .el-upload-list {
display: inline-block; display: inline-block;
} }
} }
</style> </style>
...@@ -20,7 +20,11 @@ ...@@ -20,7 +20,11 @@
:key="item.prop" :key="item.prop"
:prop="item.prop" :prop="item.prop"
:label="item.label" :label="item.label"
:sortable="item.prop=='appointBeginTime'||item.prop=='assistantBeginTime'?'custom':false" :sortable="
item.prop == 'appointBeginTime' || item.prop == 'assistantBeginTime'
? 'custom'
: false
"
:show-overflow-tooltip="item.showtooltip" :show-overflow-tooltip="item.showtooltip"
min-width="170" min-width="170"
align="center" align="center"
...@@ -159,7 +163,7 @@ ...@@ -159,7 +163,7 @@
type="primary" type="primary"
size="small" size="small"
class="btn" class="btn"
@click="reMatchDot(scope.row,10)" @click="reMatchDot(scope.row, 10)"
> >
重新匹配医生 重新匹配医生
</el-button> </el-button>
...@@ -168,7 +172,7 @@ ...@@ -168,7 +172,7 @@
type="primary" type="primary"
size="small" size="small"
class="btn" class="btn"
@click="reMatchDot(scope.row,16)" @click="reMatchDot(scope.row, 16)"
> >
重新联系助诊医生 重新联系助诊医生
</el-button> </el-button>
...@@ -184,7 +188,7 @@ ...@@ -184,7 +188,7 @@
<!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,26)" @click="call(scope.row)">发起问诊</el-button>--> <!-- <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,26)" @click="call(scope.row)">发起问诊</el-button>-->
<el-button <el-button
v-if="showBtn(scope.row, 3)" v-if="showBtn(scope.row, 3)"
:type="scope.row.completed?'danger':'primary'" :type="scope.row.completed ? 'danger' : 'primary'"
size="small" size="small"
class="btn" class="btn"
@click="doneHandle(scope.row)" @click="doneHandle(scope.row)"
...@@ -231,8 +235,8 @@ ...@@ -231,8 +235,8 @@
}, },
tData: { tData: {
type: Array, type: Array,
default: ()=>{ default: () => {
return [] return [];
}, },
}, },
pageNo: { pageNo: {
...@@ -257,8 +261,8 @@ ...@@ -257,8 +261,8 @@
}, },
multipleSelection: { multipleSelection: {
type: Array, type: Array,
default: ()=>{ default: () => {
return [] return [];
}, },
}, },
}, },
...@@ -270,7 +274,6 @@ ...@@ -270,7 +274,6 @@
}, },
mounted() {}, mounted() {},
methods: { methods: {
sortfunc(data) { sortfunc(data) {
this.$emit('sortfunc', data); this.$emit('sortfunc', data);
}, },
...@@ -333,7 +336,6 @@ ...@@ -333,7 +336,6 @@
}, },
// 重新匹配医生 // 重新匹配医生
reMatchDot(row, type) { reMatchDot(row, type) {
this.$emit('reMatchDot', row, type); this.$emit('reMatchDot', row, type);
}, },
// 修改时间 // 修改时间
......
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
v-if="scope.row.status != 4 && scope.row.status != 5" v-if="scope.row.status != 4 && scope.row.status != 5"
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="timeHandle(scope.row)" @click="timeHandle(scope.row)"
> >
修改时间 修改时间
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
v-if="scope.row.status == 3" v-if="scope.row.status == 3"
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="endDiagnosis(scope.row)" @click="endDiagnosis(scope.row)"
> >
结束 结束
...@@ -334,19 +334,29 @@ ...@@ -334,19 +334,29 @@
<!-- <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1 && scope.row.diagnoseType != 3" type="primary" size="small" @click="callAll(scope.row)" style="margin-top: 10px;">呼叫双方</el-button> --> <!-- <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1 && scope.row.diagnoseType != 3" type="primary" size="small" @click="callAll(scope.row)" style="margin-top: 10px;">呼叫双方</el-button> -->
<!-- <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2 && scope.row.diagnoseType != 3" type="primary" size="small" @click="jionCommunicate(scope.row)" style="margin-top: 10px;">加入问诊</el-button> --> <!-- <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2 && scope.row.diagnoseType != 3" type="primary" size="small" @click="jionCommunicate(scope.row)" style="margin-top: 10px;">加入问诊</el-button> -->
<el-button <el-button
v-if="scope.row.status == 3 && scope.row.diagnoseType != 3 && scope.row.appointBeginTime && scope.row.appointEndTime" v-if="
scope.row.status == 3 &&
scope.row.diagnoseType != 3 &&
scope.row.appointBeginTime &&
scope.row.appointEndTime
"
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="jionCommunicate(scope.row)" @click="jionCommunicate(scope.row)"
> >
加入问诊 加入问诊
</el-button> </el-button>
<el-button <el-button
v-if="!((scope.row.status==2 || scope.row.status==4) && scope.row.createType == 2)" v-if="
!(
(scope.row.status == 2 || scope.row.status == 4) &&
scope.row.createType == 2
)
"
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="sendMessage(scope.row)" @click="sendMessage(scope.row)"
> >
发送消息 发送消息
...@@ -366,7 +376,7 @@ ...@@ -366,7 +376,7 @@
v-if="scope.row.status == 2 || scope.row.status == 3" v-if="scope.row.status == 2 || scope.row.status == 3"
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="cancelBtn(scope.row)" @click="cancelBtn(scope.row)"
> >
取消预约 取消预约
...@@ -376,16 +386,16 @@ ...@@ -376,16 +386,16 @@
v-if="scope.row.status != 5" v-if="scope.row.status != 5"
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="goEditor(scope.row,1)" @click="goEditor(scope.row, 1)"
> >
编辑 编辑
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
style="margin-top: 10px;" style="margin-top: 10px"
@click="goEditor(scope.row,2)" @click="goEditor(scope.row, 2)"
> >
预约详情 预约详情
</el-button> </el-button>
...@@ -414,35 +424,33 @@ ...@@ -414,35 +424,33 @@
props: { props: {
tData: { tData: {
type: Array, type: Array,
default: ()=>{ default: () => {
return [] return [];
} },
}, },
pageNo: { pageNo: {
type: Number, type: Number,
default: 1 default: 1,
}, },
pageSize: { pageSize: {
type: Number, type: Number,
default: 20 default: 20,
}, },
totalRows: { totalRows: {
type: Number, type: Number,
default: 0 default: 0,
}, },
loading : { loading: {
type: Boolean, type: Boolean,
default: false default: false,
}, },
tableHeight: { tableHeight: {
type: Number, type: Number,
default: 500 default: 500,
} },
}, },
data() { data() {
return { return {};
};
}, },
methods: { methods: {
timeHandle(row) { timeHandle(row) {
...@@ -474,10 +482,9 @@ ...@@ -474,10 +482,9 @@
}, },
handleCurrentChange(value) { handleCurrentChange(value) {
this.$emit('handleCurrentChange', value); this.$emit('handleCurrentChange', value);
} },
}, },
}; };
</script> </script>
<style> <style></style>
</style>
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册