提交 355224a4 编写于 作者: tao.wu's avatar tao.wu

no message

上级 1cd22ccb
...@@ -14,7 +14,7 @@ service.interceptors.request.use(config => { ...@@ -14,7 +14,7 @@ service.interceptors.request.use(config => {
if( config.headers['sysCode']==undefined) { if( config.headers['sysCode']==undefined) {
config.headers['sysCode'] = 12 config.headers['sysCode'] = 12
} }
config.headers['token'] = 'D74A6C7C61564EB1B3DC83251F33D173' config.headers['token'] = '807108DB003F4304A1037E8CD15BAA93'
//config.headers['token'] = localStorage.getItem('storageToken') //config.headers['token'] = localStorage.getItem('storageToken')
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' }) config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// if (config.data && config.data.setEntry) { // if (config.data && config.data.setEntry) {
...@@ -22,7 +22,7 @@ service.interceptors.request.use(config => { ...@@ -22,7 +22,7 @@ service.interceptors.request.use(config => {
// if(config.data.token){ // if(config.data.token){
// config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB' // config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
// } // }
// config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' }) // config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// } // }
return config return config
...@@ -35,10 +35,10 @@ service.interceptors.request.use(config => { ...@@ -35,10 +35,10 @@ service.interceptors.request.use(config => {
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
const res = response.data const res = response.data
/* /*
baseUrl时,返回000000为成功 baseUrl时,返回000000为成功
apiUrl时,返回200为成功 apiUrl时,返回200为成功
*/ */
// if (res.code !== '000000') { // if (res.code !== '000000') {
// return Promise.reject('error') // return Promise.reject('error')
// } else { // } else {
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<el-select v-model="timeForm.timeNo" placeholder="请选择"> <el-select v-model="timeForm.timeNo" placeholder="请选择">
<el-option <el-option
v-for="item in indexOptions" v-for="item in indexOptions"
:key="item.value" :key="item.no"
:label="item.label" :label="item.value"
:value="item.label"> :value="item.no">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -27,33 +27,35 @@ ...@@ -27,33 +27,35 @@
</el-form-item> </el-form-item>
<el-form-item label="随访方式" prop="type"> <el-form-item label="随访方式" prop="type">
<el-radio-group v-model="timeForm.type" size="small"> <el-radio-group v-model="timeForm.type" size="small">
<el-radio :label="1">门诊随访</el-radio> <el-radio v-for="item in followTypeList" :label="item.no">{{item.value}}</el-radio>
<el-radio :label="2">上门随访</el-radio>
<el-radio :label="3">电话随访</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="提醒医生预约居民"> <el-form-item label="提醒医生预约居民">
<el-select <el-select
v-model="timeForm.remindList[0].startDays" v-model="timeForm.remindDay"
multiple multiple
:multiple-limit=3 :multiple-limit=3
placeholder="请选择"> placeholder="请选择">
<el-option <el-option
v-for="item in remindOptions" v-for="item in remindOptions"
:key="item.value" :key="item.no"
:label="item.label" :label="item.value"
:value="item.value"> :value="item.no">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="推送患教"> <el-form-item label="推送患教">
<div style="display: flex"> <div style="display: flex">
<el-select v-model="timeForm.pushContentList[0].startDays" placeholder="选择推送时间" clearable> <el-select
v-model="timeForm.pushDay"
placeholder="选择推送时间"
clearable
>
<el-option <el-option
v-for="item in pushTimeOptions" v-for="item in pushTimeOptions"
:key="item.value" :key="item.no"
:label="item.label" :label="item.value"
:value="item.value"> :value="item.no">
</el-option> </el-option>
</el-select> </el-select>
<el-button plain class="ml20" @click="goSelectCartoon" v-if="!timeForm.hasSelected">选择健康漫画</el-button> <el-button plain class="ml20" @click="goSelectCartoon" v-if="!timeForm.hasSelected">选择健康漫画</el-button>
...@@ -70,15 +72,15 @@ ...@@ -70,15 +72,15 @@
</div> </div>
<el-form-item label="随访登记表"> <el-form-item label="随访登记表">
<el-select <el-select
v-model="timeForm.followupList[0].resourceId" v-model="timeForm.followResourceId"
multiple multiple
:multiple-limit=2 :multiple-limit=2
placeholder="请选择"> placeholder="请选择">
<el-option <el-option
v-for="item in formOptions" v-for="item in formOptions"
:key="item.value" :key="item.no"
:label="item.label" :label="item.value"
:value="item.value"> :value="item.no">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -90,18 +92,6 @@ ...@@ -90,18 +92,6 @@
import _ from 'lodash'; import _ from 'lodash';
import SelectCartoon from '@/views/followup/plan-manage/dialog/select-cartoon'; import SelectCartoon from '@/views/followup/plan-manage/dialog/select-cartoon';
// const timeFormInit = {
// formRef: '',
// followupTime: '',
// followupMark: '',
// followupWay: '',
// pushTime: '',
// remindTime: [],
// followupForm: [],
// hasSelected: '',
// };
export default { export default {
components: { components: {
SelectCartoon}, SelectCartoon},
...@@ -110,59 +100,29 @@ ...@@ -110,59 +100,29 @@
isSelectCartoon: false, isSelectCartoon: false,
indexOptions: [ indexOptions: [
{ {
value: '0', no: 0,
label: '0' value: 0
}, {
value: '1',
label: '1'
}, {
value: '2',
label: '2'
}, {
value: '3',
label: '3'
},
],
remindOptions: [
{
value: '0',
label: '开始前30天'
}, { }, {
value: '1', no: 1,
label: '开始前20天' value: 1
}, }
{
value: '2',
label: '开始前10天'
},
],
pushTimeOptions: [
{
value: '0',
label: '开始前7天'
}, {
value: '1',
label: '开始前3天'
},
{
value: '2',
label: '当天'
},
], ],
formOptions: [ formOptions: [
{ {
value: '0', no: 0,
label: '随访登记表1' value: '随访登记表1'
}, { }, {
value: '1', no: 1,
label: '随访登记表2' value: '随访登记表2'
}, },
{ {
value: '2', no: 2,
label: '随访登记表3' value: '随访登记表3'
}, },
], ],
followResourceId: '',
pushDay: '',
remindDay: '',
timeFormRules: { timeFormRules: {
timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
...@@ -175,22 +135,19 @@ ...@@ -175,22 +135,19 @@
type: Object, type: Object,
}, },
valBegin: Boolean, valBegin: Boolean,
markOptions:Array markOptions:Array,
followTypeList:Array,
remindOptions:Array,
pushTimeOptions:Array,
}, },
watch: { watch: {
valBegin(val){ valBegin(val){
if(val){ if(val){
// console.log('开始校验')
this.$refs[this.timeForm.formRef].validate((valid) => { this.$refs[this.timeForm.formRef].validate((valid) => {
// console.log(valid)
this.$emit('checkValid',valid) this.$emit('checkValid',valid)
}); });
} }
} }
},
created(){
}, },
methods: { methods: {
getNowTime() { getNowTime() {
......
...@@ -21,12 +21,15 @@ ...@@ -21,12 +21,15 @@
</div> </div>
<div class="form-div" v-if="activeTab != 'setNewRef'"> <div class="form-div" v-if="activeTab != 'setNewRef'">
<div :key="timeFormHas.formRef" v-for="(timeFormHas, index) in setTimeNodeList1" :label="index"> <div v-for="(timeFormHas, index) in setTimeNodeList1" :key="index" :label="index">
<set-time-form <set-time-form
v-if="index == activeTab" v-if="index == activeTab"
:timeForm="timeFormHas" :timeForm="timeFormHas"
:valBegin="valBegin" :valBegin="valBegin"
:markOptions="markOptions" :markOptions="markOptions"
:remindOptions="remindOptions"
:pushTimeOptions="pushTimeOptions"
:followTypeList="followTypeList"
@checkValid="checkValid" @checkValid="checkValid"
/> />
</div> </div>
...@@ -36,8 +39,11 @@ ...@@ -36,8 +39,11 @@
<set-time-form <set-time-form
:timeForm="timeForm" :timeForm="timeForm"
:valBegin="valBegin" :valBegin="valBegin"
@checkValid="checkValid"
:markOptions="markOptions" :markOptions="markOptions"
:remindOptions="remindOptions"
:pushTimeOptions="pushTimeOptions"
:followTypeList="followTypeList"
@checkValid="checkValid"
/> />
</div> </div>
</div> </div>
...@@ -59,30 +65,14 @@ ...@@ -59,30 +65,14 @@
type: '',//随访方式 type: '',//随访方式
timeNo: '',//随访时间 timeNo: '',//随访时间
timeUnit: '',//随访时间单位 timeUnit: '',//随访时间单位
remindList: [ //提醒医生预约提前天数 remindList: [],//提醒医生预约提前天数
{ pushContentList: [],//推送患教提前天数 漫画id
startDays:'' followupList: [],//随访量表id
}
],
pushContentList: [
{
resourceId: "",//漫画id
startDays: ""//推送患教提前天数
}
],
followupList: [//随访量表id
{
resourceId: "",//随访量表id
}
],
// followupTime: '',
// followupMark: '',
// followupWay: '',
// pushTime: '',
// remindTime: [],
// followupForm: [],
hasSelected: '', hasSelected: '',
isDisabled: false, isDisabled: false,
remindDay: '',
pushDay: '',
followResourceId: ''
}; };
...@@ -99,62 +89,10 @@ ...@@ -99,62 +89,10 @@
currentFormRef: 1, currentFormRef: 1,
showSetBtn: true, showSetBtn: true,
timeForm: _.cloneDeep(timeFormInit), timeForm: _.cloneDeep(timeFormInit),
indexOptions: [ markOptions: [],
{ followTypeList:[],
value: '0', remindOptions: [],
label: '0' pushTimeOptions: [],
}, {
value: '1',
label: '1'
}, {
value: '2',
label: '2'
}, {
value: '3',
label: '3'
},
],
markOptions: [
],
remindOptions: [
{
value: '0',
label: '开始前30天'
}, {
value: '1',
label: '开始前20天'
},
{
value: '2',
label: '开始前10天'
},
],
pushTimeOptions: [
{
value: '0',
label: '开始前7天'
}, {
value: '1',
label: '开始前3天'
},
{
value: '2',
label: '当天'
},
],
formOptions: [
{
value: '0',
label: '随访登记表1'
}, {
value: '1',
label: '随访登记表2'
},
{
value: '2',
label: '随访登记表3'
},
],
timeFormRules: { timeFormRules: {
timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
...@@ -188,13 +126,7 @@ ...@@ -188,13 +126,7 @@
this.timeForm.isDisabled = true; this.timeForm.isDisabled = true;
this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit; this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
} }
// 随访时间节点单位 this.getConstdata()
getBasicData({
numList: 'P017'
}).then(res=>{
console.log(res)
this.markOptions = res.data['P017']
})
}, },
watch: { watch: {
valBegin(val){ valBegin(val){
...@@ -227,10 +159,45 @@ ...@@ -227,10 +159,45 @@
} }
}, },
methods: { methods: {
// 一次性获取常量接口数据
getConstdata(){
// 随访时间节点单位
getBasicData({numList: 'P017'}).then(res=>{
this.markOptions = res.data['P017']
})
// 随访方式
getBasicData({numList: 'P212'}).then(res=>{
this.followTypeList = res.data['P212']
})
// 提醒医生天数
getBasicData({numList: 'P213'}).then(res=>{
this.remindOptions = res.data['P213']
})
// 推送患教提醒天数
getBasicData({numList: 'P214'}).then(res=>{
this.pushTimeOptions = res.data['P214']
})
},
checkValid(val){ checkValid(val){
// console.log(val)
this.valBegin = false this.valBegin = false
if (val) { if (val) {
this.timeForm.remindDay.forEach((item)=>{
this.timeForm.remindList.push({
startDays: item
})
})
this.timeForm.pushContentList.push({
startDays: this.timeForm.pushDay,
resourceId: ''
})
this.timeForm.followResourceId.forEach((item)=>{
this.timeForm.followupList.push({
resourceId: item
})
})
this.setTimeNodeList.push(this.timeForm); this.setTimeNodeList.push(this.timeForm);
this.timeForm = _.cloneDeep(timeFormInit); this.timeForm = _.cloneDeep(timeFormInit);
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
clearable> clearable>
<el-option <el-option
v-for="item in templateOptions" v-for="item in templateOptions"
:key="item.value" :key="item.no"
:label="item.label" :label="item.value"
:value="item.value"> :value="item.no">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -120,10 +120,6 @@ ...@@ -120,10 +120,6 @@
time:'',//随访开始时间 time:'',//随访开始时间
remarksStatus: '', remarksStatus: '',
fPlanTimeReqList: [],//时间节点列表 fPlanTimeReqList: [],//时间节点列表
// followupTemplate: '',
// startTime: '',
// followupKind: '',
hasSelectedNum: 0, hasSelectedNum: 0,
}, },
isShowSelectPatient: false, isShowSelectPatient: false,
...@@ -131,25 +127,11 @@ ...@@ -131,25 +127,11 @@
hasSelectedList: [], hasSelectedList: [],
templateOptions: [ templateOptions: [
{ {
value: '0', no: 0,
label: '随访模板一' value: '目前请选择自定义模板作为测试'
}, {
value: '1',
label: '随访模板二'
}, {
value: '2',
label: '随访模板三'
} }
], ],
kindOptions: [ kindOptions: [],
// {
// value: '0',
// label: '上门随访'
// }, {
// value: '1',
// label: '术后随访'
// }
],
rules: { rules: {
name: [{ required: true, message: '请输入随访计划名称', trigger: 'blur' }], name: [{ required: true, message: '请输入随访计划名称', trigger: 'blur' }],
hasSelectedNum: [{ required: true, message: '请添加随访居民', trigger: 'change' }], hasSelectedNum: [{ required: true, message: '请添加随访居民', trigger: 'change' }],
...@@ -163,7 +145,6 @@ ...@@ -163,7 +145,6 @@
getBasicData({ getBasicData({
numList: 'P211' numList: 'P211'
}).then(res=>{ }).then(res=>{
console.log(res)
this.kindOptions = res.data['P211'] this.kindOptions = res.data['P211']
}) })
}, },
...@@ -240,7 +221,6 @@ ...@@ -240,7 +221,6 @@
}, },
saveEdit() { saveEdit() {
this.baseInfo.fPlanTimeReqList = this.setTimeNodeList this.baseInfo.fPlanTimeReqList = this.setTimeNodeList
console.log(this.baseInfo)
createFollowPlan(this.baseInfo) createFollowPlan(this.baseInfo)
// console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1) // console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1)
// console.log('store中的setTimeNodeList数据为=>',JSON.stringify(this.setTimeNodeList)) // console.log('store中的setTimeNodeList数据为=>',JSON.stringify(this.setTimeNodeList))
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册