Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -754,7 +754,7 @@ export default {
               that.zuobiao_project = response.data.data.project
               for (let i = 0; i < that.zuobiao_project.length; i++) {
                 for (let b = 0; b < that.tabProject.length; b++) {
-                  if (that.zuobiao_project[i].bbx01 == that.tabProject[b].bbx01 && that.zuobiao_project[i].bby06 == that.tabProject[b].single_dose) {
+                  if (that.zuobiao_project[i].bbx01 == that.tabProject[b].bbx01 && that.zuobiao_project[i].bby01 == that.tabProject[b].bby01) {
                     console.log(that.zuobiao_project[i].lsqty)
                     console.log(that.tabProject[b].zuobiao_stock_num)
                     that.tabProject[b].zuobiao_stock_num = that.zuobiao_project[i].lsqty
@@ -2627,7 +2627,7 @@ export default {
                     // if(this.prescriptions[i].project[b].id == 0) {
                     // this.judgmentsGoodStock(this.prescriptions[i].project[b].good_info.bby01, this.prescriptions[i].project[b].good_info.bbx01,this.prescriptions[i].project[b].good_info.good_name,this.prescriptions[i].project[b].good_info.specification_name,this.prescriptions[i].project[b].total,isLoading)
                     for (let c = 0; c < this.zuobiao_project.length; c++) {
-                      if (this.zuobiao_project[c].bbx01 == this.prescriptions[i].project[b].good_info.bbx01 && this.zuobiao_project[c].bby06 == this.prescriptions[i].project[b].good_info.specification_name) {
+                      if (this.zuobiao_project[c].bbx01 == this.prescriptions[i].project[b].good_info.bbx01 && this.zuobiao_project[c].bby01 == this.prescriptions[i].project[b].good_info.bby01) {
                         if (this.zuobiao_project[c].lsqty < parseInt(this.prescriptions[i].project[b].total)) {
                           isLoading = false
                           this.$message.error(this.prescriptions[i].project[b].good_info.good_name + '库存不足，无法保存')
@@ -3651,17 +3651,18 @@ export default {
         }
       }
       if ((limit_remark.length > 0 && this.org_id == 10217)) {
+        var that = this
         this.$confirm(limit_remark, '限制用药提醒', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
-          for (let i = 0; i < this.prescriptions.length; i++) {
-            if (this.prescriptions[i].name == this.editableTabsValue) {
-              var temp = this.deepClone(this.curDrugs)
-              var temp2 = this.deepClone(this.teamList)
+          for (let i = 0; i < that.prescriptions.length; i++) {
+            if (that.prescriptions[i].name == that.editableTabsValue) {
+              var temp = that.deepClone(that.curDrugs)
+              var temp2 = that.deepClone(that.teamList)
 
-              var temp3 = this.deepClone(templateDrugs)
+              var temp3 = that.deepClone(templateDrugs)
               if (temp3.length > 0) {
                 for (let b = 0; b < temp3.length; b++) {
                   let obj = {
@@ -3684,21 +3685,21 @@ export default {
                     obj.prescribing_number = 1
                   }
 
-                  this.prescriptions[i].advices.push(obj)
+                  that.prescriptions[i].advices.push(obj)
                 }
-                this.curStatus = 1
+                that.curStatus = 1
               }
 
               let index = 0
 
-              if (this.curPrescriptions.advices.length > 0) {
-                index = this.curPrescriptions.advices.length
+              if (that.curPrescriptions.advices.length > 0) {
+                index = that.curPrescriptions.advices.length
               }
               let maxIndexAdvice =null
-              if (this.curPrescriptions.advices.length > 0) {
-                for (let i = 0; i < this.curPrescriptions.advices.length; i++) {
+              if (that.curPrescriptions.advices.length > 0) {
+                for (let i = 0; i < that.curPrescriptions.advices.length; i++) {
                   // 获取当前对象
-                  let currentAdvice = this.curPrescriptions.advices[i]
+                  let currentAdvice = that.curPrescriptions.advices[i]
                   // 如果 maxIndexAdvice 为空或当前对象的序号大于最大序号对象的序号，则更新最大序号对象
                   if (maxIndexAdvice == null) {
                     maxIndexAdvice = currentAdvice
@@ -3718,7 +3719,7 @@ export default {
                     temp[b].retail_price = temp[b].min_price
                   }
                   let temp_index = 0
-                  if (this.org_id == 0 || this.org_id == 10206) {
+                  if (that.org_id == 0 || that.org_id == 10206) {
 
                     temp_index = maxIndexAdvice.groupno
                   } else {
@@ -3748,20 +3749,20 @@ export default {
                     obj.prescribing_number = 1
                   }
                   // 针对灵山圣康
-                  if (this.org_id == 0 || this.org_id == 10375) {
-                    if (this.prescriptions[i] != null) {
-                      console.log('禅古this.prescriptions[i].advices.length', this.prescriptions[i].advices.length)
-                      if (this.prescriptions[i].advices.length >= 5) {
+                  if (that.org_id == 0 || that.org_id == 10375) {
+                    if (that.prescriptions[i] != null) {
+                      console.log('禅古this.prescriptions[i].advices.length', that.prescriptions[i].advices.length)
+                      if (that.prescriptions[i].advices.length >= 5) {
 
-                        this.$message.error('添加条数已经大于5条,添加失败!')
+                        that.$message.error('添加条数已经大于5条,添加失败!')
                         return false
                       }
 
                     }
                   }
-                  this.prescriptions[i].advices.push(obj)
+                  that.prescriptions[i].advices.push(obj)
                 }
-                this.curStatus = 1
+                that.curStatus = 1
 
               }
 
@@ -3815,22 +3816,22 @@ export default {
 
                   //   }
                   // }
-                  this.prescriptions[i].project.push(obj)
+                  that.prescriptions[i].project.push(obj)
                 }
-                this.curStatus = 2
+                that.curStatus = 2
               }
 
-              this.curPrescriptions = this.prescriptions[i]
+              that.curPrescriptions = that.prescriptions[i]
 
-              this.$refs.multipleTable.clearSelection()
-              this.$refs.tables.clearSelection()
-              this.clearSelection()
+              that.$refs.multipleTable.clearSelection()
+              that.$refs.tables.clearSelection()
+              that.clearSelection()
 
             }
           }
-          this.curDrugs = []
-          this.preDrugs = []
-          this.teamList = []
+          that.curDrugs = []
+          that.preDrugs = []
+          that.teamList = []
         }).catch(() => {
 
         })
@@ -3932,7 +3933,7 @@ export default {
                 }
                 // 针对灵山圣康
                 if (this.org_id == 0 || this.org_id == 10375) {
-             
+
                   if (this.prescriptions[i] != null) {
                     console.log('禅古this.prescriptions[i].advices.length', this.prescriptions[i].advices.length)
                     if (this.prescriptions[i].advices.length >= 5) {
@@ -3991,9 +3992,9 @@ export default {
                 }
                 // 针对灵山圣康
                 // if (this.org_id == 0 || this.org_id == 10375) {
-                  
+
                 //   if (this.prescriptions[i] != null) {
-                    
+
                 //     if (this.prescriptions[i].project.length >= 5) {
                 //       this.$message.error('添加条数已经大于5条,添加失败!')
                 //       return false
@@ -4172,7 +4173,7 @@ export default {
             console.log('-=======')
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
-                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].single_dose) {
+                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby01 == this.tabProject[b].bby01) {
                   console.log(this.zuobiao_project[i].lsqty)
                   console.log(this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -614,7 +614,7 @@
           }
 
           console.log("数据wwwwwwwwwwwww",this.prescriptions[i].project)
-          
+
           for (let b = 0; b < this.prescriptions[i].project.length; b++) {
             this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
             this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
@@ -631,7 +631,7 @@
           'prescriptions': this.prescriptions
         }
         console.log("paramoowowowowoowowowowowowowow",data)
-       
+
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$message.success('保存成功')
@@ -1789,7 +1789,7 @@
           }
         }
         this.teamList = selection
-      }, 
+      },
       getPrescriptionTemplateInfo() {
         let params = {
           id: this.$route.query.id
@@ -2081,6 +2081,8 @@
                 first_letter:project[i].first_letter,
                 number: "",
                 bbx01:project[i].bbx01,
+                bby01:project[i].bby01,
+
 
               }
 
@@ -2107,6 +2109,8 @@
                 first_letter:good_info[i].first_letter,
                 number: good_info[i].good_number,
                 bbx01:good_info[i].bbx01,
+                bby01:good_info[i].bby01,
+
 
               }
               this.tabProject.push(obj)
@@ -2121,7 +2125,7 @@
               console.log("-=======")
               for (let i = 0; i < this.zuobiao_project.length; i++) {
                 for (let b = 0; b < this.tabProject.length; b++) {
-                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].single_dose){
+                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby01 == this.tabProject[b].bby01){
                     this.tabProject[b]["zuobiao_stock_num"] = this.zuobiao_project[i].lsqty
                     this.tabProject[b].price = this.zuobiao_project[i].price