请和患者确认以下信息 模态框

1. 修复数据取值不正确（bottom_form.radio）
2. 修复模态框保存、取消操作正确赋值

.gitignore

@@ -22,3 +22,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+
+cloudclinich5-**.zip

src/components/Propup.vue

@@ -17,14 +17,14 @@
         <slot name="body"></slot>
         <div class="btns flex-center" v-if="showBtns">
           <div class="confim flex-center" @click="confim()" v-if="confimText">{{confimText}}</div>
-          <div class="cancle flex-center" @click="cancle()" :style="cancleStyle">{{cancleText}}</div>
+          <div class="cancle flex-center" @click="cancle()" v-if="!hideCancleButton" :style="cancleStyle">{{cancleText}}</div>
         </div>
       </div>
       <div v-else>
         <slot name="body"></slot>
         <div class="btns flex-center" v-if="showBtns">
           <div class="confim flex-center" @click="confim()" v-if="confimText">{{confimText}}</div>
-          <div class="cancle flex-center" @click="cancle()" :style="cancleStyle">{{cancleText}}</div>
+          <div class="cancle flex-center" @click="cancle()" v-if="!hideCancleButton" :style="cancleStyle">{{cancleText}}</div>
         </div>
       </div>
     </el-dialog>
@@ -65,6 +65,10 @@ export default {
       type: Boolean,
       default: true
     },
+    hideCancleButton: {
+      type: Boolean,
+      default: false
+    },
     distanceTop: {
       type: String,
       default: "15vh"

src/utils/minix/prescribing.js

@@ -171,19 +171,22 @@ export default {
                     });
                     let child = children[0];
 
-                    this.isDaiJian = child.recipe_tabs[child.recipe_tabs_c].bottom_form.isDaiJian
-                    this.isPs = child.recipe_tabs[child.recipe_tabs_c].bottom_form.radio
+                    const isDaiJian = child.recipe_tabs[child.recipe_tabs_c].bottom_form.isDaiJian
+                    const isPs = child.recipe_tabs[child.recipe_tabs_c].bottom_form.radio
+                    if (isPs != null) this.isPs = isPs;
+                    if (isDaiJian != null) this.isDaiJian = isDaiJian;
                 }, 200)
             } else {
                 this.showAddress = false;
             }
         },
         // 提交地址信息
-        submitAddress() {
+        submitAddress(cancel) {
+            this.showAddress = false;
+            if (cancel) return;
             const model = this.$refs.medAdress.form;
             this.psChange(model.iskD)
             this.djChange(model.isDaiJian)
-            this.showAddress = false;
         },
         // 获取合理安全用药提醒配置
         async getRationalSafeUse() {

src/views/diagnosis/Prescribing.vue

@@ -1107,8 +1107,8 @@
     <!-- 选择代煎 地址栏 -->
     <Popup
       :showDialog="showAddress"
-      @cancle="submitAddress"
-      @confim="submitAddress"
+      @cancle="submitAddress(true)"
+      @confim="submitAddress()"
       title="请和患者确认以下信息"
       width="700px"
       distanceTop="5vh"
@@ -1116,8 +1116,6 @@
       <div slot="body">
         <medAdressNew
           ref="medAdress"
-          @psChange="psChange"
-          @djChange="djChange"
           :isDaijian="Number(isDaiJian)"
           :isPs="Number(isPs)"
           :isShowDj="isShowDj"