Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2600,9 +2600,18 @@ export default {
               //药品
               for(let i = 0; i < this.prescriptions.length; i++){
                   for(let b = 0; b < this.prescriptions[i].advices.length; b++){
-                    if(this.prescriptions[i].advices[b].advice_id == 0) {
-                      this.judgmentsDrugStock(this.prescriptions[i].advices[b].drug.bby01, this.prescriptions[i].advices[b].drug.bbx01,this.prescriptions[i].advices[b].drug_name,this.prescriptions[i].advices[b].prescribing_number,isLoading)
-                    }
+                    // if(this.prescriptions[i].advices[b].advice_id == 0) {
+                      // this.judgmentsDrugStock(this.prescriptions[i].advices[b].drug.bby01, this.prescriptions[i].advices[b].drug.bbx01,this.prescriptions[i].advices[b].drug_name,this.prescriptions[i].advices[b].prescribing_number,isLoading)
+                      for (let c = 0; c < this.zuobiao_drug.length; c++) {
+                        if (this.zuobiao_drug[c].bby01 == this.prescriptions[i].advices[b].drug.bby01) {
+                          if (this.zuobiao_drug[c].sysl < parseInt(this.prescriptions[i].advices[b].prescribing_number)){
+                            isLoading = false
+                            this.$message.error(this.prescriptions[i].advices[b].drug_name + "库存不足，无法保存")
+                            return
+                          }
+                        }
+                      }
+                    // }
                   }
               }
               //耗材
@@ -2610,9 +2619,20 @@ export default {
 
                   for(let b = 0; b < this.prescriptions[i].project.length; b++){
                     if(this.prescriptions[i].project[b].type == 3){
-                      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)
-                      }
+                      // 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].lsqty < parseInt(this.prescriptions[i].project[b].total)){
+                              isLoading = false
+                              this.$message.error(this.prescriptions[i].project[b].good_info.good_name + "库存不足，无法保存")
+                              return
+                            }
+                          }
+                        }
+
+                      //
+                      // }
                     }
                   }
               }
@@ -3043,19 +3063,19 @@ export default {
 
                   }
              }
-              // createHisPrescription(data, params).then(response => {
-              //   if (response.data.state == 1) {
-              //     this.$emit('change', this.patientInfo.id)
-              //     this.$message.success('保存成功!')
-              //     this.$emit('editKeepLoad', false)
-              //     this.$parent.getInitData()
-              //     this.getlist()
-              //   } else {
-              //     this.$message.error(response.data.msg)
-              //     this.$emit('editKeepLoad', false)
-              //
-              //   }
-              // })
+              createHisPrescription(data, params).then(response => {
+                if (response.data.state == 1) {
+                  this.$emit('change', this.patientInfo.id)
+                  this.$message.success('保存成功!')
+                  this.$emit('editKeepLoad', false)
+                  this.$parent.getInitData()
+                  this.getlist()
+                } else {
+                  this.$message.error(response.data.msg)
+                  this.$emit('editKeepLoad', false)
+
+                }
+              })
             }
         }
 
@@ -3153,8 +3173,8 @@ export default {
       for (let i = 0; i < this.zuobiao_drug.length; i++) {
           if (this.zuobiao_drug[i].bby01 == bby01) {
             if (this.zuobiao_drug[i].sysl < parseInt(count)){
-              this.$message.error(name + "库存不足，无法保存")
               isLoading = false
+              this.$message.error(name + "库存不足，无法保存")
               return
             }
           }
@@ -3164,9 +3184,8 @@ export default {
       for (let i = 0; i < this.zuobiao_project.length; i++) {
         if (this.zuobiao_project[i].bbx01 == bbx01 && this.zuobiao_project[i].bby06 == specification_name) {
           if (this.zuobiao_project[i].lsqty < parseInt(count)){
-            this.$message.error(name + "库存不足，无法保存")
             isLoading = false
-
+            this.$message.error(name + "库存不足，无法保存")
             return
           }
         }
@@ -4025,12 +4044,11 @@ export default {
                   this.$message.error(project[i].good_info.good_name + '库存不足')
                 }
 
-                //TODO
-                // if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
-                //   num++
-                //   this.$refs.tabProjectTeam.toggleRowSelection(row)
-                //   this.$message.error(project[i].good_info.good_name + '库存不足')
-                // }
+                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row)
+                  this.$message.error(project[i].good_info.good_name + '库存不足')
+                }
 
                 if (num > 0) {
                   this.$refs.tabProjectTeam.clearSelection()