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

.gitignore

@@ -1,2 +1,10 @@
 node_modules/
 dist/
+.idea/Vue_New.iml
+.idea/codeStyles
+.idea/encodings.xml
+.idea/inspectionProfiles
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+.idea/workspace.xml

.idea/Vue_New.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Vue_New.iml" filepath="$PROJECT_DIR$/.idea/Vue_New.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

src/api/common/common.js

@@ -48,7 +48,7 @@ export function getConfigurationList(limit, page) {
 }
 
 export function getConfigurationDetail(id, params) {
- 
+
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',
@@ -531,10 +531,12 @@ export function getCountModeId(params){
 }
 
 export function getRolloutCount(params){
-  
+
   return request({
     url:"/com/api/getrolloutcount",
     method:"Get",
     params:params
   })
-}
+}
+
+

src/api/consumable.js

@@ -14,7 +14,7 @@ export function GetAllZone(params){
 //获取透析参数
 
 export function getDialysisParameters(params){
-   console.log("params============heyuan",params)
+   
   return request({
      url:"/api/dialysis/getdialysisparameters",
      method:"Get",

src/api/his/his.js

@@ -106,10 +106,11 @@ export function delHisProject(params) {
 }
 
 
-export function getHisOrderList() {
+export function getHisOrderList(params) {
   return request({
     url: "/api/hisorder/list",
     method: "get",
+    params:params,
   });
 }
 
@@ -152,5 +153,36 @@ export function Refund(params) {
 }
 
 
+export function delHisAddition(params) {
+  return request({
+    url: "/api/addition_charge/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function getDoctorList() {
+  return request({
+    url: "/api/doctor/list",
+    method: "get",
+  });
+}
+
+
+export function getExportConsumeDetailList(params) {
+  return request({
+    url: "/api/consumedetail/export",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+
+
+
 
 

src/api/project/project.js

@@ -461,4 +461,13 @@ export function changePatient(id,params){
       method:"Get",
       params:params
     })
+  }
+
+  export function getPatientDetail(id,params){
+    
+     return request({
+       url:"/api/histpatient/getpatientdetail?id="+id,
+       method:"Get",
+       params:params
+     })
   }

src/api/schedule.js

@@ -113,3 +113,12 @@ export function exportScheduleTemplate(params) {
   })
 }
 
+
+export function getNextScheduleWeekDay(params){
+  
+  return request({
+    url:"/api/schedule/getnextscheduleweekday",
+    method:"get",
+    params:params
+  })
+}

src/router/modules/workforce.js

@@ -70,6 +70,17 @@ export default {
         title: 'remind_print',
         noCache: true
       }
+    },
+    {
+      path: '/schedule/remind/print/next',
+      component: () => import('@/xt_pages/workforce/next_remind_print'),
+      name: 'next_remind_print',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: 'next_remind_print',
+        noCache: true
+      }
     }
   ]
 }

src/xt_pages/dialysis/components/consumables.vue

@@ -42,7 +42,7 @@
         </div>
       </div>
       <div>
-        <!--<el-button size="small" icon="el-icon-printer" type="primary">打印</el-button>-->
+        <!-- <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button> -->
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
@@ -138,6 +138,7 @@
         new_list:[],
 
         good_types: [],
+        arrKey:[],
 
       }
     },
@@ -178,18 +179,19 @@
 
       },
       getGoodUserInfo(good_type_id,good_user,last_good_user) {
+        var arrlist =[] 
         if (good_user != null && good_user.length > 0) {
           let desc = ""
           for (let b = 0; b < good_user.length; b++){
             if(good_type_id == good_user[b].good_type_id)
               desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
           }
-
-
+          arrlist.push(desc)
           return desc
         }
+       console.log("arrlist---------",arrlist)
         return ""
-
+       
         // else if (good_user != null && good_user.length <= 0) {
         //   if (last_good_user != null && last_good_user.length > 0) {
         //     let desc = ""
@@ -219,13 +221,20 @@
             var res = response.data
             this.total = res.data.total
             this.good_types.push("姓名")
-
+            var arr = []
+            arr.push("name")
             for (let a = 0; a <  res.data.good_type.length; a++){
+              Object.keys(res.data.good_type[a]).map(item => {
+                if(item == 'type_name'){
+                  arr.push(item)
+                }
+              })
               this.good_types.push(res.data.good_type[a].type_name)
             }
-            console.log("res====",res.data.good_type)
+            this.arrKey.push(...arr)
+          
             this.allGoodInfo = res.data.dialysis_goods
-            console.log("dis===",res.data.dialysis_goods)
+           
             for(let i = 0; i < res.data.dialysis_goods.length; i++){
               let arr =[]
               let obj = {
@@ -271,7 +280,7 @@
 
           }
 
-         console.log("list",this.list)
+         console.log("list222222",this.list)
 
         })
 
@@ -320,7 +329,26 @@
       search() {
         this.query.page = 1
         this.GetDialysisgoods()
-      }
+      },
+
+       exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = this.good_types
+         const filterVal = this.arrKey
+        
+         const data = this.formatJson(filterVal, this.list)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析耗材查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+
     }
   }
 </script>

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -220,10 +220,12 @@ export default {
     methods:{
         selectSchedulType(scheduleType) {
             this.scheduleType = scheduleType;
+            this.tableData = []
             this.getlist()
         },
         selectPartitionType(partitionType) {
           this.partitionType = partitionType;
+          this.tableData = []
           this.getlist()
         },
         getAllZone: function() {
@@ -258,7 +260,7 @@ export default {
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-            
+              
                 this.tableData = schedule
                 var total = response.data.data.total
                 this.total = total
@@ -352,6 +354,7 @@ export default {
               limit:this.limit,
               page:this.page
             }
+           console.log("params9999999",params)
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
@@ -478,7 +481,7 @@ export default {
              dryWeight = this.dialysisBefor[i].dry_weight
           }
         }
-        console.log("dryweight=====",dryWeight)
+       
        return dryWeight
      },
      getSysBloodPressure(id){
@@ -488,7 +491,7 @@ export default {
              sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
           }
         }
-        console.log("sysBloodPressure=====",sysBloodPressure)
+      
         return sysBloodPressure
      },
      getTargetUltrafiltration(id){

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -10,39 +10,55 @@
       <el-table-column align="center" prop="name" width="90" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>
+            <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+            <div> {{scope.row.single_dose}}</div>
+
             <div> {{scope.row.single_dose_unit}}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" readonly></el-input>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
 
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" readonly></el-input>
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          {{scope.row.day}}
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>
+            <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+            <div> {{scope.row.prescribing_number}}</div>
+
             <div>{{scope.row.prescribing_number_unit}}</div>
           </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.retail_price" placeholder="" readonly></el-input>
+          <div> {{scope.row.retail_price}}</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </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" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
         </template>
       </el-table-column>
     </el-table>
@@ -60,42 +76,68 @@
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
+          {{scope.row.single_dose}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
+          <!--<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="80" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+          {{scope.row.number_days}}
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.total" placeholder="" readonly></el-input>
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}}
+
+            <div>{{scope.row.unit}}</div>
+
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <!--<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="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" readonly></el-input>
+          <!--<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 prescription.addition" :key="index">
+        <span>{{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>
 </template>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -334,6 +334,7 @@
                   execution_frequency: prescription.advices[b].execution_frequency,
                   retail_price: prescription.advices[b].price.toString(),
                   remark: prescription.advices[b].remark,
+                  day: prescription.advices[b].day,
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   single_dose_unit: prescription.advices[b].single_dose_unit,
                   prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
@@ -357,8 +358,10 @@
                   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].unit,
                 }
+
                 tempProject.push(obj)
               }
               let index = i + 1
@@ -421,19 +424,21 @@
 
             }
           }
-          return Math.floor(total * 100) / 100
-
         } else {
-          var total = 0
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
               total = total +  Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
 
             }
           }
-          return Math.floor(total * 100) / 100
+        }
 
+        if (this.curPrescriptions.addition != null) {
+          for (let b = 0; b < this.curPrescriptions.addition.length; b++) {
+            total = total +  Math.floor((this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count) * 100) / 100
+          }
         }
+        return Math.floor(total * 100) / 100
 
       },
       getTotal() {
@@ -450,12 +455,14 @@
               total = total + Math.floor((this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total) * 100) / 100
             }
           }
-
-          for (let i = 0; i < this.addtions_charge.length; i++) {
-            total = total + Math.floor(this.addtions_charge[i].price * 100) / 100
+          if (this.prescriptions[i].addition != null) {
+            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+              total = total + Math.floor((this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count) * 100) / 100
+            }
           }
-          return Math.floor(total * 100) / 100
         }
+        return Math.floor(total * 100) / 100
+
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -500,28 +507,43 @@
           })
 
         } else if (index == 5) {
-          let params = {
-            'order_id': this.order.id,
-            'number': this.order.number,
-          }
-          Refund(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              this.loadingtwo = false
-              return false
-            } else {
-              this.$message({ message: '退费成功', type: 'success' })
-              this.loadingtwo = false
 
+          this.$confirm('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': this.order.id,
+              'number': this.order.number,
             }
+            Refund(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                this.loadingtwo = false
+                return false
+              } else {
+                this.$message({ message: '退费成功', type: 'success' })
+                this.loadingtwo = false
+
+              }
+            })
+
+          }).catch(() => {
+
           })
 
+
         } else if (index == 6) {
 
           if (this.patientInfo.id == 0) {
             this.$message.error('请先选择要挂号的病人')
             return
           }
+
+
+
+
           let params = {
             'id': this.patientInfo.id,
             'record_time': this.record_date
@@ -554,45 +576,102 @@
         // console.log(id)
         // this.radioStatus = id
         // this.getPatientList()
+        let temp_id = id
 
-        switch (id) {
-          case 1:
-                this.patientTableData = []
+        let params = {
+          'record_date': this.record_date
+        }
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = []
+            this.all_table_data = []
+            let one_count = 0
+            let two_count = 0
+            let three_count = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              // console.log('99999999', response.data.data.list)
 
-            for (let i = 0; i < this.all_table_data.length; i++){
-              if(this.all_table_data[i].info.prescription_status == 0 || this.all_table_data[i].info.prescription_status == 1 || this.all_table_data[i].info.prescription_status == 2 ){
-                this.patientTableData.push(this.all_table_data[i])
+              if(response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 ||response.data.data.list[i].info.prescription_status == 2 ){
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                  one_count = one_count + 1
+                  this.patientTableData.push(response.data.data.list[i])
+                }
               }
 
-            }
-            break
-          case 2:
-            this.patientTableData = []
-            for (let i = 0; i < this.all_table_data.length; i++){
-              if(this.all_table_data[i].info.prescription_status == 3){
-                this.patientTableData.push(this.all_table_data[i])
+              if(response.data.data.list[i].info.prescription_status == 3){
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+
+                  two_count = two_count + 1
+                }
               }
 
+              if(response.data.data.list[i].info.prescription_status == 4){
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                  three_count = three_count + 1
+                }
+              }
 
+              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                this.all_table_data.push(response.data.data.list[i])
+              }
             }
-            break
-          case 3:
-            this.patientTableData = []
 
-            for (let i = 0; i < this.all_table_data.length; i++){
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = three_count
 
-              if(this.all_table_data[i].info.prescription_status == 4){
-                this.patientTableData.push(this.all_table_data[i])
-              }
+            switch (temp_id) {
+
+              case 1:
+                this.patientTableData = []
+
+                for (let i = 0; i < this.all_table_data.length; i++){
+                  if(this.all_table_data[i].info.prescription_status == 0 || this.all_table_data[i].info.prescription_status == 1 || this.all_table_data[i].info.prescription_status == 2 ){
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
+
+                }
+                break
+              case 2:
+                this.patientTableData = []
+                for (let i = 0; i < this.all_table_data.length; i++){
+                  if(this.all_table_data[i].info.prescription_status == 3){
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
+
+
+                }
+                break
+              case 3:
+                this.patientTableData = []
+
+                for (let i = 0; i < this.all_table_data.length; i++){
+
+                  if(this.all_table_data[i].info.prescription_status == 4){
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
+
+                }
+                break
+              case 4:
+                this.patientTableData = []
+                this.patientTableData = this.all_table_data
+                break
 
             }
-            break
-          case 4:
-            this.patientTableData = []
-            this.patientTableData = this.all_table_data
-            break
 
-        }
+            this.current_index = 0
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            this.getPatientInformation(this.patientTableData[0].patients.id,"")
+
+
+          }
+        })
+
+
 
 
 
@@ -699,6 +778,7 @@
 
               let tempAdvice = []
               let tempProject = []
+              let tempAddition = []
 
               for (let b = 0; b < prescription.advices.length; b++) {
                 let obj = {
@@ -709,6 +789,7 @@
                   execution_frequency: prescription.advices[b].execution_frequency,
                   retail_price: prescription.advices[b].price.toString(),
                   remark: prescription.advices[b].remark,
+                  day: prescription.advices[b].day,
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   single_dose_unit: prescription.advices[b].single_dose_unit,
                   prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
@@ -736,12 +817,27 @@
                 }
                 tempProject.push(obj)
               }
+
+              for (let b = 0; b < prescription.addition.length; b++) {
+                let obj = {
+                  id: prescription.addition[b].id,
+                  item_name: prescription.addition[b].item_name,
+                  price: prescription.addition[b].price,
+                  count: prescription.addition[b].count,
+                  item_id: prescription.addition[b].item_id,
+                }
+                tempAddition.push(obj)
+              }
+
+
+
               let index = i + 1
               let obj = {
                 id: prescription.id,
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
+                addition:tempAddition,
                 order_status: response.data.data.prescription[i].order_status,
                 type: response.data.data.prescription[i].type
               }

src/xt_pages/outpatientCharges/summary.vue

@@ -6,27 +6,40 @@
     <div class="app-container">
       <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
         <div>
-          <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+          <el-input size="small" style="width:150px;"  v-model="keywords"
                     class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
-          <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
+          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              label="全部"
+              value="0">
+            </el-option>
+            <el-option
+              v-for="item,index in doctors"
+              :key="index"
+              :label="item.user_name"
+              :value="item.admin_user_id">
             </el-option>
           </el-select>
-          <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date"
-                          @change="handleScheduleDateChange" :editable="false" :clearable="false"
-                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间"
+          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+                          @change="handleStartTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+
+          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                          @change="handleEndTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
                           align="right"></el-date-picker>
           <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
-        <!--<el-button size="small" type="primary">报表下载</el-button>-->
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
       <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -38,8 +51,8 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="门诊/销售编号">
-          <template slot-scope="scope">{{ scope.row.number }}</template>
+        <el-table-column align="center" prop="name" label="门诊号">
+          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
@@ -53,8 +66,8 @@
         <el-table-column align="center" prop="name" label="实收金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="舍入金额">
-          <template slot-scope="scope">{{scope.row.medfee_sumamt - scope.row.medfee_sumamt}}</template>
+        <el-table-column align="center" prop="name" label="科室">
+          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
           <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
@@ -75,14 +88,28 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+
+      >
+      </el-pagination>
     </div>
+
+
   </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList } from '@/api/his/his'
+  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
 
   export default {
@@ -95,10 +122,153 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
         ],
-        tableData: []
+        tableData: [],
+        limit:10,
+        page:1,
+        keywords:"",
+        start_time:"",
+        end_time:"",
+        total:"",
+        doctors:[],
+        admin_user_id:"",
+
       }
     },
     methods: {
+      export_detail(){
+        let params= {
+          start_time:this.start_time,
+          end_time: this.end_time,
+        }
+        getExportConsumeDetailList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            let list = []
+            for (let i =0; i < response.data.data.order.length; i++){
+            let order =   response.data.data.order[i]
+              let number = ""
+              let name = ""
+              let department = ""
+              let doctor_name = ""
+              let balance_accounts = ""
+
+              let order_status = ""
+
+
+
+              if(order.his_patient != null && order.his_patient.number.length > 0){
+                number = order.his_patient.number
+
+              }
+
+              if(order.his_patient != null ){
+                if(order.his_patient.balance_accounts_type == 1){
+                  balance_accounts = "自费"
+                }
+
+                if(order.his_patient.balance_accounts_type == 2){
+                  balance_accounts = "医保"
+                }
+              }
+
+              if(order.patient != null && order.patient.name.length > 0){
+                name = order.patient.name
+
+              }
+
+              if(order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0){
+                department = order.p_info.department.name
+
+              }
+
+              if(order.p_info != null && order.p_info.doctor.length > 0){
+                doctor_name = order.p_info.doctor
+              }
+
+              if(order.order_status == 1){
+                order_status = "待结算"
+              }
+
+              if(order.order_status == 2){
+                order_status = "已结算"
+              }
+
+              if(order.order_status == 3){
+                order_status = "已退费"
+              }
+
+
+              let obj = {
+                "就诊号":number,
+                "患者姓名":name,
+                "应收金额":order.medfee_sumamt,
+                "实收金额":order.medfee_sumamt,
+                "科室":department,
+                "医生姓名":doctor_name,
+                "收费类别":balance_accounts,
+                "收费者姓名":doctor_name,
+                "总金额":order.medfee_sumamt,
+                "现金支付":"",
+                "账户支付":"",
+                "支付宝支付":"",
+                "微信支付":"",
+                "其他支付":"",
+                "收费日期":"",
+                "收费状态":order_status,
+                "退费日期":"",
+              }
+              list.push(obj)
+            }
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: "消费明细"
+              })
+            })
+
+          }
+        })
+
+      },  formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+      changeDoctor(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      handleSizeChange(limit){
+        this.limit = limit;
+        this.getHisOrderList()
+
+      },handleCurrentChange(page){
+        this.page = page;
+        this.getHisOrderList()
+
+
+      },
+      handleStartTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },handleEndTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      searchAction(){
+        this.page = 1
+        this.getHisOrderList()
+
+
+      },
       getTimes(time) {
         return uParseTime(time, "{y}-{m}-{d}");
       },
@@ -109,17 +279,41 @@
           return uParseTime(value, temp)
         }
         return ''
+      },getHisOrderList(){
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          type: this.admin_user_id
+        }
+        getHisOrderList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.order
+            this.total = response.data.data.total
+          }
+        })
+
+      },getDoctorList(){
+        getDoctorList().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.doctors = response.data.data.doctors
+          }
+        })
+
+
       }
     }, created() {
-      getHisOrderList().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.tableData = response.data.data.order
+     this.getDoctorList()
+     this.getHisOrderList()
 
-        }
-      })
 
     }
   }

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -7,22 +7,87 @@
             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                      <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
-                        <el-tab-pane
-                          v-for="(item, index) in prescriptions"
-                          :key="index"
-                          :label="item.name"
-                          :name="item.name"
-                        >
-                        </el-tab-pane>
-
-                        <div class="RP">
-                          Rp
-                        </div>
-                        <prescription-table ref="prescription_tables"
-                                            :prescription="curPrescriptions"></prescription-table>
+                      <el-table  :data="tableData" 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" prop="project_name" label="名称">
+                          <template slot-scope="scope">{{ scope.row.name }}</template>
+                        </el-table-column>
+
+                        <el-table-column align="center" prop="project_name" label="分类">
+                          <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</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>
+                        </el-table-column>
+                        <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
+                            {{scope.row.single_dose}}{{scope.row.single_dose_unit}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="delivery_way" width="80" 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="80" label="频率">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+                            {{scope.row.execution_frequency}}
 
-                      </el-tabs>
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="number_days" width="50" 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="50" label="总量">
+                          <template slot-scope="scope">
+                            <div style="display:flex;">
+                              <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+                              {{scope.row.count}}
+                              <div>{{scope.row.prescribing_number_unit}}</div>
+
+                            </div>
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" width="50" 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="50" 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>{{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 class="costBox">
@@ -68,6 +133,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisOrder } from '@/api/his/his'
 import prescriptionTable from './components/prescriptionTable'
+import { getDictionaryDataConfig} from "@/utils/data";
 
 export default {
     components:{
@@ -86,6 +152,7 @@ export default {
           prescriptions: [],
           record_date: '',
           tableData: [],
+          additions:[],
           editableTabsValue: '1',
           loadingone: false,
           editableTabs: [{
@@ -111,7 +178,9 @@ export default {
     },created(){
       this.GetOrderDetail()
   },methods:{
-
+    getDictionaryDataConfig(module, filed_name) {
+      return getDictionaryDataConfig(module, filed_name)
+    },
     tabclickEvent(val) {
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
@@ -134,6 +203,16 @@ export default {
         }
       })
       return targetObj
+    },  getGroup(id){
+      var name = ""
+      var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+      console.log("2235",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
@@ -172,59 +251,65 @@ export default {
           this.order = response.data.data.order
 
           this.prescriptions = []
+          this.tableData = []
+
           for (let i = 0; i < response.data.data.prescription.length; i++) {
             var prescription = response.data.data.prescription[i]
 
-            let tempAdvice = []
-            let tempProject = []
 
             for (let b = 0; b < prescription.advices.length; b++) {
               let obj = {
-                advice_id: prescription.advices[b].id,
-                drug_name: prescription.advices[b].advice_name,
+                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,
-                retail_price: prescription.advices[b].price.toString(),
+                price: prescription.advices[b].price.toString(),
+                day: prescription.advices[b].day,
+                count:prescription.advices[b].prescribing_number.toString(),
                 remark: prescription.advices[b].remark,
-                prescribing_number: prescription.advices[b].prescribing_number.toString(),
                 single_dose_unit: prescription.advices[b].single_dose_unit,
                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                min_unit: prescription.advices[b].single_dose_unit,
-                medical_insurance_number: prescription.advices[b].med_list_codg
 
               }
-              tempAdvice.push(obj)
+              this.tableData.push(obj)
             }
 
             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,
+                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,
-                number_days: prescription.project[b].day,
-                total: prescription.project[b].count.toString(),
                 price: prescription.project[b].price,
+                day: prescription.project[b].day,
+                count: prescription.project[b].count.toString(),
                 remark: prescription.project[b].remark,
-                medical_code: prescription.project[b].project.medical_code
+                single_dose_unit:"",
+                prescribing_number_unit:"",
+                type:2,
               }
-              tempProject.push(obj)
+              this.tableData.push(obj)
             }
-            let index = i + 1
-            let obj = {
-              id: prescription.id,
-              name: '处方' + index,
-              advices: tempAdvice,
-              project: tempProject,
-              type: response.data.data.prescription[i].type
+
+            for (let b = 0; b < prescription.addition.length; b++) {
+                this.additions.push( prescription.addition[b])
             }
-            this.prescriptions.push(obj)
-            this.curPrescriptions = this.prescriptions[0]
+
+
+
+            // 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

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -11,7 +11,7 @@
               @select='selectDrugs'>
       <el-table-column align="center" type="selection" width="40"></el-table-column>
       <el-table-column align="center" prop="name" label="名称" width="100">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">{{ scope.row.item_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额(元)">
         <template slot-scope="scope">
@@ -33,8 +33,7 @@
     props: {
       hisPatientInfo: Object,
       patientInfo: Object,
-      additions: Array,
-      addtions_charge: Array
+      additions: Array
 
     },
     data() {
@@ -61,28 +60,17 @@
         this.chargeTable = []
        
         this.visible = true
-        if (this.addtions_charge == null || this.addtions_charge.length == 0) {
-          for (let i = 0; i < this.additions.length; i++) {
-            let obj = {
-              id: '0',
-              item_id: this.additions[i].id.toString(),
-              name: this.additions[i].name,
-              price: this.additions[i].price.toString()
-            }
-            this.chargeTable.push(obj)
-          }
-        } else {
-
-          for (let i = 0; i < this.addtions_charge.length; i++) {
-            let obj = {
-              id: this.addtions_charge[i].id.toString(),
-              item_id: this.addtions_charge[i].item_id.toString(),
-              name: this.addtions_charge[i].item_name,
-              price: this.addtions_charge[i].price.toString()
-            }
-            this.chargeTable.push(obj)
+        for (let i = 0; i < this.additions.length; i++) {
+          let obj = {
+            id: '0',
+            item_id: this.additions[i].id,
+            item_name: this.additions[i].name,
+            price: this.additions[i].price,
+            count: this.additions[i].count,
           }
+          this.chargeTable.push(obj)
         }
+
       },
       hide() {
         this.visible = false
@@ -91,20 +79,7 @@
         this.charges = val
       },
       submitAction() {
-        var params = {
-          his_patient_id: this.hisPatientInfo.id,
-          patient_id: this.patientInfo.id,
-          medicineData: this.charges
-        }
-        saveCharges(params).then(response => {
-          if (response.data.state == 1) {
-            var data = response.data.data.additional_charges
-            this.$emit('setData', data)
-            this.$message.success('保存成功')
-            this.visible = false
-
-          }
-        })
+        this.$emit('setData', this.charges)
       }
     },
     watch: {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -145,6 +145,14 @@
                           <el-table-column label="规格" width="60">
                             <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                           </el-table-column>
+                          <el-table-column label="库存" width="60">
+                            <template slot-scope="scope">{{
+                              stockInCount(scope.row) -
+                              salesReturnCount(scope.row) -
+                              stockOutCount(scope.row) +
+                              cancelStockCount(scope.row)
+                              }}</template>
+                          </el-table-column>
                           <el-table-column label="单价" width="40">
                             <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                           </el-table-column>
@@ -253,7 +261,7 @@
       </div>
     </div>
     <additionalCharges   v-on:setData="setCharge" ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
-                       :patientInfo="patientInfo" :additions="additions" :addtions_charge="addtions_charge"></additionalCharges>
+                       :patientInfo="patientInfo" :additions="additions" ></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -282,7 +290,10 @@
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
-      addtions_charge:Array,
+      addtions_charge: {
+        type: Array,
+        default: []
+      },
 
       other_sick: {
         type: Array,
@@ -302,7 +313,7 @@
     data() {
       return {
         register_type: '',
-        value: '',
+        value: '0',
         form: {
           name: ''
         },
@@ -315,7 +326,7 @@
           title: '处方1',
           name: '1'
         }],
-        tabIndex: 1,
+        tabIndex: this.prescriptions.length,
         currenet_inedx: 0,
         rightTab: 1,
         activeName: '1',
@@ -355,11 +366,51 @@
       }
     },
     methods: {
-      setCharge(additional_charges){
-        console.log("111122222")
-        this.addtions_charge = additional_charges
-        console.log(this.addtions_charge )
+      stockInCount: function(row) {
+        let total = 0;
+        if(row.stock_in != null) {
+          for (let i = 0; i < row.stock_in.length; i++) {
+            total = total + row.stock_in[i].warehousing_count;
+          }
+        }
+        return total;
+      },
+      salesReturnCount: function(row) {
+        let total = 0;
+        if(row.sales_return != null) {
 
+          for (let i = 0; i < row.sales_return.length; i++) {
+            total = total + row.sales_return[i].count;
+          }
+        }
+        return total;
+      },
+      stockOutCount: function(row) {
+        let total = 0;
+        if(row.stock_out != null) {
+
+          for (let i = 0; i < row.stock_out.length; i++) {
+            total = total + row.stock_out[i].count;
+          }
+        }
+        return total;
+      },
+      cancelStockCount: function(row) {
+        let total = 0;
+        if(row.cancel_stock != null) {
+          for (let i = 0; i < row.cancel_stock.length; i++) {
+            total = total + row.cancel_stock[i].count;
+          }
+        }
+        return total;
+      },
+
+      setCharge(additional_charges){
+        for (let i = 0; i < additional_charges.length; i++){
+          additional_charges[i].count = 1
+          this.curPrescriptions.addition.push(additional_charges[i])
+        }
+        this.$refs.additionalCharges.hide()
 
       },
       searchAction() {
@@ -394,6 +445,15 @@
                 total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
               }
             }
+
+            if (this.prescriptions[i].addition != null) {
+              for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+                total = total + this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count
+              }
+            }
+
+
+
             total =  Math.floor(total * 100) / 100
           }
         }
@@ -402,7 +462,6 @@
       }, 
       getCurTotal() {
         var total = 0
-        console.log(this.editableTabsValue)
 
         if(this.curPrescriptions.type == 1) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
@@ -430,12 +489,14 @@
               total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
             }
           }
-        }
-        if(this.addtions_charge != null) {
-          for (let i = 0; i < this.addtions_charge.length; i++) {
-            total = total + this.addtions_charge[i].price
+
+          if (this.prescriptions[i].addition != null) {
+            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+              total = total + this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count
+            }
           }
         }
+
         return Math.floor(total * 100) / 100
       },
       createFilter(queryString) {
@@ -494,39 +555,22 @@
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.additions = response.data.data.additions
-
             var info = response.data.data.info
-
-            if (this.$store.getters.xt_user.user.user_type == 2 || this.$store.getters.xt_user.user.user_type == 1) {
-              console.log('11111')
-              this.doctorValue = this.$store.getters.xt_user.user.id
-            } else {
-              console.log('222222')
-
-              this.doctorValue = this.doctors[0].admin_user_id
-            }
-
             if (info.user_type == 2 || info.user_type == 1) {
-
-
               this.doctorValue = info.admin_user_id
-
-
               if (info.department_id == 0) {
-
                 if (this.department.length > 0) {
                   this.departmentValue = this.department[0].id
                 } else {
                   this.departmentValue = ''
+
                 }
               } else {
                 this.departmentValue = info.department_id
               }
             }else{
               this.doctorValue = this.doctors[0].admin_user_id
-
             }
-
           }
         })
 
@@ -580,15 +624,14 @@
         this.teamList = []
 
       },
-      setData(data, info,addition_charge) {
-        this.addition_charge = addition_charge
+      setData(data, info) {
         this.prescription_id = data[0].id
-
-        console.log('99999999', data[0].id)
+        this.editableTabsValue = "处方1"
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
+        console.log( this.curPrescriptions)
 
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
@@ -610,7 +653,12 @@
         this.state1 = info.diagnosis
         this.state2 = info.sick_history
         this.doctorValue = info.doctor_id
-        this.departmentValue = info.departments
+        this.departmentValue = info.departmentValue
+
+        if(this.doctorValue == 0){
+
+        }
+
         this.register_type = info.register_type
 
         if (info.prescription_status == 1 || info.prescription_status == 2) {
@@ -637,8 +685,8 @@
         }
       },
       open(index) {
-        if (this.curPrescriptions.order_status >= 2) {
-          this.$message.error('当前处方处于结算或者退费状态,无法保存')
+        if (this.curPrescriptions.order_status == 2) {
+          this.$message.error('当前处方已经结算,无法保存')
           return
         }
         if (this.doctorValue.length <= 0) {
@@ -670,16 +718,26 @@
             if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length > 0) {
               this.prescriptions[i]['type'] = 2
             }
+
+
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
               this.prescriptions[i].advices[b].single_dose = this.prescriptions[i].advices[b].single_dose.toString()
               this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
               this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
+              this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
 
             }
 
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
               this.prescriptions[i].project[b].price = parseFloat(this.prescriptions[i].project[b].price)
+              this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
+            }
 
+            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+              this.prescriptions[i].addition[b].id = parseInt(this.prescriptions[i].addition[b].id)
+              this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)
+              this.prescriptions[i].addition[b].price = parseFloat(this.prescriptions[i].addition[b].price)
+              this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
             }
           }
           let data = {
@@ -709,6 +767,8 @@
           return
         }
 
+        this.tabIndex = this.prescriptions.length
+
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
@@ -716,7 +776,8 @@
           name: newTabName,
           order_status: 0,
           advices: [],
-          project: []
+          project: [],
+          addition:[]
 
         })
         this.editableTabsValue = newTabName
@@ -820,9 +881,9 @@
             })
           }
 
+        }).catch(() => {
+
         })
-          .catch(() => {
-          })
 
       },
       clickTab(tab) {
@@ -924,8 +985,6 @@
           }
         }
 
-        console.log(this.curDrugs)
-        console.log(this.curPrescriptions.advices)
 
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
@@ -941,8 +1000,6 @@
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
-
-            console.log(temp2)
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
                 let obj = {
@@ -954,12 +1011,17 @@
                   execution_frequency: temp[b].execution_frequency,
                   retail_price: temp[b].retail_price.toString(),
                   remark: '',
+                  day:'',
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
                   medical_insurance_number: temp[b].medical_insurance_number
 
                 }
+
+                if(obj.prescribing_number == 0 || obj.prescribing_number.length  == 0){
+                  obj.prescribing_number = 1
+                }
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -979,9 +1041,12 @@
                   total: temp2[b].total,
                   price: temp2[b].price,
                   remark: '',
-                  medical_code: temp2[b].medical_code
+                  medical_code: temp2[b].medical_code,
+                  unit:temp2[b].unit
+                }
+                if(obj.total == 0 ){
+                  obj.total = 1
                 }
-                console.log(obj)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
@@ -1079,16 +1144,15 @@
           }
         }
       }
-    },
-    created() {
+    },mounted(){
       this.getInitData()
       //获取所有项目
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
 
-    }
 
+    },
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -54,15 +54,15 @@
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
-      <el-form-item label="体温:" prop="name">
+      <el-form-item label="体温:" prop="temperature">
         <el-input v-model="case_history.temperature" placeholder=""></el-input>
         <span>℃</span>
       </el-form-item>
-      <el-form-item label="脉搏: " prop="name">
+      <el-form-item label="脉搏: " prop="pulse">
         <el-input v-model="case_history.pulse" placeholder=""></el-input>
         (次/分)
       </el-form-item>
-      <el-form-item label="呼吸: " prop="name">
+      <el-form-item label="呼吸: " prop="breathing">
         <el-input v-model="case_history.breathing" placeholder=""></el-input>
         (次/分)
       </el-form-item>

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -53,15 +53,6 @@
             <span style="width:200px;">血压：{{case_history.sbp}}~{{case_history.dbp}} mmHg</span>
           </div>
         </div>
-        <div class="commonCell">
-          <p></p>
-          <div class="detailMain">
-            <span style="width:140px;">血糖：{{case_history.blood_sugar}} mmol/L</span>
-            <span style="width:140px;">血脂：{{case_history.blood_fat}} mmol/L</span>
-            <span style="width:140px;">身高：{{case_history.height}} cm</span>
-            <span style="width:200px;">体重： kg</span>
-          </div>
-        </div>
         <div class="commonCell">
           <p>主诉</p>
           <div>{{case_history.chief_conplaint}}</div>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -2,6 +2,7 @@
   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
@@ -39,6 +40,13 @@
         </template>
       </el-table-column>
 
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.day" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
@@ -49,7 +57,7 @@
       </el-table-column>
       <el-table-column align="center" prop="retail_price" width="60" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
@@ -66,7 +74,7 @@
 
     <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>
@@ -97,12 +105,14 @@
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.total" style="width:50" placeholder=""></el-input>
+            <div>{{scope.row.unit}}</div>
+
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder=""></el-input>
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -117,16 +127,16 @@
       </el-table-column>
     </el-table>
 
-    <!--<div class="additionalBox">-->
-      <!--<div class="additionalOne" v-for="(item,index) in 8" :key="index">-->
-        <!--<span>治疗费</span>-->
-        <!--<el-input v-model="input" placeholder="" style="width:50px;"></el-input>-->
-        <!--共-->
-        <!--<el-input v-model="input" placeholder="" style="width:50px;"></el-input>-->
-        <!--次-->
-        <!--<i class="el-icon-delete deleteIcon"></i>-->
-      <!--</div>-->
-    <!--</div>-->
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span>{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+        次
+        <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+      </div>
+    </div>
 
 
 
@@ -135,12 +145,13 @@
 
 <script>
   import { getDictionaryDataConfig} from "@/utils/data";
-  import { getInitData,delHisAdvice,delHisProject } from '@/api/his/his'
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
 
   export default {
     props: {
       preDrugs: Array,
       activeType: Number,
+      addtions_charge:Array,
       prescription:{
         type:Object,
         default: function () {
@@ -179,6 +190,41 @@
       }
     },
    methods:{
+     delAddition(index, addition){
+       if(this.prescription.order_status == 2){
+         this.$message.error('该处方已经结算或者退费，无法删除')
+         return
+       }
+       this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
+         confirmButtonText: "确 定",
+         cancelButtonText: "取 消",
+         type: "warning"
+       }).then(() => {
+         this.$nextTick(function(){
+           if(addition.id == 0){
+             this.prescription.addition.splice(index, 1)
+           }else{
+             let params = {
+               'id': addition.id,
+             }
+             delHisAddition(params).then(response => {
+               if (response.data.state == 0) {
+                 this.$message.error(response.data.msg)
+                 return false
+               } else {
+                 var temp2 = this.deepClone(this.prescription.addition)
+                 temp2.splice(index, 1)
+                 this.prescription.addition = temp2
+                 this.$message.success(response.data.data.msg)
+               }
+             })
+           }
+         });
+
+       })
+         .catch(() => {});
+
+     },
       getInitData(){
         getInitData().then(response => {
           if (response.data.state == 0) {
@@ -191,7 +237,7 @@
         })
 
       },deleteDrug:function(index, row){
-       if(this.prescription.order_status >= 2){
+       if(this.prescription.order_status == 2){
          this.$message.error('该处方已经结算或者退费，无法删除')
          return
        }
@@ -267,7 +313,7 @@
          return name
       },
       deleteProject(row,i){
-        if(this.prescription.order_status = 2){
+        if(this.prescription.order_status == 2){
           this.$message.error('该处方已经结算或者退费，无法删除')
           return
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -147,7 +147,8 @@
           {
             name: '处方1',
             advice: [],
-            project: []
+            project: [],
+            addition:[],
           }
         ],
         search_input: '',
@@ -172,7 +173,6 @@
         templatedetail:{},
         detalid:0,
         prescription_id:0,
-        addtions_charge:[],
 
         patientid:0,
         prescriptionList:[],
@@ -231,7 +231,7 @@
 
             if(this.patientTableData.length > 0) {
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.choosePatient(this.patientTableData[0])
+              this.getPatientInfo(this.patientTableData[0])
             }
 
             this.prescriptionList = response.data.data.list.prescription
@@ -239,9 +239,7 @@
 
           }
         })
-      },
-      choosePatient(val) {
-        
+      },getPatientInfo(val){
         this.patientid = val.patients.id
         let params = {
           'record_date': this.record_date,
@@ -254,14 +252,12 @@
           } else {
 
             this.prescriptions = []
-            this.addtions_charge = []
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
 
             this.info = response.data.data.info
 
-            this.addtions_charge = response.data.data.addtions_charge
 
 
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
@@ -301,6 +297,8 @@
                 var prescription = response.data.data.prescription[i]
                 let tempAdvice = []
                 let tempProject = []
+                let tempAddition = []
+
 
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
@@ -311,6 +309,7 @@
                     execution_frequency: prescription.advices[b].execution_frequency,
                     retail_price: prescription.advices[b].price.toString(),
                     remark: prescription.advices[b].remark,
+                    day:prescription.advices[b].day,
                     prescribing_number:prescription.advices[b].prescribing_number.toString(),
                     single_dose_unit:prescription.advices[b].single_dose_unit,
                     prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
@@ -342,6 +341,18 @@
                 }
 
 
+                for (let b = 0; b < prescription.addition.length; b++) {
+                  let obj = {
+                    id: prescription.addition[b].id,
+                    item_name: prescription.addition[b].item_name,
+                    price: prescription.addition[b].price,
+                    count: prescription.addition[b].count,
+                    item_id: prescription.addition[b].item_id,
+                  }
+                  tempAddition.push(obj)
+                }
+
+
 
                 let index = i + 1
                 let obj = {
@@ -349,6 +360,7 @@
                   name: '处方' + index,
                   advices: tempAdvice,
                   project: tempProject,
+                  addition:tempAddition,
                   order_status:prescription.order_status
                 }
                 this.prescriptions.push(obj)
@@ -359,6 +371,7 @@
                 name: '处方' + 1,
                 advices: [],
                 project: [],
+                addition:[],
                 orderStatus:0,
               }
               this.prescriptions.push(obj)
@@ -366,7 +379,145 @@
 
 
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.addition_charge)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info)
+          }
+        })
+
+
+
+      },
+      choosePatient(val) {
+
+        this.patientid = val.patients.id
+        let params = {
+          'record_date': this.record_date,
+          'patient_id': val.patients.id
+        }
+        getPatientInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.prescriptions = []
+            this.patientInfo = response.data.data.xt_info
+            this.hisPatientInfo = response.data.data.his_info
+            this.case_history = response.data.data.case_history
+            var case_history = response.data.data.case_history
+            console.log("case_history22222222",case_history)
+            if (case_history.breathing  == 0) {
+                case_history.breathing = ""
+            }
+            this.case_history = case_history
+            this.info = response.data.data.info
+            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+            if (this.case_history.temperature <= 0) {
+              this.case_history.temperature = ''
+            }
+            if (this.case_history.blood_sugar <= 0) {
+              this.case_history.blood_sugar = ''
+            }
+            if (this.case_history.pulse <= 0) {
+              this.case_history.pulse = ''
+            }
+            if (this.case_history.sbp <= 0) {
+              this.case_history.sbp = ''
+            }
+            if (this.case_history.dbp <= 0) {
+              this.case_history.dbp = ''
+            }
+            if (this.case_history.height <= 0) {
+              this.case_history.height = ''
+            }
+            if (this.case_history.blood_fat <= 0) {
+              this.case_history.blood_fat = ''
+            }
+            if (this.case_history.sick_type <= 0) {
+              this.case_history.sick_type = ''
+            }
+            this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+            if (this.case_history.is_infect == 1) {
+              this.case_history.is_infect = true
+            } else {
+              this.case_history.is_infect = false
+            }
+            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]
+                let tempAdvice = []
+                let tempProject = []
+                let tempAddition = []
+                for (let b = 0; b < prescription.advices.length; b++) {
+                  let obj = {
+                    advice_id: prescription.advices[b].id,
+                    drug_name: prescription.advices[b].advice_name,
+                    single_dose: prescription.advices[b].single_dose,
+                    delivery_way: prescription.advices[b].delivery_way,
+                    execution_frequency: prescription.advices[b].execution_frequency,
+                    retail_price: prescription.advices[b].price.toString(),
+                    remark: prescription.advices[b].remark,
+                    day:prescription.advices[b].day,
+                    prescribing_number:prescription.advices[b].prescribing_number.toString(),
+                    single_dose_unit:prescription.advices[b].single_dose_unit,
+                    prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
+                    medical_insurance_number:prescription.advices[b].med_list_codg,
+                    id:prescription.advices[b].drug_id
+                  }
+                  tempAdvice.push(obj)
+                }
+                for (let b = 0; b < prescription.project.length; b++) {
+                  console.log(prescription.project[b])
+                  console.log(prescription.project[b].project)
+                  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,
+                    number_days: prescription.project[b].day,
+                    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
+                  }
+                  tempProject.push(obj)
+                }
+                for (let b = 0; b < prescription.addition.length; b++) {
+                  let obj = {
+                    id: prescription.addition[b].id,
+                    item_name: prescription.addition[b].item_name,
+                    price: prescription.addition[b].price,
+                    count: prescription.addition[b].count,
+                    item_id: prescription.addition[b].item_id,
+                  }
+                  tempAddition.push(obj)
+                }
+                let index = i + 1
+                let obj = {
+                  id: prescription.id,
+                  name: '处方' + index,
+                  advices: tempAdvice,
+                  project: tempProject,
+                  addition:tempAddition,
+                  order_status:prescription.order_status
+                }
+                this.prescriptions.push(obj)
+              }
+            } else {
+              let obj = {
+                id:0,
+                name: '处方' + 1,
+                advices: [],
+                project: [],
+                addition:[],
+                orderStatus:0,
+              }
+              this.prescriptions.push(obj)
+            }
+            this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
       },
@@ -450,7 +601,7 @@
       },
       handleSelectionChange(val){
        this.selecting_schs = val
-       console.log("99999",this.selecting_schs)
+       // console.log("99999",this.selecting_schs)
       },
       handleClick(){
 

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -5,43 +5,42 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+        <el-input size="small" style="width:150px;" v-model="keywords"
                   class="filter-item"/>
         <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索
         </el-button>
-        <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
+        <el-date-picker v-model="record_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
                         :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
                         placeholder="选择日期时间" align="right"></el-date-picker>
       </div>
       <el-table :data="tableData" border ref="table" 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" label="序号" width="60" type="index"></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+          <template slot-scope="scope">{{ scope.row.patients.name }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="110">
-          <template slot-scope="scope"> {{getTimes(scope.row.record_date)}}</template>
+          <template slot-scope="scope"> {{getTimes(scope.row.info.ctime)}}</template>
 
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
           <!--<template slot-scope="scope">{{}}</template>-->
         <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="处方号">
-          <template slot-scope="scope">{{scope.row.prescription_number}}</template>
+          <template slot-scope="scope">{{scope.row.info.prescription_number}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{scope.row.doctor}}</template>
+          <template slot-scope="scope">{{scope.row.info.doctor}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{ scope.row.diagnosis }}</template>
+          <template slot-scope="scope">{{ scope.row.info.diagnosis }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态">
           <template slot-scope="scope">
-            <div v-if=" scope.row.prescription_status == 1">新建</div>
-            <div v-if=" scope.row.prescription_status == 2">待结算</div>
-            <div v-if=" scope.row.prescription_status == 3">已结算</div>
-            <div v-if=" scope.row.prescription_status == 4">已退费</div>
-
+            <div v-if=" scope.row.info.id == 0">未就诊</div>
+            <div v-if=" scope.row.info.id > 0">已就诊</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="100">
@@ -80,6 +79,11 @@
     },
     data() {
       return {
+        keywords:"",
+        total:0,
+        record_date:"",
+        page:1,
+        limit:10,
         crumbs: [
           { path: false, name: '门诊医生站' },
           { path: false, name: '既往查询' }
@@ -104,28 +108,72 @@
       }
     },
     methods: {
+      searchAction(){
+        this.page = 1;
+        this.limit = 10;
+        this.getHisPrescriptionList()
+
+      },
+      handleScheduleDateChange(){
+        this.page = 1;
+        this.limit = 10;
+        this.getHisPrescriptionList()
+
+      },
+      handleCurrentChange(page) {
+        this.page = page;
+        this.getHisPrescriptionList()
+
+      },
+
+      handleSizeChange(limit) {
+        this.limit = limit;
+        this.getHisPrescriptionList()
+
+
+      },
       getTimes(time) {
-        return uParseTime(time, "{y}-{m}-{d}");
+        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       },
       handerShowDetail(row) {
-        console.log(row)
-        this.$refs.inquiriesDetail.show(row.id)
+        if(row.info.id == 0){
+          this.$message.error("未就诊")
+          return
+        }
+        this.$refs.inquiriesDetail.show(row.info.id)
       }, getHisPrescriptionList() {
-        getHisPrescriptionList().then(response => {
+        let params = {
+          record_date:this.record_date,
+          page: this.page,
+          limit: this.limit,
+          keywords: this.keywords,
+        }
+        getHisPrescriptionList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
             this.tableData = response.data.data.order
+            this.total = response.data.data.total
             this.$nextTick(() => {
               this.$refs.table.doLayout(); //解决表格错位
             });
-
           }
         })
 
       }
     }, created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+
 
       this.getHisPrescriptionList()
 

src/xt_pages/outpatientRegistration/index.vue

@@ -9,12 +9,12 @@
                 <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
                     <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
                         <!-- <el-input  v-model="form.name"></el-input> -->
-                       <el-select v-model="form.name" placeholder="请选择">
+                       <el-select v-model="form.name" placeholder="请选择" @change="changeName">
                             <el-option
                             v-for="item in patient"
                             :key="item.patient_id"
                             :label="item.name"
-                            :value="item.name">
+                            :value="item.patient_id">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -46,11 +46,17 @@
 
                       <el-form-item label="医疗类别：">
                         <el-select v-model="form.medicalCare" placeholder="请选择">
-                            <el-option
+                            <!-- <el-option
                             v-for="item in medicalCare"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
+                            </el-option> -->
+                           <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -86,11 +92,17 @@
 
                    <el-form-item label="社保类型:">
                         <el-select v-model="form.social_type" placeholder="请选择">
-                            <el-option
+                            <!-- <el-option
                             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
                             :key="index"
                             :label="item.name"
                             :value="item.id">
+                            </el-option> -->
+                          <el-option
+                            v-for="item in medicalCare"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -165,8 +177,9 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { basename } from 'path'
-import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient } from "@/api/project/project"
+import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient,getPatientDetail } from "@/api/project/project"
 import { getDictionaryDataConfig } from '@/utils/data'
+import { uParseTime } from "@/utils/tools";
 const moment = require('moment')
 export default {
     components:{
@@ -199,13 +212,16 @@ export default {
                 phone:'',
                 social_type:'',
             },
-            settlement: [{
-                value: 1,
-                label: '医保'
-                }, {
-                value: 2,
-                label: '自费'
-            }],
+          settlement: 
+            [
+              {value: 1,label: '医保'},
+              {value: 2,label: '自费'},
+              {value: 3,label:'公费'},
+              {value: 4,label:'农保'},
+              {value: 5,label:'会员'},
+              {value: 6,label:'职工'},
+              {value: 7,label:'合同'}
+            ],
             sex: [{
                 value: 1,
                 label: '男'
@@ -447,6 +463,14 @@ export default {
              this.is_Name = true
              return
           }
+          var name = ""
+          for(let i=0;i<this.patient.length;i++){
+            if(this.form.name == this.patient[i].patient_id){
+                name = this.patient[i].name
+            }
+          }
+          console.log("name",name)
+          this.form.name  = name
           this.$refs[formName].validate((valid)=>{
              if(valid){
                   if(this.form.costChecked == true){
@@ -480,7 +504,7 @@ export default {
                     social_type:this.form.social_type
                 }
                 console.log("params",params)
-
+                
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -535,6 +559,19 @@ export default {
              
             }
          }
+      },
+      changeName(id){
+        getPatientDetail(id).then(response=>{
+           if(response.data.state == 1){
+             var patient =  response.data.data.patient
+             console.log("patient",patient)
+             this.form.sex = patient.gender 
+             this.form.age = patient.age
+             this.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+             this.form.phone = patient.phone
+             this.form.idCard = patient.id_card_no
+          }
+        })
       }
     },
     created(){

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -79,8 +79,8 @@
                 <el-table-column align="center" prop="name" label="证件号" width='180'>
                     <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
                 </el-table-column>
-                <el-table-column align="center" label="患者保险类型">
-                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.medical_treatment_type)}}</template>
+                <el-table-column align="center" label="社保类型">
+                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
                     <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
@@ -126,6 +126,7 @@ const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisPatientHistory,changePatient,getHisPatient } from "@/api/project/project"
 import { uParseTime } from "@/utils/tools";
+
 export default {
     components:{
         BreadCrumb
@@ -148,8 +149,8 @@ export default {
                 {value: 4,label: "免收诊金"},
                 {value: 5,label: "专家"}
             ],
-            start_time:"",
-            end_time:"",
+            start_time:moment().format("YYYY-MM-DD"),
+            end_time:moment().format("YYYY-MM-DD"),
             limit:20,
             page:1,
             total:0,
@@ -178,6 +179,7 @@ export default {
                 id: 7,
                 name: "生育保险"
             }],
+            
             tablePatient:[]
         }
     },

src/xt_pages/stock/drugs/query.vue

@@ -3,13 +3,14 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="setting"
-        >设置</el-button
-        >
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="setting"
+      >设置
+      </el-button
+      >
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
@@ -26,7 +27,8 @@
           type="primary"
           icon="el-icon-search"
           @click="search"
-        >搜索</el-button
+        >搜索
+        </el-button
         >
       </div>
 
@@ -136,9 +138,9 @@
   import SettingDialog from './settingDialog/index'
 
   export default {
-    name: "stockIn",
+    name: 'stockIn',
     created() {
-      this.GetAllDrugStockQueryList();
+      this.GetAllDrugStockQueryList()
     },
     components: {
       SettingDialog,
@@ -147,29 +149,29 @@
     data() {
       return {
         crumbs: [
-          { path: false, name: "库存管理" },
-          { path: "/stock/drugs/stock/query", name: "药品库存查询" }
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' }
         ],
-        keywords: "",
+        keywords: '',
         total: 0,
         multipleSelection: [],
-        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-        start_time: "",
-        end_time: "",
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
         page: 1,
         limit: 10,
         goodType: [],
         goodInfo: [],
-        tempArr:[],
+        tempArr: [],
         sameRowArr: [],
         WarehouseInfo: {
           loading: false,
           warehouseInfoDate: []
         }
-      };
+      }
     },
     methods: {
-      handleSpanTempArr(){
+      handleSpanTempArr() {
         this.tempArr = []
 
         for (let i = 0; i < this.WarehouseInfo.warehouseInfoDate.length; i++) {
@@ -204,8 +206,6 @@
         })
         this.sameRowArr = sameRowArr
 
-
-
       },
       merge({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
@@ -218,113 +218,116 @@
         }
       },
       GetAllDrugStockQueryList: function() {
-        console.log(this.keywords);
+        console.log(this.keywords)
         const Params = {
           page: this.page,
           limit: this.limit,
           keyword: this.keywords
-        };
-        this.WarehouseInfo.loading = true;
-        this.WarehouseInfo.warehouseInfoDate = [];
+        }
+        this.WarehouseInfo.loading = true
+        this.WarehouseInfo.warehouseInfoDate = []
         getAllDrugStockQueryList(Params).then(response => {
           if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false;
-            this.$message.error(response.data.msg);
-            return false;
+            this.WarehouseInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            this.WarehouseInfo.loading = false;
-            this.total = response.data.data.total;
+            this.WarehouseInfo.loading = false
+            this.total = response.data.data.total
             for (let i = 0; i < response.data.data.list.length; i++) {
 
               this.WarehouseInfo.warehouseInfoDate.push(
                 response.data.data.list[i]
-              );
+              )
             }
             this.handleSpanTempArr()
           }
-        });
+        })
       },
       getSpecificationName: function(id) {
-        let name = "";
+        let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == id) {
-            name = this.goodInfo[i].specification_name;
+            name = this.goodInfo[i].specification_name
           }
         }
-        return name;
+        return name
       },
       getTypeName: function(id) {
-        let name = "";
+        let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == id) {
-            name = this.goodType[i].type_name;
+            name = this.goodType[i].type_name
           }
         }
-        return name;
+        return name
       },
 
-
       handleBack: function() {
-        this.$router.go(-1);
+        this.$router.go(-1)
       },
       handleSizeChange(val) {
-        this.limit = val;
-        this.GetAllDrugStockQueryList();
+        this.limit = val
+        this.GetAllDrugStockQueryList()
       },
       handleCurrentChange(val) {
-        this.page = val;
-        this.GetAllDrugStockQueryList();
+        this.page = val
+        this.GetAllDrugStockQueryList()
       },
       calculate: function(val) {
-        return Math.round(parseFloat(val) * 100) / 100;
+        return Math.round(parseFloat(val) * 100) / 100
       },
       startTimeChange: function() {
-        this.GetAllDrugStockQueryList();
+        this.GetAllDrugStockQueryList()
       },
       endTimeChange: function() {
-        this.GetAllDrugStockQueryList();
+        this.GetAllDrugStockQueryList()
       },
       stockInCount: function(row) {
-        let total = 0;
-          for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
-            total = total + row.query_drug_warehousing_info[i].warehousing_count;
+        let total = 0
+        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
+          total = total + row.query_drug_warehousing_info[i].warehousing_count
         }
-        return total;
+        return total
       },
       salesReturnCount: function(row) {
-        let total = 0;
+        let total = 0
 
-          for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
-            total = total + row.query_drug_sales_return_info[i].count;
+        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
+          total = total + row.query_drug_sales_return_info[i].count
         }
-        return total;
+        return total
       },
       stockOutCount: function(row) {
-        let total = 0;
+        let total = 0
 
-          for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
-            total = total + row.query_drug_warehouseout_info[i].count;
+        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
+          total = total + row.query_drug_warehouseout_info[i].count
         }
-        return total;
+        return total
       },
       cancelStockCount: function(row) {
-        let total = 0;
-          for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
-            total = total + row.query_drug_cancel_stock_info[i].count;
-          }
-        return total;
+        let total = 0
+        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
+          total = total + row.query_drug_cancel_stock_info[i].count
+        }
+        return total
+      },
+      showStockInDetailDialog: function(val) {
+      },
+      showSaleReturnDetailDialog: function() {
+      },
+      showStockOutDetailDialog: function() {
+      },
+      showCancelStockDetailDialog: function() {
       },
-      showStockInDetailDialog: function(val) {},
-      showSaleReturnDetailDialog: function() {},
-      showStockOutDetailDialog: function() {},
-      showCancelStockDetailDialog: function() {},
       search: function() {
-        this.GetAllDrugStockQueryList();
-      },setting:function() {
+        this.GetAllDrugStockQueryList()
+      }, setting: function() {
         this.$refs.dialog.show()
       }
     }
-  };
+  }
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
@@ -336,6 +339,7 @@
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+
   }
 
   .title {
@@ -366,12 +370,14 @@
   .count {
     color: #bd2c00;
   }
+
   .el-table td,
   .el-table th.is-leaf,
   .el-table--border,
   .el-table--group {
     border-color: #d0d3da;
   }
+
   .el-table--border::after,
   .el-table--group::after,
   .el-table::before {

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -0,0 +1,416 @@
+<template>
+  <div>
+    <div class="cell clearfix" style="float: right">
+      <el-button
+        style="float: right"
+        size="small"
+        icon="el-icon-printer"
+        @click="printAction()"
+        type="primary"
+        >打印
+      </el-button>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"> <span class="name">时间</span> : </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == week_type ? 'active' : ''"
+            @click="selectWeekType(item.id)"
+            v-for="item in weekArr"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+      
+      <div  class="title"><span class="name">班 次</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == week_time ? 'active' : ''"
+            @click="selectWeekTime(item.id)"
+            v-for="item in weekTimes"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <el-table
+      :row-style="{ color: '#303133' }"
+      :data="scheduleData"
+      border
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      style="width: 100%"
+    >
+      <el-table-column label="姓名" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.patient }}
+        </template>
+      </el-table-column>
+      <el-table-column label="分区" min-width="70" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.zone.name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="班次" min-width="70" align="center">
+        <template slot-scope="scope">
+          {{ getSchedulesType(scope.row.schedule_type) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="机号" min-width="70" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.number.number }}
+        </template>
+      </el-table-column>
+      <el-table-column label="透析模式" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{
+            scope.row.mode_id && modeOptions[scope.row.mode_id]
+              ? modeOptions[scope.row.mode_id].name
+              : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="透析器" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+        </template>
+      </el-table-column>
+      <el-table-column label="抗凝剂" min-width="100" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 2"
+            >普通肝素</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 3"
+            >低分子肝素</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 4"
+            >阿加曲班</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 5"
+            >枸橼酸钠</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 6"
+            >低分子肝素钙</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 7"
+            >低分子肝素钠</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="总量" min-width="100" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.prescription.anticoagulant == 1">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 2">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 3">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 4">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 5">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 6">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 7">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="长期医嘱" min-width="440" align="center">
+        <template slot-scope="scope">
+          <span style="white-space: pre">{{
+            getAdvice(scope.row.doctor_advice)
+          }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getNextScheduleWeekDay } from "@/api/schedule";
+import WeekItem from "./WeekItem";
+const moment = require('moment')
+export default {
+  name: "tableWeeks",
+  props: {
+    weekTime: {
+      type: String,
+      default: "thisWeek"
+    }
+  },
+
+  data() {
+    return {
+      weekArr: [
+        { id: 1, name: "周一" },
+        { id: 2, name: "周二" },
+        { id: 3, name: "周三" },
+        { id: 4, name: "周四" },
+        { id: 5, name: "周五" },
+        { id: 6, name: "周六" },
+        { id: 7, name: "周日" }
+      ],
+      anticoagulants_confit: null,
+
+      week_type: "1",
+      week_time:0,
+      weekTimes:[
+        {id:0,name:"全部"},
+        {id:1,name:"上午"},
+        {id:2,name:"下午"},
+        {id:3,name:"晚上"},
+      ],
+      weekTitle: ["", "", "", "", "", "", ""],
+      weekData: {
+        Monday: [],
+        Tuesday: [],
+        Wednesday: [],
+        Thursday: [],
+        Friday: [],
+        Saturday: [],
+        Sunday: []
+      },
+      scheduleData: [],
+      modeOptions: null
+    };
+  },
+  watch: {
+  
+    weekTime: function() {
+      
+      var theType = this.weekType(this.weekTime);
+      this.getSchedules(theType);
+    }
+  },
+
+  methods: {
+    printAction() {
+      this.$router.push({
+        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time
+      });
+    },
+    getNextScheduleWeekDay() {
+        const params = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
+      
+      getNextScheduleWeekDay(params).then(response => {
+        this.scheduleData = [];
+        if (response.data.state == 1) {
+          this.scheduleData = response.data.data.schedule;
+          console.log("下周数据",response.data.data.schedule)
+         
+        } else {
+          this.$message.error("网络错误");
+          return false;
+        }
+      });
+    },
+
+    weekType(weekTime) {
+      var theType = 2;
+      switch (weekTime) {
+        case "lastWeek":
+          theType = 1;
+          break;
+        case "thisWeek":
+          theType = 2;
+          break;
+        case "nextWeek":
+          theType = 3;
+          break;
+        case "nextTwoWeek":
+          theType = 4;
+          break;
+        default:
+          theType = 2;
+          break;
+      }
+      return theType;
+    },
+    weekPath(week) {
+      var weekArr = {
+        1: "Monday",
+        2: "Tuesday",
+        3: "Wednesday",
+        4: "Thursday",
+        5: "Friday",
+        6: "Saturday",
+        7: "Sunday"
+      };
+      if (typeof weekArr[week] == "undefined") {
+        return "";
+      }
+      return weekArr[week];
+    },
+    selectWeekType(type) {
+      this.week_type = type;
+      // let params = {
+      //   week_type: this.week_type
+      // };
+      this.getNextScheduleWeekDay();
+    },
+    selectWeekTime(type){
+       this.week_time = type
+       this.getNextScheduleWeekDay()
+    },
+
+    getSchedulesType: function(type) {
+      let type_name = "";
+      switch (type) {
+        case 1:
+          type_name = "上午";
+          break;
+        case 2:
+          type_name = "下午";
+          break;
+        case 3:
+          type_name = "晚上";
+          break;
+      }
+      return type_name;
+    },
+    getAdvice: function(doctor_advice) {
+      if (doctor_advice != null) {
+        let name = "";
+        for (let i = 0; i < doctor_advice.length; i++) {
+          let prescribing_number = "";
+          let single_dose = "";
+          let drug_spec = "";
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number =
+              doctor_advice[i].prescribing_number +
+              doctor_advice[i].prescribing_number_unit;
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose =
+              " 单次用量 " +
+              doctor_advice[i].single_dose +
+              doctor_advice[i].single_dose_unit;
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =
+              doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit;
+          }
+
+          name =
+            name +
+            doctor_advice[i].advice_name +
+            " " +
+            drug_spec +
+            " " +
+            prescribing_number +
+            " " +
+            single_dose +
+            " " +
+            doctor_advice[i].delivery_way +
+            " " +
+            doctor_advice[i].execution_frequency +
+            " " +
+            doctor_advice[i].remark +
+            "\n";
+
+          if (doctor_advice[i].child.length > 0) {
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]["presc"] =
+                  doctor_advice[i].child[a].prescribing_number +
+                  doctor_advice[i].child[a].prescribing_number_unit;
+              } else {
+                doctor_advice[i].child[a]["presc"] = "";
+              }
+
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]["single"] =
+                  " " +
+                  " 单次用量 " +
+                  " " +
+                  doctor_advice[i].child[a].single_dose +
+                  doctor_advice[i].child[a].single_dose_unit;
+              } else {
+                doctor_advice[i].child[a]["single"] = "";
+              }
+
+              name =
+                name +
+                "▲" +
+                doctor_advice[i].child[a].advice_name +
+                "" +
+                doctor_advice[i].child[a].advice_desc +
+                doctor_advice[i].child[a].drug_spec_unit +
+                doctor_advice[i].child[a].presc +
+                doctor_advice[i].child[a].single +
+                "\n";
+            }
+          }
+        }
+        return name;
+      }
+    }
+  },
+  components: {
+    WeekItem
+  },
+  created() {
+    this.modeOptions = this.$store.getters.treatment_mode;
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
+    console.log("抗凝机", this.anticoagulants_confit);
+    this.week_type = new Date().getDay();
+    if (this.week_type == 0) {
+      this.week_type = 7;
+    }
+    this.getNextScheduleWeekDay();
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss">
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -208,6 +208,7 @@ export default {
   },
   watch: {
     weekTime: function() {
+     
       var theType = this.weekType(this.weekTime);
       this.getSchedules(theType);
     }
@@ -224,12 +225,12 @@ export default {
           week_type:this.week_type,
           week_time:this.week_time,
         }
-        console.log("params------",params)
+       
       getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
           this.scheduleData = response.data.data.schdules;
-          console.log("排班-----", this.scheduleData);
+         
         } else {
           this.$message.error("网络错误");
           return false;

src/xt_pages/workforce/next_remind_print.vue

@@ -0,0 +1,348 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-row style="float:right;">
+        <el-col :span="24">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            >打印</el-button
+          >
+        </el-col>
+      </el-row>
+    </div>
+    <div class="app-container" style="background-color: white;">
+      <div id="print_content">
+        <div class="print_main_content">
+          <div class="order_title_panl">
+            <span class="main_title">{{day}}排班提醒（{{ currentDate }}）</span>
+          </div>
+          <div class="table_panel">
+            <table class="table">
+              <thead>
+                <tr>
+                  <!-- <td :width="td_1_width">姓名</td>
+                  <td :width="td_1_width">分区</td>
+                  <td :width="td_1_width">班次</td>
+                  <td :width="td_1_width">机号</td>
+                  <td :width="td_1_width">透析模式</td>
+                  <td :width="td_2_width">透析器</td>
+                  <td :width="td_2_width">抗凝剂</td>
+                  <td :width="td_2_width">低分子肝素</td>
+                  <td :width="td_4_width">长期医嘱</td> -->
+                  <td width="100">姓名</td>
+                  <td width="70">分区</td>
+                  <td width="70">班次</td>
+                  <td width="70">机号</td>
+                  <td width="120">透析模式</td>
+                  <td width="100">透析器</td>
+                  <td width="120">抗凝剂</td>
+                  <td width="100">总量</td>
+                  <td width="300">长期医嘱</td>
+                </tr>
+              </thead>
+              <tbody>
+              <tr v-for="(main_collection, index) in scheduleData" :key="index">
+                <td :width="td_1_width">{{ main_collection.patient}}</td>
+                <td :width="td_1_width">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width">
+                  {{getSchedulesType(main_collection.schedule_type)}}
+                </td>
+                <td :width="td_1_width">
+                  {{main_collection.number.number}}
+
+                </td>
+                <td :width="td_1_width">
+                  {{modeOptions[main_collection.mode_id].name}}
+                </td>
+                <td :width="td_1_width">
+                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
+
+
+                </td>
+                <td :width="td_1_width">
+                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
+
+                </td>
+                <td :width="td_1_width">
+                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                </td>
+                <td :width="td_4_width" style="text-align:left" >
+                  <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getNextScheduleWeekDay } from '@/api/schedule'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  const moment = require('moment') 
+  export default {
+    name: 'SchedulePrint',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '排班提醒' },
+          { path: false, name: '排班提醒打印' }
+        ],
+        scheduleData:[],
+        week_type: 0,
+        day:'',
+        td_1_width: '10%',
+        td_2_width: '10%',
+        td_3_width: '25%',
+        td_4_width: '45%',
+        modeOptions: null,
+        anticoagulants_confit:null,
+        currentDate:'',
+        start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+        end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+      }
+    },
+    components: {
+      BreadCrumb
+    },
+    created() {
+     this.currentDate = this.getCurrentDate()
+      this.modeOptions = this.$store.getters.treatment_mode
+      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+      this.week_type = this.$route.query.week_type
+      this.week_time  = this.$route.query.week_time
+      
+      const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      console.log("打印下周",params)
+      getNextScheduleWeekDay(params).then(rs => {
+        var resp = rs.data
+        console.log(resp)
+        if (resp.state == 1) {
+          this.scheduleData = resp.data.schedule
+        } else {
+          this.$message.error(resp.msg)
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    methods: {
+      getAdvice:function(doctor_advice) {
+        if (doctor_advice != null) {
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++) {
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
+
+          if (doctor_advice[i].child.length > 0) {
+
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+              } else {
+                doctor_advice[i].child[a]['presc'] = ''
+              }
+
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]['single'] = " " + ' 单次用量 ' + " " + doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+              } else {
+                doctor_advice[i].child[a]['single'] = ''
+              }
+
+              name = name + "▲" + doctor_advice[i].child[a].advice_name + ""
+                + doctor_advice[i].child[a].advice_desc
+                + doctor_advice[i].child[a].drug_spec_unit
+                + doctor_advice[i].child[a].presc
+                + doctor_advice[i].child[a].single + "\n"
+            }
+
+          }
+        }
+          return name
+
+
+        }
+
+      },
+      printAction: function() {
+        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+        })
+      }, getSchedulesType: function(type) {
+        let type_name = ''
+        switch (type) {
+          case 1:
+            type_name = '上午'
+            break
+          case 2:
+            type_name = '下午'
+            break
+          case 3:
+            type_name = '晚上'
+            break
+        }
+        return type_name
+      },
+      getCurrentDate: function () {
+        console.log(this.$route.query.week_type)
+        var myDate = new Date();
+        var year = myDate.getFullYear(); //年
+        var month = myDate.getMonth() + 1; //月
+        var day = myDate.getDate() + 7; //日
+        var newday = myDate.getDay();
+        var days = parseInt(this.$route.query.week_type);
+        var dayNum = parseInt(this.$route.query.week_type);
+        switch(days) {
+          case 1:
+            days = '星期一';
+            break;
+          case 2:
+            days = '星期二';
+            break;
+          case 3:
+            days = '星期三';
+            break;
+          case 4:
+            days = '星期四';
+            break;
+          case 5:
+            days = '星期五';
+            break;
+          case 6:
+            days = '星期六';
+            break;
+          case 7:
+            days = '星期日';
+            break;
+        }
+        if(newday > dayNum){
+          let lastDay = day - (newday - dayNum)
+          console.log("lastDay1",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else if(newday < dayNum){
+          let lastDay = day + (dayNum - newday)
+          console.log("lastDay2",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else{
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          return str;
+        }
+        
+        
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 20px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/workforce/remind.vue

@@ -10,12 +10,15 @@
         <el-tab-pane name="thisWeek">
             <span slot="label"><i class="el-icon-date"></i> 本周（{{theWeek.thisWeek}}）</span>
         </el-tab-pane>
-        <!-- <el-tab-pane name="nextWeek">
+        <el-tab-pane name="nextWeek">
             <span slot="label"><i class="el-icon-date"></i> 下一周（{{theWeek.nextWeek}}）</span>
-        </el-tab-pane>  -->
+        </el-tab-pane> 
     </el-tabs>
     <table-push v-if="activeName=='pushTime'"></table-push>
-    <table-weeks v-else :week-time="activeName"> </table-weeks>
+    <!-- <table-weeks v-else :week-time="activeName"> </table-weeks> -->
+     
+   <table-weeks v-if="activeName == 'thisWeek'"> </table-weeks>
+   <nextTableWeeks v-if="activeName =='nextWeek'"></nextTableWeeks>
   </div>
 </div>
 </template>
@@ -23,6 +26,7 @@
 <script>
 import {getWeekPanels} from '@/api/schedule';
 import tableWeeks from './components/tableWeeks'
+import nextTableWeeks from './components/nextTableWeeks'
 import tablePush from './components/tablePush'
 import BreadCrumb from '../components/bread-crumb'
 export default {
@@ -40,7 +44,8 @@ export default {
     components:{
       BreadCrumb,
         tableWeeks,
-        tablePush
+        tablePush,
+        nextTableWeeks
     },
     methods: {
 
@@ -61,10 +66,19 @@ export default {
       },
       handleClick(tab, event) {
         console.log(tab, event);
+      },
+      changeActiveName(val){
+        console.log("val------",val)
+        this.activeName = val
       }
     },
     created(){
         this.getWeekPanels();
+    },
+    watch:{
+      activeName:function(val){
+       console.log("val----",val)
+      }
     }
 };
 </script>