|
@@ -123,7 +123,7 @@ const phoneTest = /^[1]([3-9])[0-9]{9}$/;
|
|
|
* \d{2}[0-9Xx] 顺序码两位,一位校验码最后一位数字或者大小写X
|
|
|
*/
|
|
|
/**18位
|
|
|
- *
|
|
|
+ *
|
|
|
*
|
|
|
*
|
|
|
* [1-9]\d{5} 前六位地区,非0打头
|
|
@@ -188,10 +188,10 @@ const moduleConfig = (config,modules) => {
|
|
|
}else if(tmpCode=="omhistory_show"&&tmpType==moduleCP['other']&&tmpVal==1){
|
|
|
activeModule.push(modules[j])
|
|
|
activeModuleObj.omhistory_show = modules[j]
|
|
|
- }else if(tmpCode=="replenish_show"&&tmpType==moduleCP['suplement']&&tmpVal==1){
|
|
|
+ }/*else if(tmpCode=="replenish_show"&&tmpType==moduleCP['suplement']&&tmpVal==1){
|
|
|
activeModule.push(modules[j])
|
|
|
activeModuleObj.replenish_show = modules[j]
|
|
|
- }
|
|
|
+ }*/
|
|
|
}
|
|
|
}
|
|
|
return {
|
|
@@ -408,11 +408,11 @@ const getRouteName = (flg,active,order) => {
|
|
|
return '/preview'
|
|
|
} else if(flg == 1){
|
|
|
return '/tab'
|
|
|
- }
|
|
|
+ }
|
|
|
}else{
|
|
|
if(order == 1){
|
|
|
if(active.diagnosis_show){
|
|
|
- return '/tab/treat'
|
|
|
+ return '/tab/treat'
|
|
|
}else if(active.omhistory_show){
|
|
|
return '/tab/others'
|
|
|
}else if(active.replenish_show){
|