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

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -108,11 +108,11 @@
             </el-table-column>
 
 
-            <el-table-column align="center" width="40" prop="name" label="操作">
+            <el-table-column align="center" width="100" prop="name" label="操作">
                 <template slot-scope="scope">
                     <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
                     <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
-                    <el-button size="mini" type="danger" @click="deleteDrug(scope.row.id,scope.$index)">删除</el-button>
+                    <el-button size="mini" type="danger" @click="deleteDrug(scope.row,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -196,10 +196,10 @@
 
                 </template>
             </el-table-column>
-            <el-table-column align="center" width="40" prop="name" label="操作">
+            <el-table-column align="center" width="100" prop="name" label="操作">
                 <template slot-scope="scope">
                     <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
-                    <el-button size="mini" type="danger" @click="deleteProject(scope.row.id,scope.$index)">删除
+                    <el-button size="mini" type="danger" @click="deleteProject(scope.row,scope.$index)">删除
                     </el-button>
                     <!--<i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>-->
                     <!--<button class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)">删除</>-->
@@ -413,7 +413,7 @@
           }
         })
 
-      }, deleteDrug: function(index, row) {
+      }, deleteDrug: function(row, index) {
 
         this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
@@ -427,6 +427,9 @@
               let params = {
                 'id': row.advice_id
               }
+              console.log(row)
+
+              console.log(params)
               delHisPrescriptionAdviceTemplate(params).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -117,7 +117,7 @@
                                    v-loading="saveLoading">保存
                         </el-button>
                         <el-button size="small" ref="button_three" @click="open_two()" type="primary">处方调用</el-button>
-                        <el-button size="small" @click="open_three()" type="primary">存模板</el-button>
+                        <!--<el-button size="small" @click="open_three()" type="primary">存模板</el-button>-->
 
                         <!-- <el-popover
                                 placement="bottom"
@@ -1528,7 +1528,6 @@
 
                   //药品
                   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,
@@ -1544,7 +1543,7 @@
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
                       drug: prescription.advices[b].drug,
-                      groupno: index,
+                      groupno: prescription.advices[b].groupno,
                       hosp_appr_flag: '1'
 
                     }
@@ -1927,7 +1926,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,
@@ -1943,7 +1942,8 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index,
+                            groupno: prescription.advices[b].groupno,
+
                             hosp_appr_flag: '1'
 
                           }
@@ -2417,7 +2417,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,
@@ -2433,7 +2433,8 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index,
+                            groupno: prescription.advices[b].groupno,
+
                             hosp_appr_flag: '1'
 
                           }
@@ -2910,7 +2911,8 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: index,
+                          groupno: prescription.advices[b].groupno,
+
                           hosp_appr_flag: '1'
 
                         }
@@ -3454,7 +3456,8 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index,
+                            groupno: prescription.advices[b].groupno,
+
                             hosp_appr_flag: '1'
 
                           }
@@ -4021,7 +4024,8 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index,
+                            groupno: prescription.advices[b].groupno,
+
                             hosp_appr_flag: '1'
 
                           }