提交 af668759 编写于 作者: changdi.hao's avatar changdi.hao

优化逻辑

上级 c2cd31a6
......@@ -12,13 +12,13 @@
:limit="15"
:on-exceed="handleExceed"
:file-list="imgArr"
:accept="accept"
>
<i class="el-icon-plus"></i>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="" />
</el-dialog>
<div @click="setNewArr">asdasdasd</div>
</div>
</template>
......@@ -45,6 +45,7 @@ export default {
token: localStorage.getItem("storageToken"),
},
actionurl: "#",
accept: '.png,.jpeg'
};
},
created() {
......@@ -71,7 +72,7 @@ export default {
);
},
fileUpload(file) {
const isJPG = file.type === "image/png" || file.type === "image/png";
const isJPG = file.type === "image/jpeg" || file.type === "image/img";
if (!isJPG) {
this.$message.error("请上传只能是 JPG或PNG 格式!");
return;
......
......@@ -11,6 +11,7 @@
:file-list="musicArr"
:on-error="errfn"
:before-remove="beforeRemove"
:accept="accept"
>
<el-button size="small" type="primary">点击上传</el-button>
<p slot="tip" class="el-upload__tip">音频格式:mp3</p>
......@@ -25,7 +26,6 @@
>您的浏览器不支持mp3播放</audio>
</ul>
</el-upload>
<div @click="hcd">asd</div>
</div>
</template>
......@@ -52,7 +52,8 @@ export default {
headers: {
token: localStorage.getItem("storageToken"),
},
loading: false
loading: false,
accept: '.mp3,.mpeg'
};
},
created() {
......@@ -68,8 +69,8 @@ export default {
},
methods: {
musicUrl(item) {
if (item.localUrl) {
return item.localUrl
if (item.url) {
return item.url
}
return item.response.data.domainPath + item.response.data.path
},
......@@ -116,21 +117,18 @@ export default {
// })
// .catch(() => {});
},
hcd() {
setNewArr() {
let newArr = []
if (this.musicArr && this.musicArr.length) {
this.musicArr.forEach(item => {
if (item.localUrl) {
newArr.push(item.localUrl)
if (item.url) {
newArr.push(item.url)
} else if (item.response){
newArr.push(item.response.data.domainPath + item.response.data.path)
}
});
}
console.log('====================================');
console.log(newArr);
console.log('====================================');
return newArr
},
......
......@@ -6,8 +6,8 @@
v-loading="loading"
style="width: 100%"
>
<el-table-column prop="diagnoseLogId" label="ID" min-width="170" align="left"></el-table-column>
<el-table-column prop="orderNo" label="订单ID" min-width="100" align="left"></el-table-column>
<el-table-column prop="diagnoseLogId" label="ID" min-width="100" align="left"></el-table-column>
<el-table-column prop="orderNo" label="订单ID" min-width="170" align="left"></el-table-column>
<el-table-column prop="diagnoseTypeStr" label="预约类型" min-width="120" align="left"></el-table-column>
<el-table-column prop="statusStr" label="状态" min-width="80" align="left"></el-table-column>
<el-table-column prop="operateUserName" label="运营人员" min-width="100" align="left"></el-table-column>
......@@ -27,12 +27,12 @@
<el-table-column prop="diagnoseStageStr" label="初/复诊" min-width="120" align="left"></el-table-column>
<el-table-column prop="determineFlagStr" label="是否确诊" min-width="120" align="left"></el-table-column>
<el-table-column prop="diagnoseDisease" label="确诊疾病" min-width="120" align="left"></el-table-column>
<el-table-column prop="illnessDetail" label="病情描述" min-width="200" align="left"></el-table-column>
<el-table-column prop="diagnoseAdvice" label="诊断建议" min-width="120" align="left"></el-table-column>
<el-table-column prop="illnessDetail" label="病情描述" min-width="200" align="left" show-overflow-tooltip></el-table-column>
<el-table-column prop="diagnoseAdvice" label="诊断建议" min-width="120" align="left" show-overflow-tooltip></el-table-column>
<el-table-column prop="followFlagStr" label="是否跟进" min-width="120" align="left"></el-table-column>
<el-table-column prop="drugFollow" label="药品跟进" min-width="200" align="left"></el-table-column>
<el-table-column prop="checkFollow" label="检查跟进" min-width="200" align="left"></el-table-column>
<el-table-column prop="otherFollow" label="其他跟进事项" min-width="200" align="left"></el-table-column>
<el-table-column prop="drugFollow" label="药品跟进" min-width="200" align="left" show-overflow-tooltip></el-table-column>
<el-table-column prop="checkFollow" label="检查跟进" min-width="200" align="left" show-overflow-tooltip></el-table-column>
<el-table-column prop="otherFollow" label="其他跟进事项" min-width="200" align="left" show-overflow-tooltip></el-table-column>
<el-table-column prop="createTypeStr" label="创建方式" min-width="120" align="left"></el-table-column>
<el-table-column prop="appointSourceStr" label="预约来源" min-width="120" align="left"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" min-width="120" align="left"></el-table-column>
......@@ -57,7 +57,7 @@
<el-table-column prop="doctorSourceStr" label="接诊医生来源" min-width="120" align="left"></el-table-column>
<el-table-column prop="serviceFeeStr" label="接诊医生服务费" min-width="120" align="left"></el-table-column>
<el-table-column prop="crrsName" label="招募人" min-width="120" align="left"></el-table-column>
<el-table-column prop="remark" label="备注" min-width="120" align="left"></el-table-column>
<el-table-column prop="remark" label="备注" min-width="120" align="left" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope">
<!-- 1 初始状态 2待咨询 3 咨询中 4已结束 -->
......
......@@ -5,6 +5,7 @@ const diagnosisList = r => require.ensure([], () => r(require('../views/IM/diagn
const diagnosisIm = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-im.vue')), 'diagnosisIm')
const diagnosisLive = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-live.vue')), 'diagnosisLive')
const diagnosisEditor = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-editor.vue')), 'diagnosisEditor')
const diagnosisListLod = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-list-old.vue')), 'diagnosisListLod')
export default [{
path: '/',
......@@ -25,6 +26,9 @@ export default [{
}, {
path: '/diagnosis-editor',
component: diagnosisEditor
}, {
path: '/diagnosis-list-old',
component: diagnosisListLod
}
]
}]
\ No newline at end of file
......@@ -84,15 +84,15 @@ export const CAR_LIST = [
{
label: '居民身份证',
value: 1
},
{
label: '护照',
value: 2
},
{
label: '港澳通行证',
value: 3
}
// {
// label: '护照',
// value: 2
// },
// {
// label: '港澳通行证',
// value: 3
// }
]
// 性别
......
......@@ -107,20 +107,20 @@
<h1>患者信息</h1>
<el-form-item label="患者姓名" prop="patientName" required="" >
<el-input v-model="formData.patientName" placeholder="请输入患者姓名" class="set-width" :disabled="hcd || editorType== 2" minlength='2' maxlength="20"></el-input>
<el-input v-model="formData.patientName" placeholder="请输入患者姓名" class="set-width" :disabled="noable || editorType== 2" minlength='2' maxlength="20"></el-input>
</el-form-item>
<el-form-item label="证件类型" prop="idCardType" required>
<el-select v-model="formData.idCardType" placeholder="请选择证件类型" class="set-width" :disabled="hcd || editorType== 2" @change="blurFn">
<el-select v-model="formData.idCardType" placeholder="请选择证件类型" class="set-width" :disabled="noable || editorType== 2" @change="blurFn">
<el-option v-for="item of carList" :key="item.value" :label="item.label" :value="item.value" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="证件号" prop="idCard" required>
<el-input v-model="formData.idCard" placeholder="请输入证件号" class="set-width" :disabled="hcd || editorType== 2" maxlength="18" @blur="blurFn"></el-input>
<el-input v-model="formData.idCard" placeholder="请输入证件号" class="set-width" :disabled="noable || editorType== 2" maxlength="18" @blur="blurFn"></el-input>
</el-form-item>
<el-form-item label="出生日期" prop="birthday" required>
<el-date-picker
class="set-width"
:disabled="hcd || birthDisable || editorType== 2"
:disabled="noable || birthDisable || editorType== 2"
type="date"
placeholder="出生日期"
v-model="formData.birthday"
......@@ -130,12 +130,12 @@
</el-date-picker>
</el-form-item>
<el-form-item label="性别" prop="sex" required>
<el-select v-model="formData.sex" placeholder="请选择性别" class="set-width" :disabled="hcd || editorType== 2">
<el-select v-model="formData.sex" placeholder="请选择性别" class="set-width" :disabled="noable || editorType== 2">
<el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="患者电话" prop="patientMobilePhone" required >
<el-input v-model="formData.patientMobilePhone" placeholder="请输入手机号" class="set-width" :disabled="hcd || editorType== 2" maxlength="11"></el-input>
<el-input v-model="formData.patientMobilePhone" placeholder="请输入手机号" class="set-width" :disabled="noable || editorType== 2" maxlength="11"></el-input>
</el-form-item>
......@@ -296,7 +296,7 @@ export default {
return {
diagnoseLogId: '',
birthDisable: false,
hcd: false,
noable: false,
//2、待问诊3、问诊中 4、已问诊"
inquiryStatus: 4,
editorType: 1, // //1为编辑状态,2为查看
......@@ -365,8 +365,8 @@ export default {
{ required: true, message: '请输入预约时间', trigger: 'change' }
],
patientName: [
{ required: true, message: '请输入患姓名', trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
{ required: true, message: '请输入患姓名', trigger: ['blur','change'] },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: ['blur','change'] }
],
idCardType: [
{ required: true, message: '请选择证件类型', trigger: 'change' }
......@@ -384,7 +384,7 @@ export default {
{ required: true, message: '请选择性别', trigger: 'change' }
],
patientMobilePhone: [
{ required: true, message: '请输入患者电话', trigger: 'blur' }
{ required: true, message: '请输入患者电话', trigger: ['blur','change'] }
],
receiveDoctor: [
{ required: true, message: '请选择接诊医生', trigger: 'change' }
......@@ -441,9 +441,13 @@ export default {
this.formData = res.data
if (!this.formData.illnessImageUrls) {
this.formData.illnessImageUrls = []
} else {
this.formData.illnessImageUrls = this.setObjectArr(this.formData.illnessImageUrls)
}
if (!this.formData.illnessAudioUrls) {
this.formData.illnessAudioUrls = []
} else {
this.formData.illnessAudioUrls = this.setObjectArr(this.formData.illnessAudioUrls)
}
} else {
this.$message.info('请稍后重试')
......@@ -474,7 +478,7 @@ export default {
}
},
blurFn() {
if (this.formData.idCardType == 1 && this.formData.idCard.length == 18) {
if (this.formData.idCardType == 1 && this.formData.idCard && this.formData.idCard.length == 18) {
this.formData.birthday = getBirth(this.formData.idCard)
this.birthDisable = true
} else {
......@@ -487,10 +491,12 @@ export default {
},
save() {
// return
let url = `/diagnose/admin/diagnose/update`
let params = this.formData
params.illnessImageUrls = [...this.$refs.imgComponent.setNewArr()]
params.illnessAudioUrls = [...this.$refs.musicComponent.setNewArr()]
this.$refs.form.validate((valid) => {
let url = `/diagnose/admin/diagnose/update`
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()] : []
this.POST(url, params).then(res => {
this.loading = false
if (res.code == "000000") {
......@@ -498,33 +504,35 @@ export default {
// this.$router.back()
}
});
// this.$refs.form.validate((valid) => {
// if (valid) {
// let url = `/diagnose/admin/diagnose/update`
// let params = this.formData
// this.POST(url, params).then(res => {
// this.loading = false
// if (res.code == "000000") {
// this.$message.success('保存成功');
// this.$router.back()
// }
// });
// } else {
// this.$message.info('请将信息填写完整')
// }
// });
return
if (valid) {
let url = `/diagnose/admin/diagnose/update`
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()] : []
this.POST(url, params).then(res => {
this.loading = false
if (res.code == "000000") {
this.$message.success('保存成功');
// this.$router.back()
}
});
} else {
this.$message.info('请将信息填写完整')
}
});
},
// 格式话音频/视频数组
setObjectArr(array,attr,newa) {
setObjectArr(array) {
let newArr = []
array.forEach(element => {
newArr.push(
{
url: element[attr]
url: element
}
)
});
newa = newArr
return newArr
}
}
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册