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

src/api/his/his.js

@@ -1,629 +1,517 @@
-import request from "@/utils/request";
-
-
+import request from '@/utils/request'
 
 export function getSchedulePatientList(params) {
   return request({
-    url: "/api/hispatient/list",
-    method: "get",
-    params:params
-  });
+    url: '/api/hispatient/list',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function getPatientInfo(params) {
   return request({
-    url: "/api/hispatient/get",
-    method: "get",
-    params:params
-  });
+    url: '/api/hispatient/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function createCaseHistory(params) {
-  console.log("params",params);
+  console.log('params', params)
   return request({
-    url: "/api/doctorworkstation/casehistory/create",
-    method: "get",
-    params:params
-  });
+    url: '/api/doctorworkstation/casehistory/create',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-
-
-
-
 export function getInitData(params) {
   return request({
-    url: "/api/hisprescription/config",
-    method: "get",
-    params:params
-  });
+    url: '/api/hisprescription/config',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function getDoctors() {
   return request({
-    url: "/api/admin/get",
-    method: "get",
-  });
+    url: '/api/admin/get',
+    method: 'get'
+  })
 }
 
-
-
 export function createHisPrescription(data, params) {
   return request({
-    url: "/api/hisprescription/create",
-    method: "post",
-    data:data,
-    params:params,
-  });
+    url: '/api/hisprescription/create',
+    method: 'post',
+    data: data,
+    params: params
+  })
 }
 
-
-
 export function register(params) {
   return request({
-    url: "/api/register/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/register/get',
+    method: 'get',
+    params: params
+  })
 }
 
 export function upload(params) {
   return request({
-    url: "/api/upload/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/upload/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function delHisPrescription(params) {
   return request({
-    url: "/api/hisprescription/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/hisprescription/delete',
+    method: 'post',
+    params: params
+  })
 }
 
 export function delHisAdvice(params) {
   return request({
-    url: "/api/advice/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/advice/delete',
+    method: 'post',
+    params: params
+  })
 }
 
 export function delHisProject(params) {
   return request({
-    url: "/api/project/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/project/delete',
+    method: 'post',
+    params: params
+  })
 }
 
-
 export function getHisOrderList(params) {
   return request({
-    url: "/api/hisorder/list",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hisorder/list',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function getHisOrder(params) {
   return request({
-    url: "/api/hisorder/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hisorder/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function getHisPrescriptionList(params) {
   return request({
-    url: "/api/hisprescription/list",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hisprescription/list',
+    method: 'get',
+    params: params
+  })
 }
 
-
-export function getHisPrescriptionInfo(params){
+export function getHisPrescriptionInfo(params) {
   return request({
-    url:"/api/hisprescription/info",
-    method:"get",
-    params:params
+    url: '/api/hisprescription/info',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
 export function Refund(params) {
   return request({
-    url: "/api/refund/post",
-    method: "post",
-    params:params,
-  });
+    url: '/api/refund/post',
+    method: 'post',
+    params: params
+  })
 }
 
-
 export function delHisAddition(params) {
   return request({
-    url: "/api/addition_charge/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/addition_charge/delete',
+    method: 'post',
+    params: params
+  })
 }
 
-
-
 export function getDoctorList() {
   return request({
-    url: "/api/doctor/list",
-    method: "get",
-  });
+    url: '/api/doctor/list',
+    method: 'get'
+  })
 }
 
-
 export function getExportConsumeDetailList(params) {
   return request({
-    url: "/api/consumedetail/export",
-    method: "get",
-    params:params
-  });
+    url: '/api/consumedetail/export',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
 export function CreateHisSingleAdviceTemplate(params) {
   return request({
-    url: "/api/hisadvicetemplate/add",
-    method: "post",
-    params:params
-  });
+    url: '/api/hisadvicetemplate/add',
+    method: 'post',
+    params: params
+  })
 }
 
-
-
-
-
 export function DeleteHisAdviceTemplate(id, template_id, parent_id) {
   return request({
     url:
-      "/api/hisadvicetemplate/delete?id=" +
+      '/api/hisadvicetemplate/delete?id=' +
       id +
-      "&template_id=" +
+      '&template_id=' +
       template_id +
-      "&parent_id=" +
+      '&parent_id=' +
       parent_id,
-    method: "delete"
-  });
+    method: 'delete'
+  })
 }
 
-
 export function postHisAdviceTemplate(params, name, advice_type) {
   return request({
     url:
-      "/api/hisadvicetemplate/create?template_name=" +
+      '/api/hisadvicetemplate/create?template_name=' +
       name +
-      "&advice_type=" +
+      '&advice_type=' +
       advice_type,
-    method: "post",
+    method: 'post',
     data: params
-  });
+  })
 }
 
-
-
-
 export function updateHisTemplateName(params) {
   return request({
-    url: "/api/histemplate/modify",
-    method: "post",
-    params:params
-  });
+    url: '/api/histemplate/modify',
+    method: 'post',
+    params: params
+  })
 }
 
-
 export function UpdateHisAdviceTemplate(params) {
   return request({
-    url: "/api/hisadvicetemplate/update",
-    method: "put",
-    params:params
-  });
+    url: '/api/hisadvicetemplate/update',
+    method: 'put',
+    params: params
+  })
 }
 
-
 export function DeleteHisParentAdviceTemplate(id) {
   return request({
-    url: "/api/hisadviceparenttemplate/delete?template_id=" + id,
-    method: "delete",
-  });
+    url: '/api/hisadviceparenttemplate/delete?template_id=' + id,
+    method: 'delete'
+  })
 }
 
-
-export function getAllHisAdviceTemplate () {
+export function getAllHisAdviceTemplate() {
   return request({
     url: '/api/getallhisadvicetemplate',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-
-
-export function getNextOrLastHisPrescription (params) {
+export function getNextOrLastHisPrescription(params) {
   return request({
     url: '/api/hisprescription/get',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-export function getCallHisPrescription (params) {
+export function getCallHisPrescription(params) {
   return request({
     url: '/api/callhisprescription/get',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-export function getDayOrMonthHisPrescription (params) {
+export function getDayOrMonthHisPrescription(params) {
   return request({
     url: '/api/dayprescription/get',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-
-
 export function editHisPrescription(data, params) {
   return request({
-    url: "/api/hisprescription/edit",
-    method: "post",
-    data:data,
-    params:params,
-  });
+    url: '/api/hisprescription/edit',
+    method: 'post',
+    data: data,
+    params: params
+  })
 }
 
-
-
-export function getChargeHisPatientList (params) {
+export function getChargeHisPatientList(params) {
   return request({
     url: '/api/charge/list',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-export function getChargeHisPatientInfo (params) {
+export function getChargeHisPatientInfo(params) {
   return request({
     url: '/api/charge/info',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-export function getHisOrderDetail (params) {
+export function getHisOrderDetail(params) {
   return request({
     url: '/api/orderdetail/get',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-
-
-export function getHisOrderDetailCollect (params) {
+export function getHisOrderDetailCollect(params) {
   return request({
     url: '/api/orderdetaicollect/get',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-export function getList (params) {
+export function getList(params) {
   return request({
     url: '/api/cost/compare',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-export function getRecordList (params) {
+export function getRecordList(params) {
   return request({
     url: '/api/record/list',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-export function getCheckAccountFormData (params) {
+export function getCheckAccountFormData(params) {
   return request({
     url: '/api/comparedata/get',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-export function getHospitalPatientList (params) {
+export function getHospitalPatientList(params) {
   return request({
     url: '/api/hishospitalpatient/list',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-
-
-export function GetHisHospitalChargePatientList (params) {
+export function GetHisHospitalChargePatientList(params) {
   return request({
     url: '/api/hospitalcharge/list',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-export function GetHisHospitalChargePatientInfo (params) {
+export function GetHisHospitalChargePatientInfo(params) {
   return request({
     url: '/api/hospotalcharge/info',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-export function getHisHospitalPrescriptionList (params) {
+export function getHisHospitalPrescriptionList(params) {
   return request({
     url: '/api/hospitalprescription/list',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-
-
-
-
-
-
-
-
-
-
-
 export function getIncomeStatisticsDataList(params) {
   return request({
-    url: "/api/incomestatistics/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/incomestatistics/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-
-
-
 export function saveTeam(data, params) {
   return request({
-    url: "/api/his/saveprojectteam",
-    method: "post",
-    data:data,
-    params:params,
-  });
+    url: '/api/his/saveprojectteam',
+    method: 'post',
+    data: data,
+    params: params
+  })
 }
 
-
-
-
-export function editTeam(params,data) {
+export function editTeam(params, data) {
   return request({
-    url: "/api/his/updateprojectteam",
-    method: "post",
-    data:data,
-    params:params,
-  });
+    url: '/api/his/updateprojectteam',
+    method: 'post',
+    data: data,
+    params: params
+  })
 }
 
-export function createdTemplate(params,data) {
+export function createdTemplate(params, data) {
   return request({
-    url: "/api/hisprescriptiontemplate/create",
-    method: "post",
-    data:data,
-    params:params,
-  });
+    url: '/api/hisprescriptiontemplate/create',
+    method: 'post',
+    data: data,
+    params: params
+  })
 }
 
 export function preSettle(params) {
   return request({
-    url: "/api/presettle/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/presettle/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
 export function getPrivateExpenses(params) {
   return request({
-    url: "/api/privateexpenses/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/privateexpenses/get',
+    method: 'get',
+    params: params
+  })
 }
 
 export function refundNumber(params) {
   return request({
-    url: "/api/refundnumber/post",
-    method: "post",
-    params:params,
-  });
+    url: '/api/refundnumber/post',
+    method: 'post',
+    params: params
+  })
 }
 
-
 export function changeMedType(params) {
   return request({
-    url: "/api/changemedtype/post",
-    method: "post",
-    params:params,
-  });
+    url: '/api/changemedtype/post',
+    method: 'post',
+    params: params
+  })
 }
 
-
 export function refunddetail(params) {
   return request({
-    url: "/api/refunddetail/post",
-    method: "post",
-    params:params,
-  });
+    url: '/api/refunddetail/post',
+    method: 'post',
+    params: params
+  })
 }
 
-
-
-
 export function getPrivateExpensesOrder(params) {
   return request({
-    url: "/api/privateexpensesorder/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/privateexpensesorder/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
 //
 export function getMonthCharge(params) {
   return request({
-    url: "/api/monthcharge/info",
-    method: "get",
-    params:params,
-  });
+    url: '/api/monthcharge/info',
+    method: 'get',
+    params: params
+  })
 }
 
 export function getMonthHisPateintInfo(params) {
   return request({
-    url: "/api/monthhispatient/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/monthhispatient/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-
-
-
-
-
-
-
 export function getAllOrders(params) {
   return request({
-    url: "/api/orders",
-    method: "get",
-    params:params,
-  });
+    url: '/api/orders',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-
-
-
 export function Inhopitalcheck(params) {
   return request({
-    url: "/api/hospital/inhopitalcheck/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hospital/inhopitalcheck/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
 export function Outhopitalcheck(params) {
   return request({
-    url: "/api/hospital/outhopitalcheck/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hospital/outhopitalcheck/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-
 export function Settle(params) {
   return request({
-    url: "/api/hospital/settle/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hospital/settle/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-
-
 export function Inthopitaluncheck(params) {
   return request({
-    url: "/api/hospital/inthopitaluncheck/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hospital/inthopitaluncheck/get',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function Outhopitaluncheck(params) {
   return request({
-    url: "/api/hospital/outhopitaluncheck/get",
-    method: "get",
-    params:params,
-  });
+    url: '/api/hospital/outhopitaluncheck/get',
+    method: 'get',
+    params: params
+  })
 }
 
+export function HopitalunRefund(params) {
+  return request({
+    url: '/api/hospital/refund',
+    method: 'get',
+    params: params
+  })
+}
 
+export function GetSummaryDetail(params) {
+  return request({
+    url: '/api/his/chargestatistics/detail',
+    method: 'get',
+    params: params
+  })
+}
 
-export function  HopitalunRefund(params) {
+export function GetSummary(params) {
   return request({
-    url: "/api/hospital/refund",
-    method: "get",
-    params:params,
-  });
+    url: '/api/his/chargestatistics/summary',
+    method: 'get',
+    params: params
+  })
 }
 
+export function GetSummarySettle(params) {
+  return request({
+    url: '/api/his/chargestatistics/settle',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -258,6 +258,8 @@ export default {
     hospitalRecord:"住院登记",
     hisTool:"HIS工具",
     hospitalCharges:'住院收费',
+
+    summary_tool:'项目消费明细汇总'
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/hisTool.js

@@ -34,6 +34,11 @@ export default {
       component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
       name: 'outpatientSickRecord',
       meta: { title: 'outpatientSickRecord', noCache: true }
+    },{
+      path: '/hisTool/summary',
+      component: () => import('@/xt_pages/outpatientTool/summary'),
+      name: 'outpatientSickRecord',
+      meta: { title: 'summary_tool', noCache: true }
     },
 
   ]

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="prescriptionTable">
-    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+    <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" prop="day" width="70" label="序号">
         <template slot-scope="scope">
@@ -9,15 +10,27 @@
           </div>
         </template>
       </el-table-column>
+
+
       <el-table-column align="center" prop="drug_name" label="名称">
-        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
+        </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+
+      <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:65%;"></el-input>
-            <div>{{scope.row.single_dose_unit}}</div>
+            <el-input v-model="scope.row.single_dose" @input="getAllChange(scope)"
+                      style="width:50%;"></el-input>
+            <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+            <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                       @change="getAllChange(scope)">
+              <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+              <el-option :label="scope.row.drug.dose_unit"
+                         v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
+                         :value="scope.row.drug.dose_unit"></el-option>
+            </el-select>
           </div>
         </template>
       </el-table-column>
@@ -25,51 +38,71 @@
         <template slot-scope="scope">
           <el-select v-model="scope.row.delivery_way" placeholder="请选择">
             <el-option
-              v-for="(item,index) in drugways"
-              :key="index"
-              :label="item.name"
-              :value="item.name">
+                    v-for="(item,index) in drugways"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
             </el-option>
           </el-select>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+          <el-select v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChange(scope)">
             <el-option
-              v-for="item,index in efs"
-              :key="index"
-              :label="item.name"
-              :value="item.name">
+                    v-for="item,index in efs"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
             </el-option>
           </el-select>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
+      <el-table-column align="center" prop="day" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
-
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
+            {{'天'}}
+          </div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+      <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
-            <div> {{scope.row.prescribing_number_unit}}</div>
+            <el-input v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)"
+                      style="width:50%" placeholder=""></el-input>
+            <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
+            <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                       @change="getPrescribingNumberUnit(scope)">
+              <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+              <el-option :label="scope.row.drug.max_unit"
+                         v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
+                         :value="scope.row.drug.max_unit"></el-option>
+            </el-select>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+      <el-table-column align="center" prop="retail_price" width="80" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+            <div>{{'元'}}</div>
+          </div>
 
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="hosp_appr_flag" width="100" label="医院审批标志">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.hosp_appr_flag" placeholder="请选择">
+            <el-option label="审批通过" value="1"></el-option>
+            <el-option label="无须审批" value="3"></el-option>
+            <el-option label="审批不通过" value="2"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
           <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
@@ -81,19 +114,27 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+
+    <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" prop="project_name" label="名称">
-        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
+        <template slot-scope="scope">{{scope.row.type ==
+          2?getGroup(scope.row.statistical_classification):'耗材'}}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
-          <div>{{scope.row.unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)"
+                      placeholder=""></el-input>
+            <div>{{scope.row.unit}}</div>
+          </div>
 
         </template>
       </el-table-column>
@@ -110,13 +151,15 @@
       </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=""></el-input>
+          <el-input v-model="scope.row.execution_frequency" @input="getProjectSingleDose(scope)"
+                    placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <el-input v-model="scope.row.number_days" @input="getProjectSingleDose(scope)"
+                      placeholder=""></el-input>
             <div>{{'天'}}</div>
           </div>
         </template>
@@ -130,10 +173,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="name" width="70" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+            <div>{{'元'}}</div>
+          </div>
 
         </template>
       </el-table-column>
@@ -161,35 +206,34 @@
     </div>
 
 
-
   </div>
 </template>
 
 <script>
-  import { getDictionaryDataConfig} from "@/utils/data";
-  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
+  import { getDictionaryDataConfig } from '@/utils/data'
+  import { delHisAddition, delHisAdvice, delHisProject, getInitData } from '@/api/his/his'
 
   export default {
     props: {
       preDrugs: Array,
       activeType: Number,
-      addtions_charge:Array,
-      prescription:{
-        type:Object,
-        default: function () {
+      addtions_charge: Array,
+      prescription: {
+        type: Object,
+        default: function() {
           return {
-            name:"",
-            advices:[],
-            project:[],
-            drugways:[],
-            efs:[],
-          };
+            name: '',
+            advices: [],
+            project: [],
+            drugways: [],
+            efs: []
+          }
         }
-      },
+      }
     },
     data() {
       return {
-        advices:[],
+        advices: [],
         tableData: [],
         newoptions: [{
           value: '1',
@@ -209,128 +253,126 @@
         }],
         value: '1',
         input: 1,
+        efs: [],
+        drugways: []
       }
     },
 
-   methods:{
-     createFilter(queryString) {
-       return (restaurant) => {
-         return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
-       }
-     },
-     querySearch2(queryString, cb) {
-       var restaurants = this.getDictionaryDataConfig("system","project_use");
-       restaurants.map(item => {
-         item.value = item.name
-       });
-       var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-       // 调用 callback 返回建议列表的数据
-       cb(results)
-     },
-     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(){
+    methods: {
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig('system', 'project_use')
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      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) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
-            this.drugways = response.data.data.drugways;
+            this.drugways = response.data.data.drugways
             this.efs = response.data.data.efs
           }
         })
 
-      },deleteDrug:function(index, row){
-       if(this.prescription.order_status == 2){
-         this.$message.error('该处方已经结算，无法删除');
-         return
-       }
-       this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
-         confirmButtonText: "确 定",
-         cancelButtonText: "取 消",
-         type: "warning"
-       }).then(() => {
-         this.$nextTick(function(){
-           if(row.advice_id == 0){
-             this.prescription.advices.splice(index, 1)
-           }else{
-             let params = {
-               'id': row.advice_id,
-             };
-             delHisAdvice(params).then(response => {
-               if (response.data.state == 0) {
-                 this.$message.error(response.data.msg);
-                 return false
-               } else {
-                 var temp2 = this.deepClone(this.prescription.advices);
-                 temp2.splice(index, 1);
-                 this.prescription.advices = temp2;
-                 this.$message.success(response.data.data.msg)
-               }
-             })
-
-
-           }
-
-         });
-
-
-       })
-         .catch(() => {});
-
-
-
-
-
-      },deepClone(source) {
-       if (!source && typeof source !== 'object') {
-         throw new Error('error arguments', 'shallowClone')
-       }
-       const targetObj = source.constructor === Array ? [] : {};
-       Object.keys(source).forEach((keys) => {
-         if (source[keys] && typeof source[keys] === 'object') {
-           targetObj[keys] = this.deepClone(source[keys])
-         } else {
-           targetObj[keys] = source[keys]
-         }
-       });
-       return targetObj
-     },
-
-      setNewData:function(data){
+      }, deleteDrug: function(index, row) {
+        if (this.prescription.order_status == 2) {
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          this.$nextTick(function() {
+            if (row.advice_id == 0) {
+              this.prescription.advices.splice(index, 1)
+            } else {
+              let params = {
+                'id': row.advice_id
+              }
+              delHisAdvice(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.advices)
+                  temp2.splice(index, 1)
+                  this.prescription.advices = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+
+            }
+
+          })
+
+        })
+                .catch(() => {
+                })
+
+      }, deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+
+      setNewData: function(data) {
         this.prescription = data
 
         // this.prescription.advices = data.advices
@@ -338,41 +380,41 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      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
-             }
+      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
+        }
+        return name
       },
-      deleteProject(row,i){
-        if(this.prescription.order_status == 2){
-          this.$message.error('该处方已经结算，无法删除');
+      deleteProject(row, i) {
+        if (this.prescription.order_status == 2) {
+          this.$message.error('该处方已经结算，无法删除')
           return
         }
-        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        this.$confirm('项目删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          if(row.id == 0){
+          if (row.id == 0) {
             this.prescription.project.splice(i, 1)
 
-          }else{
+          } else {
             let params = {
-              'id': row.id,
-            };
+              'id': row.id
+            }
             delHisProject(params).then(response => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
+                this.$message.error(response.data.msg)
                 return false
               } else {
-                for (let i = 0; i < this.prescription.project.length; i++){
-                  if(this.prescription.project[i].id == row.id){
+                for (let i = 0; i < this.prescription.project.length; i++) {
+                  if (this.prescription.project[i].id == row.id) {
                     this.prescription.project.splice(i, 1)
                   }
                 }
@@ -381,39 +423,146 @@
             })
           }
         })
-          .catch(() => {});
+                .catch(() => {
+                })
 
       },
-      getSingleDose(scope){
-        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      getAllChange(scope) {
+        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+          } else {
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+          }
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+          } else {
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if (scope.row.prescribing_number == 0) {
+          scope.row.prescribing_number = 1
+        }
+        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+          if (scope.row.prescribing_number > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        } else {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        }
+
       },
-      getDay(scope){
-        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      getPrescribingNumberUnit(scope) {
+
+        // console.log('scope',scope)
+        // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+        //   }else{
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number)
+        //   }
+        // }else{
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose)
+        //   }else{
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+        //   }
+        // }
+        // if(scope.row.prescribing_number == 0){
+        //   scope.row.prescribing_number = 1
+        // }
+        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+          scope.row.retail_price = scope.row.drug.min_price
+          if (scope.row.prescribing_number > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        } else {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          scope.row.retail_price = scope.row.drug.retail_price
+        }
       },
-      getProjectSingleDose(scope){
-        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+      changePrescribingNumber(scope) {
+        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+          if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        } else {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }
+      },
+      getProjectSingleDose(scope) {
+        this.prescription.project[scope.$index].total = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.number_days ? scope.row.number_days : 1)
+        if (this.prescription.project[scope.$index].total == 0) {
+          this.prescription.project[scope.$index].total = 1
+        }
       },
-      getProjectDay(scope){
+      getProjectDay(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if (this.prescription.project[scope.$index].total == 0) {
+          this.prescription.project[scope.$index].total = 1
+        }
+
+      },
+      getNum(execution_frequency) {
+        let arr = [
+          { name: '立即执行', count: 1 },
+          { name: '透析时', count: 1 },
+          { name: '透析1h一次', count: 1 },
+          { name: '透析2h一次', count: 1 },
+          { name: '透析3h一次', count: 1 },
+          { name: '每日一次', count: 1 },
+          { name: '每日两次', count: 2 },
+          { name: '每日三次', count: 3 },
+          { name: '每晚一次', count: 1 },
+          { name: '每晚', count: 1 },
+          { name: '上机前', count: 1 },
+          { name: '下机前', count: 1 },
+          { name: '透析后立即', count: 1 },
+          { name: '持续使用', count: 1 },
+          { name: '临时开药', count: 1 },
+          { name: '临睡前', count: 1 },
+          { name: '隔日一次', count: 1 },
+          { name: '隔三日一次', count: 1 },
+          { name: '每二小时一次', count: 12 },
+          { name: '每四小时一次', count: 6 },
+          { name: '每六小时一次', count: 4 },
+          { name: '每八小时一次', count: 3 }
+        ]
+        let num = ''
+        arr.map(item => {
+          if (item.name == execution_frequency) {
+            num = item.count
+          }
+        })
+        if (num == '') {
+          num = 1
+        }
+        return num
       }
-    },mounted(){
+    }, mounted() {
       this.getInitData()
 
     },
-    watch:{
-      // "prescription.advices":{
-      //   handler(newVal,oldVal){
-      //     newVal.map(item => {
-      //       item.prescribing_number = item.single_dose * item.day
-      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
-      //         item.total = item.single_dose * item.number_days
-      //       }
+    watch: {
+      'prescription.advices': {
+        handler(newVal, oldVal) {
 
-
-      //     })
-      //   },
-      //   deep:true
-      // },
+        },
+        deep: true
+      }
       // "prescription.project":{
       //   handler(newVal,oldVal){
       //     newVal.map((item,index) => {
@@ -432,40 +581,46 @@
 
 <style lang="scss">
   .prescriptionTable {
-    .el-input__inner{
-      padding: 0 5px;
-    }
-    .additionalBox{
-      margin-top: 20px;
-      display: flex;
-      flex-wrap: wrap;
-      .additionalOne{
-        margin-right:20px;
-        margin-bottom:10px;
-        display: flex;
-        align-items: center;
-        >span{
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          width:80px;
-          display: inline-block;
-          font-size: 14px;
-        }
-      }
-      .deleteIcon{
-        color:red;
-        margin-left:5px;
-      }
-    }
-    .el-table th .cell, .el-table td .cell {
-      padding: 0 2px;
-      white-space: pre-line;
-    }
 
-    .el-icon-delete {
-      color: red;
-    }
+  .el-input__inner {
+    padding: 0 5px;
+  }
+
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+
+  .additionalOne {
+    margin-right: 20px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+
+  > span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+
+  }
+  .deleteIcon {
+    color: red;
+    margin-left: 5px;
+  }
+
+  }
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+
+  .el-icon-delete {
+    color: red;
+  }
 
   }
 </style>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -26,14 +26,14 @@
                     <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
                     <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>
                 </div>
-                <!--<div class="mainCell">-->
-                    <!--<el-radio-group v-model="schedule_type" @change="changeScheduleType">-->
-                        <!--<el-radio :label="1">上午</el-radio>-->
-                        <!--<el-radio :label="2">下午</el-radio>-->
-                        <!--<el-radio :label="3">晚上</el-radio>-->
-                        <!--<el-radio :label="0">全部</el-radio>-->
-                    <!--</el-radio-group>-->
-                <!--</div>-->
+                <div class="mainCell">
+                    <el-radio-group v-model="schedule_type" @change="changeScheduleType">
+                        <el-radio :label="1">上午</el-radio>
+                        <el-radio :label="2">下午</el-radio>
+                        <el-radio :label="3">晚上</el-radio>
+                        <el-radio :label="0">全部</el-radio>
+                    </el-radio-group>
+                </div>
                 <div class="mainCell">
                     <el-radio-group v-model="radio" @change="change">
                         <el-radio :label="1">未就诊</el-radio>
@@ -347,7 +347,7 @@
         schedule_type: 0,
         record_date: '',
         crumbs: [
-          { path: false, name: '门诊医生站' },
+          { path: false, name: '住院医生站' },
           { path: false, name: '医生工作台' }
         ],
         titleType: '电子处方',
@@ -1116,7 +1116,9 @@
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
                     groupno: prescription.advices[b].groupno,
-                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
+
 
                   }
                   tempAdvice.push(obj)

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -309,26 +309,11 @@
           label: '港澳地区身份证'
         }],
         medicalCare: [{
-          value: 1,
-          label: '职工基本医疗保险'
-        }, {
-          value: 2,
-          label: '公务员医疗补助'
-        }, {
-          value: 3,
-          label: '大额医疗费用补助'
-        }, {
-          value: 4,
-          label: '离休人员医疗'
-        }, {
-          value: 5,
+          value: 390,
           label: '城乡居民基本医疗保险'
         }, {
-          value: 6,
-          label: '城乡居民大病医疗保险'
-        }, {
-          value: 7,
-          label: '生育保险'
+          value: 310,
+          label: '职工基本医疗保险'
         }],
         register: [{
           value: 1,

src/xt_pages/outpatientCharges/listTemplate/printTwo.vue

@@ -251,7 +251,7 @@ export default {
                     }else if(item.med_chrgitm_type == '11'){
                         obj.med_chrgitm_type11.push(item)
                         this.price11 += item.det_item_fee_sumamt
-                    }else if(item.med_chrgitm_type == '14'){
+                    }else if(item.med_chrgitm_type == '14' || item.med_chrgitm_type == '02' ){
                         obj.med_chrgitm_type14.push(item)
                         this.price14 += item.det_item_fee_sumamt
                     }

src/xt_pages/outpatientRegistration/index.vue

@@ -549,28 +549,12 @@
           label: '电子凭证'
         }],
         medicalCare: [{
-          value: 1,
-          label: '职工基本医疗保险'
-        }, {
-          value: 2,
-          label: '公务员医疗补助'
-        }, {
-          value: 3,
-          label: '大额医疗费用补助'
-        }, {
-          value: 4,
-          label: '离休人员医疗'
-        }, {
-          value: 5,
+          value: 390,
           label: '城乡居民基本医疗保险'
         }, {
-          value: 6,
-          label: '城乡居民大病医疗保险'
-        },
-          {
-            value: 7,
-            label: '生育保险'
-          }],
+          value: 310,
+          label: '职工基本医疗保险'
+        }],
         his_registers: [{
           value: 1,
           label: '普通'

src/xt_pages/outpatientTool/components/detail.vue

@@ -0,0 +1,13 @@
+<template>
+
+
+</template>
+<script>
+  export default {
+    name: 'summaryDetail'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientTool/components/gather.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'gather'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientTool/components/settle.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'settle'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientTool/summary.vue

@@ -0,0 +1,312 @@
+<template>
+    <div class="main-contain new-main-contain">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+
+            <div class="mainRight">
+                <div class="mainHeader">
+                    <el-tabs v-model="titleType" @tab-click="handleClick"
+                             style="position: fixed;width: calc(100% - 490px);background:#fff;">
+                        <el-tab-pane label="明细" name="明细"></el-tab-pane>
+                        <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
+                        <el-tab-pane label="结算" name="结算"></el-tab-pane>
+                    </el-tabs>
+
+                </div>
+                <detail v-if="titleType == '明细'"></detail>
+                <settle v-if="titleType == '汇总'"></settle>
+                <gather v-if="titleType == '结算'"></gather>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getDictionaryDataConfig } from '@/utils/data'
+  import { uParseTime } from '@/utils/tools'
+  import { getPrescriptionList } from '@/api/project/project'
+  import SummaryDetail from '../outpatientCharges/summaryDetail'
+  import Settle from './components/settle'
+  import Gather from './components/gather'
+  import Detail from './components/detail'
+
+
+  const moment = require('moment')
+
+  export default {
+    components: {
+      Gather,
+      Settle,
+      Detail,
+      SummaryDetail,
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        titleType: '明细'
+      }
+    },
+    methods: {},
+    created() {
+
+    },
+
+    mounted() {
+
+    },
+    watch: {}
+  }
+</script>
+
+<style lang="scss" scoped>
+    .new-main-contain {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .app-container {
+        height: 100%;
+    }
+
+    .mainCell {
+        height: 36px;
+        display: flex;
+        align-items: center;
+    }
+
+    .mainLeft {
+        width: 200px;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-radio {
+        margin-right: 5px;
+    }
+
+    }
+    .mainRight {
+        margin-left: 10px;
+        flex: 1;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+
+    .cellSpan {
+        min-width: 80px;
+        display: inline-block;
+        margin-right: 10px;
+    }
+
+    }
+    .mainCenter {
+        display: flex;
+        flex: 1;
+    }
+
+    .centerLeft {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+
+    .el-form-item {
+        width: 32%;
+        margin-right: 1%;
+        float: left;
+    }
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .backColor {
+        background: #f6f8f9;
+        height: 5px;
+        margin-bottom: 5px;
+    }
+
+    .tabsBox {
+        position: relative;
+        height: 76%;
+        overflow-y: auto;
+        margin-bottom: 60px;
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    }
+    .preTabs {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-tabs__content {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    }
+
+    .costBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+    }
+
+    .addTab {
+        position: absolute;
+        right: 0;
+        top: 14px;
+        z-index: 20;
+    }
+
+    .centerRight {
+        width: 300px;
+        margin-left: 10px;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+    }
+
+    .rightTab {
+        height: 40px;
+        width: 100%;
+        border: 1px solid #d2d2d2;
+        box-sizing: border-box;
+
+    p {
+        width: 50%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background: #eee;
+        float: left;
+    }
+
+    > p:last-child {
+        border-left: 1px solid #d2d2d2;
+        float: right;
+    }
+
+    .activeP {
+        background: #409EFF;
+        color: #fff;
+    }
+
+    }
+    .comfirmBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .mainHeader {
+        width: 100%;
+        background: #fff;
+        position: fixed;
+        z-index: 100;
+        height: 36px;
+    }
+
+    .titleBox {
+        position: fixed;
+        z-index: 99;
+        background: #fff;
+    }
+
+    .fixedCell {
+        position: fixed;
+        z-index: 99;
+        right: 30px;
+        background: #fff;
+        width: 300px;
+        display: flex;
+        justify-content: space-between;
+    }
+</style>
+
+<style lang="scss">
+    .centerLeft {
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .tabsBox {
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+        padding: 0 10px;
+    }
+
+    .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+        padding: 0 10px;
+    }
+
+    }
+    .centerRight {
+
+    .el-tabs__nav-scroll {
+        display: flex;
+    }
+
+    .el-tabs__nav {
+        margin: 0 auto;
+    }
+
+    .el-table th .cell, .el-table td .cell {
+        padding: 0 2px;
+    }
+
+    }
+    .preTabs {
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .rightTabs {
+        height: 100%;
+
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .centerDialog {
+
+    .el-dialog__body {
+        max-height: calc(100vh - 100px) !important;
+        padding: 0 20px;
+    }
+
+    }
+</style>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -630,7 +630,6 @@ export default {
       } else {
         this.GetWarehouseOut();
       }
-      this.GetWarehouseOut();
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);