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

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -78,6 +78,7 @@ export default {
            getAllDrugNameList().then(response=>{
              if(response.data.state == 1){
                var rullername =  response.data.data.rullerName
+               console.log("rullerName",rullername)
                this.tableData = rullername
              }
            }) 

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -474,7 +474,8 @@ export default {
          getUnitByBaseId(params).then(response=>{
             if(response.data.state == 1){
               var baseList =  response.data.data.baseList
-              this.form.unit = parseInt(baseList.min_unit)
+            
+              this.form.unit = baseList.min_unit
               this.form.drug_stock_limit = baseList.drug_stock_limit,
               this.form.price = baseList.retail_price
               
@@ -486,6 +487,7 @@ export default {
               this.$message.error("请选择药品规格")
               return
            }
+           
            var drug_spec = ""
            var drug_name = ""
            for(let i=0;i<this.ruleName.length;i++){
@@ -494,21 +496,26 @@ export default {
                 drug_name = this.ruleName[i].drug_name
               }
            }
-           var unit = ""
-           for(let i=0;i<this.untis.length;i++){
-             if(this.form.unit == this.untis[i].id){
-                unit = this.untis[i].name
-             }
-           }
+           
+          console.log("------",this.form.unit)
+          //  var unit = ""
+          //  for(let i=0;i<this.untis.length;i++){
+          //    if(this.form.unit == this.untis[i].id){
+          //       unit = this.untis[i].name
+          //    }
+          //  }
+          
            const params = {
              drug_spec:drug_spec,
              drug_name_id:this.form.drug_name_id,
              drug_id:this.form.drug_id,
-             unit:unit,
+             unit:this.form.unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name
            }
+          console.log("params",params)
+         
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var standName =  response.data.data.RullerName

src/xt_pages/user/doctorAdvice.vue

@@ -2301,7 +2301,10 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id
           };
-       
+          console.log("22222",submitForm)
+          console.log("33333",this.private_drug_config.drug_start)
+          console.log("44444",this.medicals)
+         
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             this.groupForm.adviceNames[
@@ -2314,8 +2317,16 @@ export default {
           submitForm.adviceNames = adviceNames;
 
 
-          console.log("22222",submitForm)
-          if(this.private_drug_config.drug_start == 1){
+         
+
+          let mode = "";
+          if (this.groupForm.advice_type == 1) {
+            mode = "1-2";
+          } else if (this.groupForm.advice_type == 3) {
+            mode = "1-1";
+          }
+          
+        if(this.private_drug_config.drug_start == 1){
               for(let index=0;index<submitForm.adviceNames.length;index++){
                   for(let i=0;i<this.medicals.length;i++){
                     if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
@@ -2323,15 +2334,8 @@ export default {
                     }
                   }
               }
-            }
-
-          let mode = "";
-          if (this.groupForm.advice_type == 1) {
-            mode = "1-2";
-          } else if (this.groupForm.advice_type == 3) {
-            mode = "1-1";
           }
-
+          console.log("this.===",submitForm)
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {