协定方 转方 药品调用 changeDrug 接口

src/components/ChineseMedicine.vue

@@ -2539,6 +2539,8 @@ export default {
         this.$parent.openAddress();
         return;
       }
+      if (!type) type = this.recipe_tabs[this.recipe_tabs_c].lastType || '';
+      if (!val) val = this.recipe_tabs[this.recipe_tabs_c].radio || '';
       this.recipe_tabs[this.recipe_tabs_c].radio = val;
       let drugIds = [];
       const loading = this.$loading({
@@ -2563,8 +2565,7 @@ export default {
       });
 
       let pharmacyName = "";
-      let type1 = "";
-      type1 = this.recipe_tabs[this.recipe_tabs_c].radio.split("@")[1];
+      val = val.split("@")[1];
       type = type.split("@")[1];
 
       this.recipe_tabs[this.recipe_tabs_c].pharmacyID = this.recipe_tabs[
@@ -2572,15 +2573,13 @@ export default {
       ].radio.split("@")[0];
 
       let params = {
-        type: type1,
+        type: val,
         pharmacyid: this.recipe_tabs[this.recipe_tabs_c].pharmacyID,
         drugIds,
         preType: this.recipe_tabs[this.recipe_tabs_c].preType,
         oldType: type
       };
-      let res = await changePharmacy(params).catch(err => {
-        loading.close();
-      });
+      let res = await changePharmacy(params).catch(err => {});
       if (res.ResultCode == 0) {
         this.recipe_tabs[this.recipe_tabs_c].totalTableD.forEach(
           (item1, index1) => {
@@ -2648,13 +2647,13 @@ export default {
         this.recipe_tabs[this.recipe_tabs_c].lastType = this.recipe_tabs[
           this.recipe_tabs_c
         ].radio; // 存储这一次的 药房类型
-        loading.close();
         // console.log(this.recipe_tabs[this.recipe_tabs_c].totalTableD);
-        this.getPharmacyMsg(this.recipe_tabs[this.recipe_tabs_c].pharmacyID);
+        await this.getPharmacyMsg(this.recipe_tabs[this.recipe_tabs_c].pharmacyID);
         setTimeout(() => {
           this.countNowRecipeMoney();
         }, 500);
       }
+      loading.close();
     },
     // 获取寄到本院地址数据
     async getAddressForHospital() {

src/views/diagnosis/Prescribing.vue

@@ -2565,6 +2565,7 @@ export default {
       this.showUnifyPresc = false;
 
       data1.getPharmacyID();
+      data1.changePharmacy();
     },
     // 存为协定方后打开处方
     openRecipeAfterAgree() {