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

src/api/his/his.js

     params:params,
   });
 }
+
+export function createdTemplate(params,data) {
+  return request({
+    url: "/api/hisprescriptiontemplate/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+

src/xt_pages/hospitalStation/allListPrint.vue

 
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
           for (let i = 0; i < new_project_ids.length; i++) {
-            let obj = {};
-            let count = 0;
+            let obj = {}
+            let count = 0
             for (let a = 0; a < details.length; a++) {
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
-                obj['name'] = details[a].project.project.project_name;
-                obj['spec'] = '1';
-                obj['unit'] = details[a].project.project.unit;
-                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type);
-                obj['price'] = parseFloat(details[a].pric);
-                obj['is_total'] = 2;
+                if( details[a].project.type == 2){
+                  obj['name'] = details[a].project.project.project_name
+                }else if(details[a].project.type == 3){
+                  obj['name'] = details[a].project.good_info.good_name
+                }
+                obj['unit'] = details[a].project.unit
+
+                obj['spec'] = '1'
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
 
                 count = count + details[a].cnt
               }
             }
-            obj['count'] = count;
+            obj['count'] = count
             list.push(obj)
           }
         }

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):'耗材'}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/hospitalStation/components/callPrescription.vue

 <template>
   <el-dialog
-    :title="name"
-    :visible.sync="isLastOrNextVisible"
-    @close="hide"
-    width="1010px"
-    class="callPrescription"
-    :modal-append-to-body="false"
+          :title="name"
+          :visible.sync="isLastOrNextVisible"
+          @close="hide"
+          width="1010px"
+          class="callPrescription"
+          :modal-append-to-body="false"
   >
     <el-date-picker
-      v-model="start_time"
-      prefix-icon="el-icon-date"
-      @change="changeTime"
-      :editable="false"
-      style="width: 150px;"
-      type="date"
-      placeholder="选择日期时间"
-      align="right"
-      format="yyyy-MM-dd"
-      value-format="yyyy-MM-dd"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            @change="changeTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
     ></el-date-picker>
     <span class>-</span>
     <el-date-picker
-      v-model="end_time"
-      prefix-icon="el-icon-date"
-      @change="changeEndTime"
-      :editable="false"
-      style="width: 150px;"
-      type="date"
-      placeholder="选择日期时间"
-      align="right"
-      format="yyyy-MM-dd"
-      value-format="yyyy-MM-dd"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            @change="changeEndTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
     ></el-date-picker>
 
 
             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2?scope.row.project.project_name:scope.row.good_info.good_name}}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-              <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+              <template slot-scope="scope">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
           start_time: this.start_time,
           end_time:this.end_time,
           p_type:1,
-
         };
         this.GetCallHisPrescription(params)
       },changeEndTime(){
             }
 
 
+
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
                 id: 0,
                 total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type,
+
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+              console.log(prescription.project[b].type)
+              if(prescription.project[b].type == 2){
+
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {
 </script>
 
 <style lang="scss">
-.callPrescription{
+  .callPrescription{
   .el-dialog__body{
     padding:0px 20px 30px;
   }
     margin-top: 10px;
     font-size: 14px;
   }
-}
+  }
 </style>

src/xt_pages/hospitalStation/components/deskPrescription.vue

       }
     },
     methods: {
-
       changeClass(id) {
         this.tabProject = [];
         if (id == 0) {
         }
       },
       setMonthPrescription(month_prescriptions) {
+
+
+
         this.month_prescriptions = [];
 
         let drug_month_prescriptions = {
           return cur
         }, []); // 设置cur默认类型为数组，并且初始值为空的数组
 
-        console.log(drug_ids);
-        console.log(project_ids);
-        console.log(additions_ids);
-
-        console.log(additions_ids);
-
         let drugs = [];
         let projects = [];
         let additions = [];
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
+
+              if (project_month_prescriptions.project[a].type == 2) {
+                console.log("~~~~~~~????????")
+
+                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+
+              } else if (project_month_prescriptions.project[a].type == 3) {
+                console.log("~~~~~~~????????2222222")
+
+                obj['statistical_classification'] = ''
+                obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
+              }
+
             }
           }
           obj['total'] = count;
 
         this.curMonthPrescriptions = this.month_prescriptions[0]
 
+        console.log("~~~~~~~~~")
+
+        console.log(this.curMonthPrescriptions)
+        console.log("~~~~~~~~~")
+
+
       },
 
       // setMonthPrescription(month_prescriptions) {
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit
+                      unit: prescription.project[b].unit
                     };
+                    if (prescription.project[b].type == 2) {
+                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['medical_code'] = prescription.project[b].project.medical_code
+                      obj['project_name'] = prescription.project[b].project.project_name
+
+                    } else if (prescription.project[b].type == 3) {
+                      obj['statistical_classification'] = ''
+                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] = prescription.project[b].good_info.good_name
+                    }
                     tempProject.push(obj)
                   }
 
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit
+                      unit: prescription.project[b].unit
                     };
+                    if (prescription.project[b].type == 2) {
+                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['medical_code'] = prescription.project[b].project.medical_code
+                      obj['project_name'] = prescription.project[b].project.project_name
+
+                    } else if (prescription.project[b].type == 3) {
+                      obj['statistical_classification'] = ''
+                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] = prescription.project[b].good_info.good_name
+                    }
                     tempProject.push(obj)
                   }
 
               this.curStatus = 1
             }
 
-           if(this.activeName == 2){
-
-              for(let i = 0; i<temp2.length;i++){
-               for(let j=0;j<this.hisList.length;j++){
-                   if(temp2[i].id == this.hisList[j].project_id){
-                      temp2[i].total =  this.hisList[j].number
-                   }
-               }
-              }
-            }
+           // if(this.activeName == 2){
+           //
+           //  //   for(let i = 0; i<temp2.length;i++){
+           //  //    for(let j=0;j<this.hisList.length;j++){
+           //  //        if(temp2[i].id == this.hisList[j].project_id){
+           //  //           temp2[i].total =  this.hisList[j].number
+           //  //        }
+           //  //    }
+           //  //   }
+           //  // }
 
 
             if (temp2.length > 0) {
-              console.log("temp2222222222",temp2);
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
                   id: 0,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit
-                };
+                  unit: temp2[b].unit,
+                  type: temp2[b].type
+                }
                 if (obj.total == 0) {
                   obj.total = 1
                 }
+                if (obj.type == 3) {
+                  obj.single_dose = 1
+                }
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
             }
 
             this.curPrescriptions = this.prescriptions[i];
-            console.log("~~~~~~~~~");
-            console.log("~~~~~~~~~");
 
             this.$refs.multipleTable.clearSelection();
             this.$refs.tables.clearSelection()
       getlist() {
         getHisProject().then(response => {
           if (response.data.state == 1) {
-            var project = response.data.data.project;
-            this.tabProject = project;
-            this.allProject = project
+            var project = response.data.data.project
+            for (let i = 0; i < project.length; i++) {
+              let obj = {
+                id: project[i].id,
+                project_name: project[i].project_name,
+                statistical_classification: project[i].statistical_classification,
+                single_dose: project[i].single_dose,
+                delivery_way: project[i].delivery_way,
+                execution_frequency: project[i].execution_frequency,
+                number_days: project[i].number_days,
+                price: project[i].price,
+                medical_code: project[i].medical_code,
+                unit: project[i].unit,
+                type: 2
+              }
+
+              this.tabProject.push(obj)
+            }
+
+            var good_info = response.data.data.good_info
+
+            for (let i = 0; i < good_info.length; i++) {
+              let obj = {
+                id: good_info[i].id,
+                project_name: good_info[i].good_name,
+                statistical_classification: 0,
+                single_dose: 1,
+                delivery_way: '',
+                execution_frequency: '',
+                number_days: 1,
+                price: good_info[i].retail_price,
+                medical_code: good_info[i].medical_insurance_number,
+                unit: this.getGoodUnit(good_info[i].good_unit),
+                type: 3
+              }
+              this.tabProject.push(obj)
+            }
+
+            this.allProject = this.tabProject
 
           }
         })
+
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
             this.tabPrjectTeam = team
           }
         })
+      }, getGoodUnit(id) {
+        var goodUnit = this.$store.getters.good_unit
+        for (let i = 0; i < goodUnit.length; i++) {
+          if (goodUnit[i].id == id) {
+            return goodUnit[i].name
+          }
+        }
       },
       selectTeam(row) {
         console.log("row",row);
         var arr = [];
         for (let i = 0; i < row.length; i++) {
-          arr.push(row[i].project_id)
+          arr.push(row[i].item_id)
         }
         var ids = arr.join(',');
         var strArr = ids.split(',');
         };
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
-            var project = response.data.data.project;
-            this.teamList = [];
-            this.teamList = project
+            this.teamList = []
+            var project = response.data.data.project
+            for (let i = 0; i < project.length; i++) {
+              if (project[i].type == 2) {
+
+                let obj = {
+                  id: project[i].project_id,
+                  project_name: project[i].project.project_name,
+                  statistical_classification: project[i].project.statistical_classification,
+                  single_dose: project[i].project.single_dose,
+                  delivery_way: project[i].project.delivery_way,
+                  execution_frequency: project[i].project.execution_frequency,
+                  number_days: project[i].project.number_days,
+                  total: project[i].number,
+                  price: project[i].project.price,
+                  remark: '',
+                  medical_code: project[i].project.medical_code,
+                  unit: project[i].project.unit,
+                  type: project[i].type
+                }
+                if (obj.total == 0) {
+                  obj.total = 1
+                }
+
+                this.teamList.push(obj)
+              } else if (project[i].type == 3) {
+                let obj = {
+                  id: project[i].project_id,
+                  project_name: project[i].good_info.good_name,
+                  statistical_classification: "",
+                  single_dose: "",
+                  delivery_way: "",
+                  execution_frequency:"",
+                  number_days:"",
+                  total: project[i].number,
+                  price: project[i].good_info.retail_price,
+                  remark: '',
+                  medical_code: project[i].good_info.medical_insurance_number,
+                  unit: project[i].good_info.unit,
+                  type: project[i].type
+                }
+                if (obj.total == 0) {
+                  obj.total = 1
+                }
+                this.teamList.push(obj)
+
+                console.log( this.teamList)
+
+              }
+            }
+
+
           }
         })
+
       }, changeDoctor(val) {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.doctorValue) {

src/xt_pages/hospitalStation/components/inquiriesDetail.vue

                   medical_code: prescription.project[b].project.medical_code,
                   unit:prescription.project[b].project.unit,
                 };
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+                  obj['type'] =  2
+
+
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                  obj['type'] =  3
+
+                }
                 tempProject.push(obj)
               }
+
+              console.log(tempProject)
               let index = i + 1;
               let obj = {
                 id: prescription.id,
                 type: response.data.data.prescription[i].type
               };
               this.prescriptions.push(obj);
-              console.log(this.prescriptions);
 
               this.curPrescriptions = this.prescriptions[0]
+
+
+
             }
           }
         });

src/xt_pages/hospitalStation/components/newPrescriptionTable.vue

       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
-          <div>{{getGroup(scope.row.statistical_classification)}}</div>
+          <div>{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">

src/xt_pages/hospitalStation/components/nextOrLastPrescription.vue

 <template>
   <el-dialog
-    :title="name"
-    :visible.sync="isLastOrNextVisible"
-    @close="hide"
-    width="1010px"
-    :modal-append-to-body="false"
-    class="isLastOrNext"
+          :title="name"
+          :visible.sync="isLastOrNextVisible"
+          @close="hide"
+          width="1010px"
+          :modal-append-to-body="false"
+          class="isLastOrNext"
   >
     <div class="txsj" style="text-align:center;">
       <el-button
-        round
+              round
 
-        @click="openLast(3)"
+              @click="openLast(3)"
       >上一方
       </el-button>
 
       <el-button
-        round
-        @click="openNext(4)"
+              round
+              @click="openNext(4)"
       >下一方
       </el-button>
     </div>
 
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
-                  <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
+                <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2 ?scope.row.project.project_name:scope.row.good_info.good_name}}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-              <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+              <template slot-scope="scope">{{ scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                  <div>{{ scope.row.total }}{{scope.row.unit}}</div>
+                <div>{{ scope.row.total }}{{scope.row.unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="name" width="60" label="单价">
         name:"",
         request_record_date:'',
         patient_id:0,
-         allPrescription: [
+        allPrescription: [
           {
             check_group: [],
             prescriptions: [
       }
     }, methods: {
       openLast(val) {
-       if (val == 3) {
+        if (val == 3) {
           let params = {
             patient_id: this.patient_id,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            p_type:1,
           };
 
           this.GetNextOrLastHisPrescription(params)
           let params = {
             patient_id: this.patient_id,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            p_type:1,
+
           };
           this.GetNextOrLastHisPrescription(params)
         }
               let obj = {
                 id: 0,
                 project_id: prescription.project[b].project_id,
-                project_name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].project.statistical_classification,
+                // project_name: prescription.project[b].project.project_name,
+                // statistical_classification: prescription.project[b].project.statistical_classification,
                 single_dose: prescription.project[b].single_dose,
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
                 total:prescription.project[b].count.toString(),
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type,
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+
+              if(prescription.project[b].type == 2){
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {
 </script>
 
 <style lang="scss">
-.isLastOrNext{
+  .isLastOrNext{
   .el-dialog__body{
     padding:0px 20px 30px;
   }
     margin-top: 10px;
     font-size: 14px;
   }
-}
+  }
 </style>

src/xt_pages/hospitalStation/components/prescriptionTable.vue

         </template>
       </el-table-column>
     </el-table>
-
     <el-table v-if="activeType == 2" :data="prescription.project" 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" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
           <el-autocomplete
-            style="width:100%;"
-            class="inline-input"
-            v-model="scope.row.delivery_way"
-            :fetch-suggestions="querySearch2"
-            placeholder="请输入内容"
+                  style="width:100%;"
+                  class="inline-input"
+                  v-model="scope.row.delivery_way"
+                  :fetch-suggestions="querySearch2"
+                  placeholder="请输入内容"
           ></el-autocomplete>
         </template>
       </el-table-column>
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
+      <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-           <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
+          <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">

src/xt_pages/hospitalStation/doctorDesk.vue

           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+
+              }
+              obj['type'] = project_month_prescriptions.project[a].type
+
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
             this.patientInfo = response.data.data.xt_info;
             this.hisPatientInfo = response.data.data.his_info;
             this.case_history = response.data.data.case_history;
-            console.log("病历222222",this.case_history);
             this.info = response.data.data.info;
             this.doctors = response.data.data.doctors;
             this.department = response.data.data.department;
             //处方相关
             this.prescriptionList = response.data.data.prescription;
 
+
+
+
             if (response.data.data.prescription.length > 0) {
               for (let i = 0; i < response.data.data.prescription.length; i++) {
                 var prescription = response.data.data.prescription[i];
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
+                    type: prescription.project[b].type
                   };
+
+                  if(prescription.project[b].type == 2){
+                    obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                    obj['medical_code'] =  prescription.project[b].project.medical_code
+                    obj['project_name'] =  prescription.project[b].project.project_name
+
+                  }else if(prescription.project[b].type == 3){
+                    obj['statistical_classification'] = ""
+                    obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                    obj['project_name'] =  prescription.project[b].good_info.good_name
+                  }
                   tempProject.push(obj)
                 }
 
                 this.prescriptions.push(obj)
               }
             } else {
+
+
+
               let obj = {
                 id: 0,
                 name: '处方' + 1,
                 advices: [],
                 project: [],
                 addition: [],
-                orderStatus: 0,
+                order_status: 0,
                 pre_time: nowTime,
 
               };
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type: prescription.project[b].type,
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type:prescription.project[b].type,
+
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
+
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type:prescription.project[b].type,
+
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].unit
+                        unit: prescription.project[b].unit,
+                        type:prescription.project[b].type,
+
                       };
+                      if(prescription.project[b].type == 2){
+                        obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                        obj['medical_code'] =  prescription.project[b].project.medical_code
+                        obj['project_name'] =  prescription.project[b].project.project_name
+
+                      }else if(prescription.project[b].type == 3){
+                        obj['statistical_classification'] = ""
+                        obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] =  prescription.project[b].good_info.good_name
+                      }
+
                       tempProject.push(obj)
                     }
                     for (let b = 0; b < prescription.addition.length; b++) {
                     advices: [],
                     project: [],
                     addition: [],
-                    orderStatus: 0,
+                    order_status: 0,
                     pre_time: nowTime
 
                   };
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
+                      type:prescription.project[b].type,
+
                       unit: prescription.project[b].unit
                     };
+                    if(prescription.project[b].type == 2){
+                      obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                      obj['medical_code'] =  prescription.project[b].project.medical_code
+                      obj['project_name'] =  prescription.project[b].project.project_name
+
+                    }else if(prescription.project[b].type == 3){
+                      obj['statistical_classification'] = ""
+                      obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] =  prescription.project[b].good_info.good_name
+                    }
+
                     tempProject.push(obj)
                   }
                   for (let b = 0; b < prescription.addition.length; b++) {
                   advices: [],
                   project: [],
                   addition: [],
-                  orderStatus: 0,
+                  order_status: 0,
                   pre_time: nowTime,
                 };
                 this.prescriptions.push(obj)

src/xt_pages/hospitalStation/listPrint.vue

       getInfo(order_id) {
         let params = {
           id: order_id
-        };
+        }
         getHisOrderDetail(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
-            this.order = response.data.data.order;
-            this.patient = response.data.data.patient;
-            console.log(this.patient);
-            this.admin = response.data.data.admin_info;
+            this.order = response.data.data.order
+            this.patient = response.data.data.patient
+            console.log(this.patient)
+            this.admin = response.data.data.admin_info
 
 
             for (let i = 0; i < response.data.data.order_info.length; i++) {
-              var infos = response.data.data.order_info[i];
+              var infos = response.data.data.order_info[i]
               let obj = {
                 med_chrgitm_type: this.getType(infos.med_chrgitm_type),
                 price: infos.pric,
                 count: infos.cnt
-              };
+              }
+              console.log(infos)
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
-                obj['p_time'] = this.getTimes(infos.project.prescription.ctime);
-                obj['name'] = infos.project.project.project_name;
-                obj['spec'] = 1;
-                obj['unit'] = infos.project.project.unit
+                obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
+                if(infos.project.type == 2){
+                  obj['name'] = infos.project.project.project_name
+
+
+                }else if (infos.project.type == 3){
+
+                  obj['name'] = infos.project.good_info.good_name
+
+                }
+                obj['spec'] = 1
+                obj['unit'] = infos.project.unit
 
               }
 
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
-                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime);
-                obj['name'] = infos.advice.advice_name;
-                obj['spec'] = infos.advice.drug.drug_spec;
+                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
+                obj['name'] = infos.advice.advice_name
+                obj['spec'] = infos.advice.drug.drug_spec
                 obj['unit'] = infos.advice.drug.max_unit
 
               }
-              this.list.push(obj);
+              this.list.push(obj)
               this.list.sort(function(a, b) {
                 return b.p_time < a.p_time ? 1 : -1
               })
           }
         })
       },
+
       getType(med_chrgitm_type) {
         switch (med_chrgitm_type) {
           case '01':

src/xt_pages/hospitalStation/newStatementPrint.vue

         //       console.log("doctorporject",doctorPorject)
         //     }
         // })
+      },  getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
       },
       searchAction(){
 
                 that.info['treat_cost_total'] = response.data.data.treatCostTotal;
                 that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
                 that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
-                console.log(this.info)
+
+                if(that.paramsObj.settle_type != 1){
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
+                }
               }
             })
             .catch(function (error) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

               }
 
               for (let b = 0; b < prescription.project.length; b++) {
-                console.log(prescription.project[b].project.project_name);
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].unit,
+                  type:prescription.project[b].type,
+
                 };
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
 
                 tempProject.push(obj)
               }
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+                obj['type'] = 2
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+                obj['type'] = 3
+
+              }
+
+
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
               }
 
               for (let b = 0; b < prescription.project.length; b++) {
-                console.log(prescription.project[b].project.project_name);
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].project.unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].project.unit,
+                  type:prescription.project[b].type,
+
                 };
+
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
+
+
                 tempProject.push(obj)
               }
 

src/xt_pages/hospitalStation/summary.vue

             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
-            admin_user_id: this.$store.getters.xt_user.user.id
+            admin_user_id: this.$store.getters.xt_user.user.id,
+
+
           };
           this.orderObj9504 = obj
         } else {
           this.statementVisible = true;
           let obj = {
-            order_id: row.id
+            order_id: row.id,
+            settle_type:row.settle_type,
+            start_time:row.settle_start_time,
+            end_time:row.settle_end_time,
           };
           this.orderObj = obj
         }

src/xt_pages/hospitalStation/summaryDetail.vue

         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-      <el-popover
-        placement="bottom"
-        width="210"
-        trigger="click">
-        <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-        <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-        <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
-
-      </el-popover>
+        <el-popover
+                placement="bottom"
+                width="210"
+                trigger="click">
+            <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+            <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+            <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
+
+        </el-popover>
         <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                      <el-table  :data="tableData" border style="width: 100%;"
-                                :row-style="{ color: '#303133' }"
-                                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-
-                        <el-table-column align="center" prop="project_name" label="名称">
-                          <template slot-scope="scope">{{ scope.row.name }}</template>
-                        </el-table-column>
-
-                        <el-table-column align="center" prop="project_name" label="分类" width="100">
-                          <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</template>
-                        </el-table-column>
-
-
-                        <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-                          <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
-
-                        </el-table-column>
-                        <el-table-column align="center" prop="delivery_way" width="90" label="用法">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-                            {{scope.row.delivery_way}}
-
-                          </template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
-                          <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="number_days" width="60" label="天数">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-                            {{scope.row.day}}天
-
-                          </template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="total" width="60" label="总量">
-                          <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" width="60" label="单价">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                            {{scope.row.price}}元
-
-                          </template>
-                        </el-table-column>
-
-                          <el-table-column align="center" prop="name" width="60" label="总价">
-                              <template slot-scope="scope">
-                                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                                  {{scope.row.price}}元
-
-                              </template>
-                          </el-table-column>
-
-
-                        <el-table-column align="center" prop="name" width="80" label="备注">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
-                            {{scope.row.remark}}
-
-                          </template>
-                        </el-table-column>
-                      </el-table>
-
-                      <div class="additionalBox">
-                        <div class="additionalOne" v-for="(item,index) in additions" :key="index">
-                          <span :title="item.item_name">{{item.item_name}}</span>
-                          <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
-                          共
-                          <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
-                          次
-                          <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+                        <el-table  :data="tableData" border style="width: 100%;"
+                                   :row-style="{ color: '#303133' }"
+                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+
+                            <el-table-column align="center" prop="project_name" label="名称">
+                                <template slot-scope="scope">{{ scope.row.name }}</template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="project_name" label="分类" width="100">
+                                <template slot-scope="scope">{{ scope.row.type == 1?'药品': scope.row.project_type == 2? '项目':'耗材'}}</template>
+                            </el-table-column>
+
+
+                            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                                <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
+
+                            </el-table-column>
+                            <el-table-column align="center" prop="delivery_way" width="90" label="用法">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+                                    {{scope.row.delivery_way}}
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
+                                <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="number_days" width="60" label="天数">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+                                    {{scope.row.day}}天
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="total" width="60" label="总量">
+                                <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="name" width="60" label="单价">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                    {{scope.row.price}}元
+
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="name" width="60" label="总价">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                    {{scope.row.price}}元
+
+                                </template>
+                            </el-table-column>
+
+
+                            <el-table-column align="center" prop="name" width="80" label="备注">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+                                    {{scope.row.remark}}
+
+                                </template>
+                            </el-table-column>
+                        </el-table>
+
+                        <div class="additionalBox">
+                            <div class="additionalOne" v-for="(item,index) in additions" :key="index">
+                                <span :title="item.item_name">{{item.item_name}}</span>
+                                <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+                                共
+                                <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+                                次
+                                <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+                            </div>
                         </div>
-                      </div>
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
-                      <span v-if="order.order_status == 1">待结算</span>
-                      <span v-if="order.order_status == 2">已结算</span>
-                      <span v-if="order.order_status == 3">已退费</span>
+                        <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
+                        <span v-if="order.order_status == 1">待结算</span>
+                        <span v-if="order.order_status == 2">已结算</span>
+                        <span v-if="order.order_status == 3">已退费</span>
 
 
                     </div>
                     </ul>
                     <!--<p class="centerRightTitle">发票费用</p>-->
                     <!--<ul class="basicUl">-->
-                        <!--<li style="width:100%;">西药费：0.00元</li>-->
+                    <!--<li style="width:100%;">西药费：0.00元</li>-->
                     <!--</ul>-->
                 </div>
             </div>
         </div>
 
-      <div v-if="listVisible">
-      <el-dialog
-        class="centerDialog"
-        width="900px"
-        title="打印"
-        :visible.sync="listVisible">
-        <list-print  :paramsObj='paramsObj'></list-print>
-      </el-dialog>
-      </div>
-
-      <div v-if="allListVisible">
-      <el-dialog
-        class="centerDialog"
-        width="900px"
-        title="打印"
-        :visible.sync="allListVisible">
-        <all-list-print :paramsObj='paramsObj'></all-list-print>
-      </el-dialog>
-      </div>
+        <div v-if="listVisible">
+            <el-dialog
+                    class="centerDialog"
+                    width="900px"
+                    title="打印"
+                    :visible.sync="listVisible">
+                <list-print  :paramsObj='paramsObj'></list-print>
+            </el-dialog>
+        </div>
+
+        <div v-if="allListVisible">
+            <el-dialog
+                    class="centerDialog"
+                    width="900px"
+                    title="打印"
+                    :visible.sync="allListVisible">
+                <all-list-print :paramsObj='paramsObj'></all-list-print>
+            </el-dialog>
+        </div>
 
 
     </div>
 </template>
 
-
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisOrder } from '@/api/his/his'
 import AllListPrint from './allListPrint'
 
 export default {
-    components:{
-      AllListPrint,
-      ListPrint,
-        BreadCrumb,
-      prescriptionTable,
-
-    },
-    data(){
-        return{
-          listVisible:false,
-          allListVisible:false,
-          paramsObj:{
-            id:this.$route.query.id
-          },
-            crumbs: [
-                { path: false, name: '门诊收费' },
-                { path: false, name: '项目消费明细汇总详情' }
-            ],
-          info: {},
-          curPrescriptions: {},
-          prescriptions: [],
-          record_date: '',
-          tableData: [],
-          additions:[],
-          editableTabsValue: '1',
-          loadingone: false,
-          editableTabs: [{
-            title: '处方1',
-            name: '1'
-          }],
-          tabIndex: 1,
-          hisPatientInfo: {},
-          loadingtwo: false,
-          patientTableData: [{
-            name: '杨美英',
-            mdtrt_id: '1709946'
-          }],
-          patientInfo: { id: 0 },
-          doctor: {},
-          total: 0,
-          state: '未收费',
-          radio: 1,
-          radioStatus: 1,
-          search_input: '',
-          order:{},
-        }
-    },created(){
-      this.GetOrderDetail()
-  },methods:{
-      open(val){
-        if(val == 1){
-          this.paramsObj.id == this.$route.query.id;
-          this.listVisible = true
-
-        }else if(val == 2){
-          this.paramsObj.id == this.$route.query.id;
-          this.allListVisible = true
-        }
+  components:{
+    AllListPrint,
+    ListPrint,
+    BreadCrumb,
+    prescriptionTable,
+
+  },
+  data(){
+    return{
+      listVisible:false,
+      allListVisible:false,
+      paramsObj:{
+        id:this.$route.query.id
       },
+      crumbs: [
+        { path: false, name: '门诊收费' },
+        { path: false, name: '项目消费明细汇总详情' }
+      ],
+      info: {},
+      curPrescriptions: {},
+      prescriptions: [],
+      record_date: '',
+      tableData: [],
+      additions:[],
+      editableTabsValue: '1',
+      loadingone: false,
+      editableTabs: [{
+        title: '处方1',
+        name: '1'
+      }],
+      tabIndex: 1,
+      hisPatientInfo: {},
+      loadingtwo: false,
+      patientTableData: [{
+        name: '杨美英',
+        mdtrt_id: '1709946'
+      }],
+      patientInfo: { id: 0 },
+      doctor: {},
+      total: 0,
+      state: '未收费',
+      radio: 1,
+      radioStatus: 1,
+      search_input: '',
+      order:{},
+    }
+  },created(){
+    this.GetOrderDetail()
+  },methods:{
+    open(val){
+      if(val == 1){
+        this.paramsObj.id == this.$route.query.id
+        this.listVisible = true
+
+      }else if(val == 2){
+        this.paramsObj.id == this.$route.query.id
+        this.allListVisible = true
+      }
+    },
     // getTotal() {
     //   var total = 0
     //   for (let i = 0; i < this.prescriptions.length; i++) {
     tabclickEvent(val) {
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
-          this.curPrescriptions = {};
-          var temp = this.deepClone(this.prescriptions[i]);
+          this.curPrescriptions = {}
+          var temp = this.deepClone(this.prescriptions[i])
           this.curPrescriptions = temp
         }
       }
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }
-      const targetObj = source.constructor === Array ? [] : {};
+      const targetObj = source.constructor === Array ? [] : {}
       Object.keys(source).forEach((keys) => {
         if (source[keys] && typeof source[keys] === 'object') {
           targetObj[keys] = this.deepClone(source[keys])
         } else {
           targetObj[keys] = source[keys]
         }
-      });
+      })
       return targetObj
     },  getGroup(id){
-      var name = "";
-      var statistics_category =  getDictionaryDataConfig('system','statistics_category');
+      var name = ""
+      var statistics_category =  getDictionaryDataConfig('system','statistics_category')
       for(let i=0;i<statistics_category.length;i++){
         if(id == statistics_category[i].id){
           name = statistics_category[i].name
       return name
     },
     getTotal() {
-      var total = 0;
+      var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
           for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
       }
     },  unique(array) {
       // res用来存储结果
-      var res = [];
+      var res = []
       for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
         for (var j = 0, resLen = res.length; j < resLen; j++) {
           if (array[i].id === res[j].id && array[i].price === res[j].price) {
       return res
     },
     setMonthPrescription(month_prescriptions) {
-      console.log(month_prescriptions);
+      console.log(month_prescriptions)
       let drug_month_prescriptions = {
         advices: []
-      };
-      let drug_ids = [];
+      }
+      let drug_ids = []
       let project_month_prescriptions = {
         project: []
 
-      };
-      let project_ids = [];
+      }
+      let project_ids = []
 
       let addition_month_prescriptions = {
         addition: []
 
-      };
-      let additions_ids = [];
+      }
+      let additions_ids = []
 
       for (let i = 0; i < month_prescriptions.length; i++) {
         if (month_prescriptions[i].type == 1) { //药品
               id: month_prescriptions[i].advices[a].drug_id,
               price: month_prescriptions[i].advices[a].price
 
-            };
-            drug_ids.push(obj);
+            }
+            drug_ids.push(obj)
             drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
           }
 
               id: month_prescriptions[i].project[a].project_id,
               price: month_prescriptions[i].project[a].price
 
-            };
-            project_ids.push(obj);
+            }
+            project_ids.push(obj)
             project_month_prescriptions.project.push(month_prescriptions[i].project[a])
           }
         }
             id: month_prescriptions[i].addition[a].item_id,
             price: month_prescriptions[i].addition[a].price
 
-          };
-          additions_ids.push(obj);
+          }
+          additions_ids.push(obj)
           addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
         }
 
       }
 
-      drug_ids = this.unique(drug_ids);
-      project_ids= this.unique(project_ids);
-      additions_ids= this.unique(additions_ids);
+      drug_ids = this.unique(drug_ids)
+      project_ids= this.unique(project_ids)
+      additions_ids= this.unique(additions_ids)
 
 
 
 
 
       for (let i = 0; i < drug_ids.length; i++) {
-        let obj = {};
-        let count = 0;
+        let obj = {}
+        let count = 0
         for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
           if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
-            obj['name'] = drug_month_prescriptions.advices[a].advice_name;
-            obj['statistical_classification'] = '';
-            obj['type'] = 1;
-            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose;
-            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way;
-            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency;
-            obj['day'] = drug_month_prescriptions.advices[a].day;
-            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit;
-            obj['remark'] = drug_month_prescriptions.advices[a].remark;
-            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price);
+            obj['name'] = drug_month_prescriptions.advices[a].advice_name
+            obj['statistical_classification'] = ''
+            obj['type'] = 1
+            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+            obj['day'] = drug_month_prescriptions.advices[a].day
+            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['remark'] = drug_month_prescriptions.advices[a].remark
+            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
           }
         }
-        obj['count'] = count;
+        obj['count'] = count
         this.tableData.push(obj)
       }
 
       for (let i = 0; i < project_ids.length; i++) {
-        let obj = {};
-        let count = 0;
+        let obj = {}
+        let count = 0
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
           if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
-            obj['name'] = project_month_prescriptions.project[a].project.project_name;
-            obj['statistical_classification'] = '';
-            obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
-            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
-            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
-            obj['day'] = project_month_prescriptions.project[a].day;
-            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit;
-            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit;
-            count = count + project_month_prescriptions.project[a].count;
-            obj['price'] = parseFloat(project_month_prescriptions.project[a].price);
-            obj['remark'] = project_month_prescriptions.project[a].remark;
+
+            if(project_month_prescriptions.project[a].type == 2){
+              obj['name'] = project_month_prescriptions.project[a].project.project_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 2
+
+
+            }else if (project_month_prescriptions.project[a].type == 3){
+              obj['name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 3
+            }
+            obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+            obj['day'] = project_month_prescriptions.project[a].day
+            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
+            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
+            count = count + project_month_prescriptions.project[a].count
+            obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+            obj['remark'] = project_month_prescriptions.project[a].remark
             obj['type'] = 2
 
 
           }
         }
-        obj['count'] = count;
+        obj['count'] = count
         this.tableData.push(obj)
 
       }
 
       for (let i = 0; i < additions_ids.length; i++) {
-        let obj = {};
-        let count = 0;
-        console.log(addition_month_prescriptions.addition);
+        let obj = {}
+        let count = 0
+        console.log(addition_month_prescriptions.addition)
         if (addition_month_prescriptions.addition) {
           for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
             if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
-              obj['item_name'] = addition_month_prescriptions.addition[a].item_name;
-              count = count + addition_month_prescriptions.addition[a].count;
+              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+              count = count + addition_month_prescriptions.addition[a].count
               obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
             }
           }
-          obj['count'] = count;
+          obj['count'] = count
           this.additions.push(obj)
 
         }
       let params={
         number:this.$route.query.number,
         patient_id:this.$route.query.patient_id,
-      };
+      }
       getHisOrder(params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
+          this.$message.error(response.data.msg)
           return false
         } else {
-          this.patientInfo = response.data.data.order.patient;
-          this.hisPatientInfo = response.data.data.order.his_patient;
-          this.info = response.data.data.p_info;
-          this.order = response.data.data.order;
+          this.patientInfo = response.data.data.order.patient
+          this.hisPatientInfo = response.data.data.order.his_patient
+          this.info = response.data.data.p_info
+          this.order = response.data.data.order
 
-          this.prescriptions = [];
-          this.tableData = [];
+          this.prescriptions = []
+          this.tableData = []
 
 
-          var prescription = response.data.data.prescription;
-          this.prescriptions = prescription;
+          var prescription = response.data.data.prescription
+          this.prescriptions = prescription
           this.setMonthPrescription(prescription)
 
 
           //   var prescription = response.data.data.prescription[i]
 
 
-            // for (let b = 0; b < prescription.advices.length; b++) {
-            //   let obj = {
-            //     name: prescription.advices[b].advice_name,
-            //     statistical_classification:"",
-            //     type:1,
-            //     single_dose: prescription.advices[b].single_dose,
-            //     delivery_way: prescription.advices[b].delivery_way,
-            //     execution_frequency: prescription.advices[b].execution_frequency,
-            //     price: prescription.advices[b].price.toString(),
-            //     day: prescription.advices[b].day,
-            //     count:prescription.advices[b].prescribing_number.toString(),
-            //     remark: prescription.advices[b].remark,
-            //     single_dose_unit: prescription.advices[b].single_dose_unit,
-            //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-            //
-            //   }
-            //   this.tableData.push(obj)
-            // }
-            //
-            // for (let b = 0; b < prescription.project.length; b++) {
-            //   let obj = {
-            //     name: prescription.project[b].project.project_name,
-            //     statistical_classification: prescription.project[b].project.statistical_classification,
-            //     single_dose: prescription.project[b].single_dose,
-            //     delivery_way: prescription.project[b].delivery_way,
-            //     execution_frequency: prescription.project[b].execution_frequency,
-            //     price: prescription.project[b].price,
-            //     day: prescription.project[b].day,
-            //     count: prescription.project[b].count.toString(),
-            //     remark: prescription.project[b].remark,
-            //     single_dose_unit:prescription.project[b].project.unit,
-            //     prescribing_number_unit:prescription.project[b].project.unit,
-            //     type:2,
-            //   }
-            //   this.tableData.push(obj)
-            // }
-            //
-            // for (let b = 0; b < prescription.addition.length; b++) {
-            //     this.additions.push( prescription.addition[b])
-            // }
-
-
-
-            // let index = i + 1
-            // let obj = {
-            //   id: prescription.id,
-            //   name: '处方' + index,
-            //   advices: tempAdvice,
-            //   project: tempProject,
-            //   type: response.data.data.prescription[i].type
-            // }
-            // this.prescriptions.push(obj)
-            // this.curPrescriptions = this.prescriptions[0]
+          // for (let b = 0; b < prescription.advices.length; b++) {
+          //   let obj = {
+          //     name: prescription.advices[b].advice_name,
+          //     statistical_classification:"",
+          //     type:1,
+          //     single_dose: prescription.advices[b].single_dose,
+          //     delivery_way: prescription.advices[b].delivery_way,
+          //     execution_frequency: prescription.advices[b].execution_frequency,
+          //     price: prescription.advices[b].price.toString(),
+          //     day: prescription.advices[b].day,
+          //     count:prescription.advices[b].prescribing_number.toString(),
+          //     remark: prescription.advices[b].remark,
+          //     single_dose_unit: prescription.advices[b].single_dose_unit,
+          //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+          //
+          //   }
+          //   this.tableData.push(obj)
+          // }
+          //
+          // for (let b = 0; b < prescription.project.length; b++) {
+          //   let obj = {
+          //     name: prescription.project[b].project.project_name,
+          //     statistical_classification: prescription.project[b].project.statistical_classification,
+          //     single_dose: prescription.project[b].single_dose,
+          //     delivery_way: prescription.project[b].delivery_way,
+          //     execution_frequency: prescription.project[b].execution_frequency,
+          //     price: prescription.project[b].price,
+          //     day: prescription.project[b].day,
+          //     count: prescription.project[b].count.toString(),
+          //     remark: prescription.project[b].remark,
+          //     single_dose_unit:prescription.project[b].project.unit,
+          //     prescribing_number_unit:prescription.project[b].project.unit,
+          //     type:2,
+          //   }
+          //   this.tableData.push(obj)
+          // }
+          //
+          // for (let b = 0; b < prescription.addition.length; b++) {
+          //     this.additions.push( prescription.addition[b])
+          // }
+
+
+
+          // let index = i + 1
+          // let obj = {
+          //   id: prescription.id,
+          //   name: '处方' + index,
+          //   advices: tempAdvice,
+          //   project: tempProject,
+          //   type: response.data.data.prescription[i].type
+          // }
+          // this.prescriptions.push(obj)
+          // this.curPrescriptions = this.prescriptions[0]
 
           // }
           // this.tableData = response.data.data.order
     }
   }
 }
+
 </script>
 
 <style lang="scss" scoped>

src/xt_pages/outpatientCharges/allListPrint.vue

             let count = 0
             for (let a = 0; a < details.length; a++) {
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
-                obj['name'] = details[a].project.project.project_name
+               if( details[a].project.type == 2){
+                 obj['name'] = details[a].project.project.project_name
+               }else if(details[a].project.type == 3){
+                 obj['name'] = details[a].project.good_info.good_name
+               }
+                obj['unit'] = details[a].project.unit
+
                 obj['spec'] = '1'
-                obj['unit'] = details[a].project.project.unit
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2

src/xt_pages/outpatientCharges/components/chargeMonthPrescriptionTable.vue

         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/outpatientCharges/listPrint.vue

       if(this.org_id == 10106){
         this.getInfo10106(this.paramsObj.id)
       }
-      
+
     },
 
     methods: {
                 price: infos.pric,
                 count: infos.cnt
               }
+              console.log(infos)
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
-                obj['name'] = infos.project.project.project_name
+                if(infos.project.type == 2){
+                  obj['name'] = infos.project.project.project_name
+                }else if (infos.project.type == 3){
+                  obj['name'] = infos.project.good_info.good_name
+                }
                 obj['spec'] = 1
-                obj['unit'] = infos.project.project.unit
+                obj['unit'] = infos.project.unit
 
               }
 
             scanStyles: false
           });
         }
-        
+
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
   .newContainer::-webkit-scrollbar {
     height: 15px !important;
   }
-</style>
+</style>

src/xt_pages/outpatientCharges/listTemplate/printTwo.vue

         <div>
             <div v-if="Object.values(obj)[index].length > 0" v-for="(item,itemIndex) in Object.values(obj)[index]" :key="itemIndex" style="border-bottom:1px solid #000;padding:10px 0;display:flex;" >
                 <div style="width:20%;text-align:center;" v-if="item.advice_id > 0">{{ item.advice.drug.medical_insurance_number }}</div>
-                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{ item.project.project.medical_code }}</div>
+                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.medical_code: item.project.good_info.medical_insurance_number}}</div>
                 <div style="width:20%;text-align:center;" v-if="item.advice_id > 0">{{item.advice.drug.drug_name}}</div>
-                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.project.project_name}}</div>
+                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.project_name:item.project.good_info.good_name}}</div>
 
                 <div style="width:10%;text-align:center;">{{item.pric}}</div>
                 <div style="width:10%;text-align:center;">{{item.cnt}}</div>
             </div>
         </div>
     </div>
-    
+
     <div style="display:flex;border-bottom:1px solid #000;padding:20px 0 10px;">
       <div style="width:70%;">合计：</div>
       <div style="width:10%;text-align:center;">{{info.medfee_sumamt}}</div>
         default: function () {
           return {}
         }
-      }, 
+      },
       order_infos: {
         type: Object,
         default: function () {
           return {}
         }
-      }, 
+      },
       p_admin: {
         type: Object,
         default: function () {
           return {}
         }
       }
-    }, 
+    },
     data(){
         return{
             obj:{},
                     'med_chrgitm_type11':[],
                     'med_chrgitm_type14':[],
                 }
-                
+
                 newVal.map(item => {
-                    
+
                     if(item.med_chrgitm_type == '01'){
                         obj.med_chrgitm_type01.push(item)
                         this.price01 += item.det_item_fee_sumamt
                         obj.med_chrgitm_type14.push(item)
                         this.price14 += item.det_item_fee_sumamt
                     }
-                    
+
                 })
                 this.obj = obj
                 console.log('this.obj',this.obj)
         }
     }
 }
-    
+
 
 
 </script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].unit,
+                  type:prescription.project[b].type,
+
                 }
 
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
+
+
                 tempProject.push(obj)
               }
               let index = i + 1
         } else if (index == 9) {
           this.statementVisible = true;
           let obj = {
-            order_id: this.order.id
+            order_id: this.order.id,
+            settle_type:this.order.settle_type,
+            start_time:this.order.settle_start_time,
+            end_time:this.order.settle_end_time,
           };
           this.orderObj = obj
           // this.$refs.print.getInfo(this.order.id)
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+
+              }
+
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
               obj['number_days'] = project_month_prescriptions.project[a].day
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
               obj['unit'] = project_month_prescriptions.project[a].unit
               obj['project_id'] = project_month_prescriptions.project[a].project_id
               count = count + project_month_prescriptions.project[a].count
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+              obj['type'] = project_month_prescriptions.project[a].type
 
             }
           }
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].project.unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].unit,
+                  type:prescription.project[b].type,
+                }
+
+
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
                 }
+
+
+
                 tempProject.push(obj)
               }
 

src/xt_pages/outpatientCharges/statementPrint.vue

       //       console.log("doctorporject",doctorPorject)
       //     }
       // })
+    }, getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
     },
     searchAction(){
 
               that.info['order_infos'] =  response.data.data.order_infos;
               that.info['diagnosis'] =  response.data.data.diagnosis
 
+              if(that.paramsObj.settle_type != 1){
+                that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                that.info.enddate = that.getTimes(that.paramsObj.end_time)
+              }
+
             }
           })
           .catch(function (error) {

src/xt_pages/outpatientCharges/summaryDetail.vue

                         </el-table-column>
 
                         <el-table-column align="center" prop="project_name" label="分类" width="100">
-                          <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</template>
+                          <template slot-scope="scope">{{ scope.row.type == 1?'药品': scope.row.project_type == 2? '项目':'耗材'}}</template>
                         </el-table-column>
 
 
         let count = 0
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
           if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
-            obj['name'] = project_month_prescriptions.project[a].project.project_name
-            obj['statistical_classification'] = ''
+
+            if(project_month_prescriptions.project[a].type == 2){
+              obj['name'] = project_month_prescriptions.project[a].project.project_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 2
+
+
+            }else if (project_month_prescriptions.project[a].type == 3){
+              obj['name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 3
+            }
             obj['single_dose'] = project_month_prescriptions.project[a].single_dose
             obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
             obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2?scope.row.project.project_name:scope.row.good_info.good_name}}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-              <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+              <template slot-scope="scope">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
             }
 
 
+
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
                 id: 0,
                 total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+              console.log(prescription.project[b].type)
+              if(prescription.project[b].type == 2){
+                console.log("pre")
+
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+                console.log("pre2")
+
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
+                  // medical_code: prescription.project[b].project.medical_code,
                   unit:prescription.project[b].project.unit,
+                  type:prescription.project[b].type,
+
+                }
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
                 }
                 tempProject.push(obj)
               }

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
-          <div>{{getGroup(scope.row.statistical_classification)}}</div>
+          <div>{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2 ?scope.row.project.project_name:scope.row.good_info.good_name}}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-              <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+              <template slot-scope="scope">{{ scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
               let obj = {
                 id: 0,
                 project_id: prescription.project[b].project_id,
-                project_name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].project.statistical_classification,
+                // project_name: prescription.project[b].project.project_name,
+                // statistical_classification: prescription.project[b].project.statistical_classification,
                 single_dose: prescription.project[b].single_dose,
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
                 total:prescription.project[b].count.toString(),
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+
+              if(prescription.project[b].type == 2){
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {
           }
         }
 
-        console.log(this.srcPrescriptions);
 
         if(this.srcPrescriptions.length == 1){
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

 <template>
     <el-dialog
-        title="模板信息"
-        width="600px"
-        :visible.sync="visible"
-        :before-close="_close"
+            title="长期处方模版"
+            width="600px"
+            :visible.sync="visible"
+            :before-close="_close"
     >
         <div>
-            <el-form :model="form"  class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                <el-form-item label="创建人 : " style="width: 100%;margin-bottom:0;">
-                    医生
-                </el-form-item>
-                <el-form-item label="处方类型 : " style="width: 100%;margin-bottom:0;">
-                    药品模板
-                </el-form-item>
-                <el-form-item label="模板类型 : " style="width: 100%;margin-bottom:0;">
-                    <el-radio v-model="radio" label="1">临时</el-radio>
-                    <el-radio v-model="radio" label="2">长期</el-radio>
+            <el-form :model="form" class="adviceForm" ref="form" label-width="100px"
+                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+
+                <!--<el-form-item label="处方模板类别 : " style="width: 100%;margin-bottom:0;">-->
+                <!--<el-radio v-model="radio" label="1">临时</el-radio>-->
+                <!--<el-radio v-model="radio" label="2">长期</el-radio>-->
+                <!--</el-form-item>-->
+                <el-form-item label="处方模板名称:" style="width: 100%;margin-bottom:0;">
+                    <el-input v-model="form.name" placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item label="科室 : " style="width: 100%;">
-                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
+                <el-form-item label="透析模式 : " style="width: 100%;">
+                    <el-select v-model="form.mode" style="width:100%;" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
+                                v-for="item in modeOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="模板名称 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="模板说明 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="诊断信息 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="医嘱说明 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="备注说明 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
             </el-form>
+
+
+            <div v-for="(item,index) in allPrescription" :key="index">
+                <el-checkbox-group v-model="item.check_group">
+                    <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
+                        <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+                        <el-table v-if="subItem.advices.length > 0" :data="subItem.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="60" label="序号"></el-table-column>
+                            <el-table-column align="center" prop="drug_name" width="160" label="名称">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.drug_name }}</span>
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                                <template slot-scope="scope">
+                                    {{scope.row.delivery_way}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                                <template slot-scope="scope">
+                                    {{scope.row.execution_frequency}}
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="day" width="60" label="天数">
+                                <template slot-scope="scope">
+                                    {{scope.row.day}}
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.retail_price}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="remark" label="备注">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.remark}}</div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-table v-if="subItem.project.length > 0" :data="subItem.project" 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="60" label="序号"></el-table-column>
+                            <el-table-column align="center" prop="project_name" width="160" label="名称">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.project_name}}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+                                <template slot-scope="scope">{{ scope.row.type == 2
+                                    ?getGroup(scope.row.statistical_classification):'耗材'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.single_dose }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.delivery_way" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.delivery_way }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.execution_frequency }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="number_days" width="70" label="天数">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.number_days" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.number_days }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="total" width="70" label="总量">
+                                <template slot-scope="scope">
+                                    <div>{{ scope.row.total }}{{scope.row.unit}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="name" width="60" label="单价">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                    <span>{{ scope.row.price }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="name" label="备注">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
+                                    <span>{{ scope.row.remark }}</span>
+
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </el-checkbox-group>
+            </div>
+
+
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
-export default {
-    data(){
-        return{
-            visible:false,
-            form:{
-                name:''
-            },
-            radio:"1",
-            options:[],
-            value:''
-        }
-    },
-    methods:{
-        _close: function(done) {
-            // this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show() {
-            // this.clear()
-            this.visible = true
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
+  import { getDictionaryDataConfig } from '@/utils/data'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        modeOptions: {},
+        allPrescription: [],
+
+        form: {
+          name: '',
+          mode: ''
         },
+        radio: '1',
+        options: [],
+        value: ''
+      }
+    },
+    methods: {
+      getGroup(id) {
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      _close: function(done) {
+        // this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      }, submitAction() {
+
+        let checkGroup = []
+        let allPrescriptions = []
+        let targetPrescriptions = []
+        let prescriptions = []
+        for (let i = 0; i < this.allPrescription.length; i++) {
+          for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
+            checkGroup.push(this.allPrescription[i].check_group[a])
+          }
+          for (let a = 0; a < this.allPrescription[i].prescriptions.length; a++) {
+            allPrescriptions.push(this.allPrescription[i].prescriptions[a])
+          }
+        }
+        for (let i = 0; i < allPrescriptions.length; i++) {
+          for (let a = 0; a < checkGroup.length; a++) {
+            if (allPrescriptions[i].id == checkGroup[a]) {
+              targetPrescriptions.push(allPrescriptions[i])
+            }
+          }
+        }
+
+
+        for(let i = 0; i < targetPrescriptions.length; i++){
+          if(targetPrescriptions[i].advices.length > 0 && targetPrescriptions[i].project.length == 0){
+            targetPrescriptions[i]["type"] = 1
+          } else if(targetPrescriptions[i].advices.length == 0 && targetPrescriptions[i].project.length > 0){
+            targetPrescriptions[i]["type"] = 2
+          }
+          for (let b = 0; b < targetPrescriptions[i].advices.length; b++) {
+            targetPrescriptions[i].advices[b].single_dose = targetPrescriptions[i].advices[b].single_dose.toString()
+            targetPrescriptions[i].advices[b].prescribing_number =targetPrescriptions[i].advices[b].prescribing_number.toString()
+            targetPrescriptions[i].advices[b].retail_price = targetPrescriptions[i].advices[b].retail_price.toString()
+            targetPrescriptions[i].advices[b].day = parseInt(targetPrescriptions[i].advices[b].day)
+          }
+          for (let b = 0; b < targetPrescriptions[i].project.length; b++) {
+            targetPrescriptions[i].project[b].price =targetPrescriptions[i].project[b].price.toString()
+            targetPrescriptions[i].project[b].total =targetPrescriptions[i].project[b].total.toString()
+            targetPrescriptions[i].project[b].delivery_way =targetPrescriptions[i].project[b].delivery_way.toString()
+          }
+        }
+
+        let params = {
+          name: this.form.name,
+          mode: this.form.mode,
+          prescriptions: targetPrescriptions,
+        }
+        this.$emit('save_template', params)
+      },
+      show(prescriptions) {
+        for (let i = 0; i < prescriptions.length; i++) {
+          if (prescriptions[i].id == 0) {
+            prescriptions[i].id = Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+          }
+        }
+
+        this.allPrescription = []
+        this.modeOptions = this.$store.getters.treatment_mode
+        let obj = {
+          check_group: [],
+          prescriptions: prescriptions
+        }
+        this.allPrescription.push(obj)
+        this.visible = true
+      },
+      hide() {
+        // this.clear()
+        this.visible = false
+      }
     }
-}
+  }
 </script>
 
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
-               
+
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
           <div style="page-break-after:always"></div>
       </div>
     </div>
-    
+
   </div>
 
-    
+
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
       }
     },
    methods:{
-     
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-     
+
    },
    watch:{
      ids:function(val){
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

                 </tr>
                 <tr v-for="(it,index) in item.project" :key="index">
                     <td>{{index+1}}</td>
-                    <td>{{getProjectName(it.project_id)}}</td>
+                    <td>{{it.type == 2 ?getProjectName(it.project_id):it.good_info.good_name}}</td>
                     <td>{{it.single_dose}}</td>
                     <td>{{getUnit(it.unit)}}</td>
                     <td>{{it.price}}</td>
 .actionBar div{
     width:150px;
 }
-</style>
+</style>

src/xt_pages/qcd/dialysisTotal.vue

         >
           <el-option label="全部" value></el-option>
           <el-option
-            v-for="item in modeOptions"
+            v-for="item in "
             :key="item.id"
             :label="item.name"
             :value="item.id"