Merge branch 'hotfix/text' into develop

src/views/diagnosis/Prescribing.vue

@@ -1547,6 +1547,7 @@ export default {
       let obj = {
         contentTabs: this.contentTabs,
         container_i: this.container_i,
+        rRecomendR: this.rRecomendR,
         child1: {
           recipe_tabs: child1.recipe_tabs,
           recipe_tabs_c: child1.recipe_tabs_c
@@ -1619,6 +1620,7 @@ export default {
       }
       this.contentTabs = storageData.contentTabs;
       this.container_i = storageData.container_i;
+      this.rRecomendR = Array.isArray(storageData.rRecomendR) ? storageData.rRecomendR : [];
       // child1.getSelectType("剂型", 0);
       // child1.getSelectType("处方用法");
       // child1.getSelectType("中药服药时间");
@@ -2533,6 +2535,7 @@ export default {
       data1.recipe_tabs[data1.recipe_tabs_c].bottom_form.disable =
         data.type == "1";
       data1.recipe_tabs[data1.recipe_tabs_c].bottom_form.preType = data.type;
+      data1.recipe_tabs[data1.recipe_tabs_c].bottom_form.doseNum = data.num || '';
       data1.recipe_tabs[data1.recipe_tabs_c].bottom_form.doseType =
         data.curetype;
       data1.recipe_tabs[data1.recipe_tabs_c].bottom_form.nongjian =