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

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -247,6 +247,7 @@
             let tempProject = [];
             let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
+              let index = b + 1
               let obj = {
                 advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
@@ -262,6 +263,7 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
+                groupno: index,
               };
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2155,6 +2155,8 @@
                 this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
                 this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
+                this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
+
 
               }
 
@@ -2534,10 +2536,6 @@
       },
 
       comfirm() {
-        console.log(this.curPrescriptions.advices)
-        console.log(this.curPrescriptions.project)
-        console.log(this.curPrescriptions.advices.length)
-        console.log(this.curPrescriptions.project.length)
 
         if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
           if(this.$store.getters.xt_user.org_id == 10138) {
@@ -2667,8 +2665,15 @@
               this.curStatus = 1
             }
 
+            let index = 0
+
+            if(this.curPrescriptions.advices.length > 0){
+              index = this.curPrescriptions.advices.length
+            }
+
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
+                let temp_index = b + 1
                 let obj = {
                   advice_id: 0,
                   id: temp[b].id,
@@ -2683,7 +2688,8 @@
                   single_dose_unit: temp[b].dose_unit,
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
-                  drug: temp[b]
+                  drug: temp[b],
+                  groupno:index+temp_index,
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -304,6 +304,7 @@
             let tempProject = [];
             let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
+              let index = b + 1
               let obj = {
                 advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
@@ -319,6 +320,7 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
+                groupno:index,
               };
 
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -2,11 +2,21 @@
   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="day" width="70" label="序号">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+          </div>
+        </template>
+      </el-table-column>
+
+
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
 
+
+
       <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1359,6 +1359,7 @@
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
+                    groupno: prescription.advices[b].groupno
 
 
                   };
@@ -1382,7 +1383,9 @@
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
-                    type: prescription.project[b].type
+                    type: prescription.project[b].type,
+                    groupno: prescription.advices[b].groupno
+
                   };
 
                   if(prescription.project[b].type == 2){
@@ -1449,8 +1452,11 @@
                   let tempProject = [];
                   let tempAddition = [];
 
+
+
                   //药品
                   for (let b = 0; b < prescription.advices.length; b++) {
+                    let index = b + 1
                     let obj = {
                       advice_id:0,
                       drug_name: prescription.advices[b].advice_name,
@@ -1465,7 +1471,9 @@
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
-                      drug:prescription.advices[b].drug
+                      drug:prescription.advices[b].drug,
+                      groupno:index,
+
                     };
 
                     console.log("看看数据6：")
@@ -1511,7 +1519,9 @@
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit,
-                      type: prescription.project[b].type
+                      type: prescription.project[b].type,
+
+
                     };
 
                     if (prescription.project[b].type == 2) {
@@ -1720,7 +1730,9 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: prescription.advices[b].groupno
+
 
                         };
                         tempAdvice.push(obj)
@@ -1812,6 +1824,7 @@
 
                         //药品
                         for (let b = 0; b < prescription.advices.length; b++) {
+                          let index = b + 1
                           let obj = {
                             advice_id:0,
                             drug_name: prescription.advices[b].advice_name,
@@ -1826,7 +1839,9 @@
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
-                            drug:prescription.advices[b].drug
+                            drug:prescription.advices[b].drug,
+                            groupno:index,
+
                           };
                           console.log("看看数据1：")
                           console.log(obj.prescribing_number_unit)
@@ -1874,7 +1889,8 @@
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
-                            type: prescription.project[b].type
+                            type: prescription.project[b].type,
+
                           };
 
                           if (prescription.project[b].type == 2) {
@@ -2181,7 +2197,9 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: prescription.advices[b].groupno
+
 
                         };
                         tempAdvice.push(obj)
@@ -2266,6 +2284,7 @@
 
                         //药品
                         for (let b = 0; b < prescription.advices.length; b++) {
+                          let index = b + 1
                           let obj = {
                             advice_id:0,
                             drug_name: prescription.advices[b].advice_name,
@@ -2280,7 +2299,9 @@
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
-                            drug:prescription.advices[b].drug
+                            drug:prescription.advices[b].drug,
+                            groupno: index
+
                           };
                           console.log("看看数据2：")
                           console.log(obj.prescribing_number_unit)
@@ -2619,7 +2640,10 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: prescription.advices[b].groupno
+
+
 
                         };
                         tempAdvice.push(obj)
@@ -2704,6 +2728,7 @@
 
                         //药品
                         for (let b = 0; b < prescription.advices.length; b++) {
+                          let index = b + 1
                           let obj = {
                             advice_id:0,
                             drug_name: prescription.advices[b].advice_name,
@@ -2718,7 +2743,8 @@
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
-                            drug:prescription.advices[b].drug
+                            drug:prescription.advices[b].drug,
+                            groupno: index
                           };
                           console.log("看看数据3：")
                           console.log(obj.prescribing_number_unit)
@@ -3115,7 +3141,8 @@
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
-                        drug:prescription.advices[b].drug
+                        drug:prescription.advices[b].drug,
+                        groupno: prescription.advices[b].groupno
 
                       };
                       tempAdvice.push(obj)
@@ -3207,6 +3234,7 @@
 
                       //药品
                       for (let b = 0; b < prescription.advices.length; b++) {
+                        let index = b + 1
                         let obj = {
                           advice_id:0,
                           drug_name: prescription.advices[b].advice_name,
@@ -3221,7 +3249,8 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: index
                         };
                         console.log("看看数据4：")
                         console.log(obj.prescribing_number_unit)
@@ -3571,7 +3600,8 @@
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
-                      drug:prescription.advices[b].drug
+                      drug:prescription.advices[b].drug,
+                      groupno: prescription.advices[b].groupno
 
                     };
                     tempAdvice.push(obj)
@@ -3664,6 +3694,7 @@
 
                     //药品
                     for (let b = 0; b < prescription.advices.length; b++) {
+                      let index = b + 1
                       let obj = {
                         advice_id:0,
                         drug_name: prescription.advices[b].advice_name,
@@ -3678,7 +3709,8 @@
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
-                        drug:prescription.advices[b].drug
+                        drug:prescription.advices[b].drug,
+                        groupno: index,
                       };
                       console.log("看看数据5：")
                       console.log(obj.prescribing_number_unit)