Merge remote-tracking branch 'origin/20201109_pc_vue_new_branch' into 20201109_pc_vue_new_branch

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9529"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-     // host: 'xt.test.sgjyun.com',
+    // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+   host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

config/prod.env.js

@@ -9,4 +9,3 @@ module.exports = {
   MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',
   CDM_HOST: '"http://cdm.kuyicloud.com"',
 }
-

src/api/advice.js

@@ -52,7 +52,7 @@ export function ExecDoctorAdvice(patient, id, time, mode,origin) {
     mode: mode,
     origin:origin,
   };
-  console.log("paras------",params)
+ 
   return request({
     url: "/api/patients/advice/exec",
     method: "Post",

src/api/config.js

@@ -148,7 +148,7 @@ export function postMonitorIsOpen(params){
 
 
 export function getMonitorConfig(params){
-  
+
   return request({
     url:"/api/monitor/getmonitorconfig",
     method:"Get",
@@ -158,7 +158,7 @@ export function getMonitorConfig(params){
 
 
 export function addOrderConfig(params){
-  
+
   return request({
     url:"/api/order/addorderconfig",
     method:"Get",
@@ -168,7 +168,7 @@ export function addOrderConfig(params){
 }
 
 export function getOrderConfig(params){
-  
+
   return request({
     url:"/api/order/getorderconfig",
     method:"get",
@@ -177,7 +177,7 @@ export function getOrderConfig(params){
 }
 
 export function changeFuncPrint(params){
-  
+
   return request({
     url:"/api/order/changefuncprint",
     method:"get",
@@ -186,10 +186,21 @@ export function changeFuncPrint(params){
 }
 
 export function getDataPrintList(params){
-  
+
   return request({
     url:"/api/order/getdataprint",
     method:"get",
     params:params
   })
-}
+}
+
+
+
+export function postXtHisProjectIsOpen(params){
+
+  return request({
+    url:"/api/xtconfigproject/isopen",
+    method:"post",
+    params:params
+  })
+}

src/api/data.js

@@ -304,7 +304,23 @@ export function GetDiagnose(params) {
   })
 }
 
+export function getAllDrugList(params){
+  
+  return request({
+    url:"/api/drug/getalldruglist",
+    method:"Get",
+    params:params
+  })
+}
 
+export function postSearchDrugList(keyword,params){
+  
+  return request({
+    url:"/api/drug/postsearchdruglist?keyword="+keyword,
+    method:"get",
+    params:params
+  })
+}
 
 
 

src/api/drug/drug_stock.js

@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 
 export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
-
   return request({
     url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
     method: 'post',
@@ -186,9 +185,9 @@ export function DeleteDrugWarehouseInfoItem(params) {
   })
 }
 
-export function EditDrugWarehouse(params, warehousing_time, id,type,manufacturer_id,dealer_id) {
+export function EditDrugWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugwarehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/drugwarehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -234,9 +233,9 @@ export function deleteDrugSalesReturnInfo(params) {
   })
 }
 
-export function editDrugSalesReturnInfo(params, return_time, id,type,manufacturer_id,dealer_id) {
+export function editDrugSalesReturnInfo(params, return_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugsalesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/drugsalesreturn/edit?return_time=' + return_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -274,9 +273,9 @@ export function getDrugWarehouseOutInfo(params) {
   })
 }
 
-export function editDrugWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id,dealer_id) {
+export function editDrugWarehouseoutInfo(params, warehouse_out_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugwarehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/drugwarehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -290,9 +289,9 @@ export function getDrugCancelStockList(params) {
   })
 }
 
-export function editDrugCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id,dealer_id) {
+export function editDrugCancelStockInfo(params, cancel_stock_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugcancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id=" + dealer_id,
+    url: '/api/drugcancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -345,8 +344,6 @@ export function getStockDetail(params) {
   })
 }
 
-
-
 export function getPrintStockGood(params) {
   return request({
     url: '/api/print/stock',
@@ -355,8 +352,6 @@ export function getPrintStockGood(params) {
   })
 }
 
-
-
 export function getDrugWarehouseOutUser(params) {
   return request({
     url: '/api/drugwarehouseout/user',
@@ -365,79 +360,224 @@ export function getDrugWarehouseOutUser(params) {
   })
 }
 
-
 export function createDrugStockAutomaticReduceConfig(is_open) {
   return request({
-    url: '/api/drugstock/automaticreduce/isopen?is_open='+is_open,
-    method: 'post',
+    url: '/api/drugstock/automaticreduce/isopen?is_open=' + is_open,
+    method: 'post'
   })
 }
 
 export function getDrugStockAutomaticReduceConfig() {
   return request({
     url: '/api/drugstockautomaticreduce/get',
+    method: 'get'
+  })
+}
+
+export function getDrugIndetail(params) {
+  return request({
+    url: '/api/drugstock/getdrugindetail',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugCancelOrder(params) {
+  return request({
+    url: '/api/drugstock/getdrugcancelorder',
     method: 'get',
+    params: params
   })
 }
 
+export function getDrugOutDetail(params) {
+  return request({
+    url: '/api/drugstock/getdrugoutdetail',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getDrugIndetail(params){
+export function getDrugCancelDetail(params) {
   return request({
-    url:"/api/drugstock/getdrugindetail",
-    method:"Get",
-    params:params
+    url: '/api/drugstock/getdrugcanceldetail',
+    method: 'Get',
+    params: params
   })
 }
 
+export function getDrugAutoMaticList(params) {
+  return request({
+    url: '/api/drugstock/getdrugautomaticlist',
+    method: 'Get',
+    params: params
+  })
+}
 
-export function getDrugCancelOrder(params){
-  
-   return request({
-     url:"/api/drugstock/getdrugcancelorder",
-     method:"get",
-     params:params
-   })
+export function getDrugWarehouseOrderInfo(params) {
+  return request({
+    url: '/api/drugstock/getdrugwarehouseorderinfo',
+    method: 'get',
+    params: params
+  })
 }
 
-export function getDrugOutDetail(params){
-  
+export function getDrugStockList(params) {
   return request({
-    url:"/api/drugstock/getdrugoutdetail",
-    method:"get",
-    params:params
+    url: '/api/drugstock/drugstocklist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getDrugCancelDetail(params){
+export function getDrugStockFlow(params) {
+  return request({
+    url: '/api/drugstock/getdrugstockflow',
+    method: 'Get',
+    params: params
+  })
+}
 
+export function getOutDrugStockFlow(params) {
   return request({
-    url:"/api/drugstock/getdrugcanceldetail",
-    method:"Get",
-    params:params
+    url: '/api/drugoutstock/getoutdrugstockflow',
+    method: 'get',
+    params: params
   })
 }
 
+export function getBatchOrderDetail(params) {
+  return request({
+    url: '/api/drug/getbatchorderdetail',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getDrugAutoMaticList(params){
-  
+export function getStockInList(params) {
   return request({
-    url:"/api/drugstock/getdrugautomaticlist",
-    method:"Get",
-    params:params,
+    url: '/api/stock/getstocklistbyid',
+    method: 'Get',
+    params: params
   })
 }
 
+export function getStockOutList(params) {
+  return request({
+    url: '/api/stock/getstockoutlist',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getDrugWarehouseOrderInfo(params){
-   
+export function getDrugCountList(params) {
   return request({
-    url:"/api/drugstock/getdrugwarehouseorderinfo",
-    method:"get",
-    params:params
+    url: '/api/drug/getdrugcountlist',
+    method: 'get',
+    params: params
   })
 }
 
+export function getSinleOrderDetail(params) {
+  return request({
+    url: '/api/drug/getsingleorderdetail',
+    method: 'get',
+    params: params
+  })
+}
 
+export function getAutoDrugDetail(params) {
+  return request({
+    url: '/api/drug/getautodrugdetial',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugOrderInPrint(params) {
+  return request({
+    url: '/api/drug/getdrugorderinprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugOutOrderDetailPrint(params) {
+  return request({
+    url: '/api/drug/getdrugoutorderdetailprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugBatchNumber(params) {
+  return request({
+    url: '/api/drug/getdrugbatchnumber',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function exportDrugList(params) {
+  return request({
+    url: '/api/drug/exportdruglist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getExportOutOrderDrugList(params) {
+  return request({
+    url: '/api/drug/getexportoutorderdruglist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugFlow(params) {
+  return request({
+    url: '/api/drug/getdrugflow',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getCancelStockDetail(params) {
+  return request({
+    url: '/api/drug/getcancelstockdetail',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getCancelDrugOrderPrint(params) {
+  return request({
+    url: '/api/drug/getcanceldrugorderprint',
+    method: 'Get',
+    params: params
+  })
+}
 
+export function getDrugCancelExportList(params) {
+  return request({
+    url: '/api/drug/drugcancelexportlist',
+    method: 'get',
+    params: params
+  })
+}
 
+export function getDrugWarehouseInfoPrint(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseinfoprint',
+    method: 'get',
+    params: params
+  })
+}
 
+export function getDrugOutOrderPrint(params) {
+  return request({
+    url: '/api/drug/getdrugoutorderprint',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/his.js

@@ -429,6 +429,111 @@ export function getHisHospitalPrescriptionList (params) {
 
 
 
+export function getIncomeStatisticsDataList(params) {
+  return request({
+    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,
+  });
+}
+
+
+
+
+export function editTeam(params,data) {
+  return request({
+    url: "/api/his/updateprojectteam",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+export function createdTemplate(params,data) {
+  return request({
+    url: "/api/hisprescriptiontemplate/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+export function preSettle(params) {
+  return request({
+    url: "/api/presettle/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+export function getPrivateExpenses(params) {
+  return request({
+    url: "/api/privateexpenses/get",
+    method: "get",
+    params:params,
+  });
+}
+
+export function refundNumber(params) {
+  return request({
+    url: "/api/refundnumber/post",
+    method: "post",
+    params:params,
+  });
+}
+
+
+export function changeMedType(params) {
+  return request({
+    url: "/api/changemedtype/post",
+    method: "post",
+    params:params,
+  });
+}
+
+
+export function refunddetail(params) {
+  return request({
+    url: "/api/refunddetail/post",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
+export function getPrivateExpensesOrder(params) {
+  return request({
+    url: "/api/privateexpensesorder/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+
+
+
+
+
 
 
 

src/api/his/his_config.js

@@ -0,0 +1,82 @@
+import request from "@/utils/request";
+
+
+
+export function getPatientList(params) {
+  return request({
+    url: "/api/his/patient/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPrescriptionTemplateList(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPrescriptionTemplateInfo(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/info",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+export function createdTemplate(params,data) {
+  return request({
+    url: "/api/his/prescriptiontemplate/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
+
+export function delHisPrescriptionTemplate(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function delHisPrescriptionInfoTemplate(params) {
+  return request({
+    url: "/api/his/prescriptioninfotemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
+export function delHisPrescriptionAdviceTemplate(params) {
+  return request({
+    url: "/api/his/advicetemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function delHisPrescriptionProjectTemplate(params) {
+  return request({
+    url: "/api/his/projecttemplate/delete",
+    method: "post",
+    params:params,
+  });
+}

src/api/patient.js

@@ -70,7 +70,6 @@ export function createPatientDialysisSolution(id, solution, mode) {
 }
 
 export function editPatientDialysisSolution(patient, id, solution, mode) {
-  
   return request({
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id + '&mode=' + mode,
     method: 'put',
@@ -158,18 +157,17 @@ export function getCourseOfDiseaseRecords(patient_id, start_time_ymd, end_time_y
 }
 
 export function createCourseOfDiseaseRecord(patient_id, content, record_time, title) {
-  
   var params = {
     patient_id: patient_id,
     content: content,
     record_time: record_time,
     title: title
   }
-  console.log("params222222",params)
+  console.log('params222222', params)
   return request({
     url: '/api/patient/course/create',
-    method: 'post',
-    data: params
+    method: 'get',
+    params: params
   })
 }
 
@@ -185,8 +183,8 @@ export function modifyCourseOfDiseaseRecord(patient_id, content, record_time, id
   }
   return request({
     url: '/api/patient/course/modify',
-    method: 'post',
-    data: params
+    method: 'get',
+    params: params
   })
 }
 
@@ -376,7 +374,6 @@ export function modifyDryWeightData(params) {
 }
 
 export function deleteDryWeight(id, data) {
- 
   return request({
     url: '/api/patient/deletedryweight?id=' + id,
     method: 'delete',
@@ -384,102 +381,171 @@ export function deleteDryWeight(id, data) {
   })
 }
 
+export function saveVasularAccess(params) {
+  return request({
+    url: '/api/patient/savevasularaccess',
+    method: 'Get',
+    params: params
+  })
+}
 
-export function saveVasularAccess(params){
-   
+export function getAllVascularAccessList(params) {
   return request({
-    url:"/api/patient/savevasularaccess",
-    method:"Get",
-    params:params
+    url: '/api/patient/getallvascualraccesslist',
+    method: 'Get',
+    params: params
   })
-} 
+}
 
-export function getAllVascularAccessList(params){
-  
+export function getVascularAccessByDetail(id, params) {
   return request({
-    url:"/api/patient/getallvascualraccesslist",
-    method:"Get",
-    params:params
+    url: '/api/patient/getvascularaccessbydetial?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updatedVasularAccess(params) {
+  return request({
+    url: '/api/patient/updatevasularaccess',
+    method: 'get',
+    params: params
   })
 }
 
-export function getVascularAccessByDetail(id,params){
-  
+export function DeleteVascularAccess(id, params) {
   return request({
-    url:"/api/patient/getvascularaccessbydetial?id="+id,
-    method:"get",
-    params:params,
+    url: '/api/patient/deletevascularaccess?id=' + id,
+    method: 'get',
+    params: params
   })
 }
 
-export function updatedVasularAccess(params){
-  
+export function savePasswayAssessment(params) {
   return request({
-    url:"/api/patient/updatevasularaccess",
-    method:"get",
-    params:params
+    url: '/api/patient/savepasswayassessment',
+    method: 'get',
+    params: params
   })
 }
 
-export function DeleteVascularAccess(id,params){
-  
+export function getAllPassWayAssessmentList(params) {
   return request({
-    url:"/api/patient/deletevascularaccess?id="+id,
-    method:"get",
-    params:params
+    url: '/api/patient/getallpasswayassessment',
+    method: 'get',
+    params: params
   })
 }
 
-export function savePasswayAssessment(params){
-  
+export function getPassWayAssessmentById(id, params) {
   return request({
-    url:"/api/patient/savepasswayassessment",
-    method:"get",
-    params:params
+    url: '/api/patient/getpasswayassmentbyid?id=' + id,
+    method: 'Get',
+    params: params
   })
 }
 
-export function getAllPassWayAssessmentList(params){
-  
+export function updatePasswayAssessment(params) {
   return request({
-    url:"/api/patient/getallpasswayassessment",
-    method:"get",
-    params:params
+    url: '/api/patient/updatepasswayassesment',
+    method: 'get',
+    params: params
   })
 }
 
-export function getPassWayAssessmentById(id,params){
-  
+export function DeletePassWayAssessMent(id, params) {
   return request({
-    url:"/api/patient/getpasswayassmentbyid?id="+id,
-    method:"Get",
-    params:params,
+    url: '/api/patient/deletepasswayassessment?id=' + id,
+    method: 'get',
+    params: params
   })
 }
 
-export function updatePasswayAssessment(params){
-  
+export function getAccessList(params) {
   return request({
-    url:"/api/patient/updatepasswayassesment",
-    method:"get",
-    params:params
+    url: '/api/patient/getaccesslist',
+    method: 'get',
+    params: params
   })
 }
 
-export function DeletePassWayAssessMent(id,params){
-  
+export function getInitDataList(params) {
   return request({
-    url:"/api/patient/deletepasswayassessment?id="+id,
-    method:"get",
-    params:params
+    url: '/api/patient/getinitdatelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAccessList(params){
-  
+export function getInspectionMajorItem(params) {
   return request({
-    url:"/api/patient/getaccesslist",
-    method:"get",
-    params:params
+    url: '/api/patient/getinspectionmajoritem',
+    method: 'get',
+    params: params
   })
-}
+}
+
+export function getInspectionDetail(params) {
+  return request({
+    url: '/api/patient/getinspectiondetail',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getInspectionItemList(params) {
+  return request({
+    url: '/api/patient/getinspectionitemlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveCreation(params) {
+  console.log('中国龚3223呃3额', params)
+  return request({
+    url: '/api/patient/savecreationinspection',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getTemplateSummaryList(params) {
+  return request({
+    url: '/api/patient/getemlatesummarylist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getTemplateSummaryDetail(params) {
+  return request({
+    url: '/api/patient/gettemplatesummarydetail',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getTemplateSummaryPrintDetail(params) {
+  return request({
+    url: '/api/patient/gettemplatesummaryprintdetail',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function UpdateTemplateSummary(params) {
+  return request({
+    url: '/api/patient/updatetemplatesummary',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteSummary(params) {
+  return request({
+    url: '/api/patient/deletesummary',
+    method: 'Get',
+    params: params
+  })
+}

src/api/project/project.js

@@ -1,5 +1,5 @@
 import request from "@/utils/request";
-import url from "postcss-url";
+
 
 export function saveProject(params){
 
@@ -47,14 +47,14 @@ export function deleteHisProject(id,params){
   })
 }
 
-export function saveProjectTeam(params){
-
-  return request({
-    url:"/api/his/saveprojectteam",
-    methods:"Get",
-    params:params
-  })
-}
+// export function saveProjectTeam(params,data){
+//   return request({
+//     url:"/api/his/saveprojectteam",
+//     methods:"DELETE",
+//     data:data,
+//     params:params,
+//   })
+// }
 
 export function getProjectTeamList(params){
 

src/api/stock.js

@@ -121,7 +121,7 @@ export function GetGoodType(params) {
 }
 
 export function createGoodInfo(params) {
-  console.log("prams",params)
+  console.log('prams', params)
   return request({
     url: '/api/stock/good/info/create',
     method: 'post',
@@ -387,12 +387,6 @@ export function DeleteWarehouseInfoItem(params) {
 }
 
 export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
-  console.log("params",params)
-  console.log("warehousing",warehousing_time)
-  console.log("id",id)
-  console.log("type",type)
-  console.log("manufacturer_id",manufacturer_id)
-  console.log("dealer_id",dealer_id)
   return request({
     url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
@@ -567,55 +561,252 @@ export function getWarehouseOutUser(params) {
   })
 }
 
+export function PostSearchStock(keyword, params) {
+  return request({
+    url: '/api/warehouseout/postsearchstock?keyword=' + keyword,
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetOutStockTotalCount(params) {
+  return request({
+    url: '/api/warehouseout/getoutstocktotalcount',
+    method: 'get',
+    params: params
+  })
+}
+
+export function postGoodInformation(params) {
+  console.log('PARMAS22', params)
+  return request({
+    url: '/api/good/postgoodinformation',
+    method: 'Post',
+    data: params
+  })
+}
+
+export function postDrugInformation(params) {
+  return request({
+    url: '/api/good/postdruginformation',
+    method: 'post',
+    data: params
+  })
+}
+
+export function getInitializtion(params) {
+  return request({
+    url: '/api/good/initializtion',
+    method: 'get',
+    params: params
+  })
+}
 
-export function PostSearchStock(keyword,params){
-  
+export function getWarehouseOrderInfoList(params) {
   return request({
-    url:'/api/warehouseout/postsearchstock?keyword='+keyword,
-    method:"get",
-    params:params
+    url: '/api/good/getwarehouseorderinfolist',
+    method: 'get',
+    params: params
   })
 }
 
-export function GetOutStockTotalCount(params){
-  
+export function postSearchGoodList(keyword, params) {
   return request({
-    url:"/api/warehouseout/getoutstocktotalcount",
-    method:"get",
-    params:params
+    url: '/api/good/postsearchgoodlist?keyword=' + keyword,
+    method: 'Get',
+    params: params
   })
 }
 
-export function postGoodInformation(params){
-  console.log("PARMAS22",params)
+export function getAllStockList(params) {
   return request({
-    url:"/api/good/postgoodinformation",
-    method:"Post",
-    data:params,
+    url: '/api/good/getallstocklist',
+    method: 'get',
+    params: params
   })
 }
 
-export function postDrugInformation(params){
-  
+export function getStockDrugCount(params) {
   return request({
-    url:"/api/good/postdruginformation",
-    method:"post",
-    data:params
+    url: '/api/good/getstockdrugcount',
+    method: 'get',
+    params: params
   })
 }
 
-export function getInitializtion(params){
+export function getOrderDetailByOrderId(params) {
   return request({
-    url:"/api/good/initializtion",
-    method:"get",
-    params:params
+    url: '/api/good/getorderdetialbyorderid',
+    method: 'get',
+    params: params
   })
 }
 
-export function getWarehouseOrderInfoList(params){
-   return request({
-      url:"/api/good/getwarehouseorderinfolist",
-      method:"get",
-      params:params
-   })
-} 
+export function getOrderDetailById(params) {
+  return request({
+    url: '/api/good/getorderdetaibyid',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getSingleOutOrderDetail(params) {
+  return request({
+    url: '/api/good/getsingleoutorderdetail',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getExportStockList(params) {
+  return request({
+    url: '/api/stock/getexportstocklist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getOutExportList(params) {
+  return request({
+    url: '/api/stock/getoutexprotlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSingCancelOrder(params) {
+  return request({
+    url: '/api/stock/getsinglecancelorder',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getCancelStockOrderPrint(params) {
+  return request({
+    url: '/api/stock/getcancelstockorderprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getStockBatchNumber(params) {
+  return request({
+    url: '/api/stock/getstockbatchnumber',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getStockFlow(params) {
+  return request({
+    url: '/api/stock/getstockflow',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getCancelExportList(params) {
+  return request({
+    url: '/api/cancel/getcancelexportlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodDetailPrintList(params) {
+  return request({
+    url: '/api/stock/getgooddetailprintlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function postSearchGoodWarehouseList(params) {
+  return request({
+    url: '/api/stock/postsearchgoodwarehouselist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveAdjustPrice(data) {
+  return request({
+    url: '/api/stock/saveadjustprice',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllStockPrice(params) {
+  return request({
+    url: '/api/stock/getallstockprice',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getCheckedPrice(params) {
+  return request({
+    url: '/api/stock/getcheckprice',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SaveCheckedPrice(params) {
+  return request({
+    url: '/api/stock/savecheckedprice',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAdjustPriceById(params) {
+  return request({
+    url: '/api/stock/getadjustpriceinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveReportStock(data) {
+  return request({
+    url: '/api/stock/savereportstock',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getReportStockList(params) {
+  console.log('params', params)
+  return request({
+    url: '/api/stock/getreportstocklist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SaveCheckedDamage(params) {
+  return request({
+    url: '/api/stock/savecheckdamage',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveInventory(data) {
+  return request({
+    url: '/api/stock/saveinventory',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getInventoryList(params) {
+  return request({
+    url: '/api/stock/getinventorylist',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -61,10 +61,10 @@ export default {
     theme: '换肤',
     clipboardDemo: 'Clipboard',
     i18n: '国际化',
-    medicalScheduling:'医护排班',
-    medicalSchedulingIndex:'排班管理',
-    class:'班种列表',
-    schedulingStatistics:'排班统计',
+    medicalScheduling: '医护排班',
+    medicalSchedulingIndex: '排班管理',
+    class: '班种列表',
+    schedulingStatistics: '排班统计',
     permissionManage: '权限管理',
     adminManage: '员工管理',
     roleManage: '权限管理',
@@ -150,32 +150,32 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
-    otherManagement:'其他管理',
-    drugsExpiryDate:'药品有效期预警',
-    drugsSurplus:'药品剩余预警',
-    drugsQuery:'库存查询',
-    drugsReportLoss:'药品报损',
-    drugsAdjustPrice:'药品调价',
-    drugsStockCancel:'退库单',
-    drugsStockReturn:'退货单',
-    drugsStockOut:'出库单',
-    drugsStockIn:'入库单',
-    stockDrugs:'药品管理',
-    selfPreparedMedicineInfo:'自备药信息',
-    selfPreparedMedicineQuery:'自备药查询',
-    selfPreparedMedicineIndex:'自备药管理',
-    selfPreparedMedicine:'自备药管理',
-    consumablesManagement:'耗材管理',
+    otherManagement: '其他管理',
+    drugsExpiryDate: '药品有效期预警',
+    drugsSurplus: '药品剩余预警',
+    drugsQuery: '库存查询',
+    drugsReportLoss: '药品报损',
+    drugsAdjustPrice: '药品调价',
+    drugsStockCancel: '退库单',
+    // drugsStockReturn:'退货单',
+    drugsStockOut: '出库单',
+    drugsStockIn: '入库单',
+    stockDrugs: '药品管理',
+    selfPreparedMedicineInfo: '自备药信息',
+    selfPreparedMedicineQuery: '自备药查询',
+    selfPreparedMedicineIndex: '自备药管理',
+    selfPreparedMedicine: '自备药管理',
+    consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
     warehouseReceiptOther: '出入库',
     stockInOrder: '入库单',
-    salesReturnOrder: '退货单',
+    // salesReturnOrder: '退货单',
     stockOutOrder: '出库单',
     cancelStockOrder: '退库单',
     otherStockInOrder: '入库单',
-    otherSalesReturnOrder: '退货单',
+    // otherSalesReturnOrder: '退货单',
     otherStockOutOrder: '出库单',
-    otherCancelStockOrder: '退库单',
+    // otherCancelStockOrder: '退库单',
     stockInOrderAdd: '新增入库单',
     salesReturnOrderAdd: '新增退货单',
     stockOutOrderAdd: '新增出库单',
@@ -185,6 +185,14 @@ export default {
     stockOutDetail: '出库单详情',
     cancelStockDetail: '退库单详情',
     stockDetail: '明细查询',
+    stockModifyPrice: '耗材调价',
+    stockDamaged: '耗材报损',
+    stockWarning: '耗材预警',
+    stockInventory: '耗材盘点',
+    drugModifyPrice: '药品调价',
+    drugDamaged: '药品报损',
+    drugWarning: '药品预警',
+    drugInventory: '药品盘点',
 
     showconfig: '显示配置',
     user_detail: '使用明细',
@@ -199,53 +207,54 @@ export default {
     system_prescription: '透析方案模版',
     integration_config: '集成配置',
     his_config: 'HIS集成配置',
-    medical_template:'门诊模版',
+    medical_template: '门诊模版',
     slow: '慢病管理',
     scrm: 'SCRM',
     shop: '分销商城',
 
-    costComparison:'医保费用对照',
-    incomeStatistics:'收入统计',
-    outpatientRegistration:'门诊挂号',
-    outpatientRegistrationIndex:'门诊挂号',
-    hospitalIndex:'住院登记',
-    hospitalChargesManagement:"住院收费管理",
-    outpatientRegistrationRegistrationHistory:'挂号历史',
-    outpatientDoctorStation:"门诊医生站",
-    outpatientDoctorStationDoctorDesk:'医生工作台',
-    outpatientDoctorStationPastInquiries:'既往查询',
-    outpatientDoctorStationTemplateManagement:'模板管理',
-    outpatientCharges:'门诊收费',
-    outpatientChargesManagement:'门诊收费管理',
-    outpatientInvoice:'门诊发票',
-    outpatientRecord:'住院工作站',
-    advancePayment:'预交金',
-    labelPrinting:'标签打印',
-    summary:'项目消费明细汇总',
-    outpatientPharmacy:'门诊药房',
-    pharmacyFormula:'药房配发药',
-    prescriptionDrugReturn:'处方退药',
-    dispensingInquiry:'处方发药查询',
-    drugReturnInquiry:'处方退药查询',
-    signIndex:'签到排队',
-    signIn:'签到窗口',
-    lineUp:'排队窗口',
-    calling:'排队叫号',
-    bedManagement:'床位管理',
-    dictionaryManagement:'字典管理',
-    templateManagement:'模板管理',
-    drugStockUserDetail:"出库人明细",
-    DepartManage:"科室管理",
-    basicConfig:'基础配置',
+    costComparison: '医保费用对照',
+    incomeStatistics: '收入统计',
+    outpatientRegistration: '门诊挂号',
+    outpatientRegistrationIndex: '门诊挂号',
+    hospitalIndex: '住院登记',
+    hospitalChargesManagement: '住院收费管理',
+    outpatientRegistrationRegistrationHistory: '挂号历史',
+    outpatientDoctorStation: '门诊医生站',
+    outpatientDoctorStationDoctorDesk: '医生工作台',
+    outpatientDoctorStationPastInquiries: '既往查询',
+    outpatientDoctorStationTemplateManagement: '模板管理',
+    outpatientCharges: '门诊收费',
+    outpatientChargesManagement: '门诊收费管理',
+    outpatientInvoice: '门诊发票',
+    outpatientRecord: '住院工作站',
+    advancePayment: '预交金',
+    labelPrinting: '标签打印',
+    summary: '项目消费明细汇总',
+    outpatientPharmacy: '门诊药房',
+    pharmacyFormula: '药房配发药',
+    prescriptionDrugReturn: '处方退药',
+    dispensingInquiry: '处方发药查询',
+    drugReturnInquiry: '处方退药查询',
+    signIndex: '签到排队',
+    signIn: '签到窗口',
+    lineUp: '排队窗口',
+    calling: '排队叫号',
+    bedManagement: '床位管理',
+    dictionaryManagement: '字典管理',
+    templateManagement: '模板管理',
+    drugStockUserDetail: '出库人明细',
+    DepartManage: '科室管理',
+    basicConfig: '基础配置',
 
-    histemplate:'处方模版',
-    outpatientSickRecord:"人员定点病种备案",
-    airDisinfect:'空气消毒',
-    objectTableDisinfect:'物表消毒',
+    histemplate: '处方模版',
+    outpatientSickRecord: '人员定点病种备案',
+    airDisinfect: '空气消毒',
+    objectTableDisinfect: '物表消毒',
 
+    hospitalStation: '住院工作站',
+    pastInquiries: '既往查询',
 
-    hospitalStation:"住院工作站",
-    pastInquiries:"既往查询",
+    prescriptionTemplate: '处方模版'
 
   },
   navbar: {
@@ -351,6 +360,8 @@ export default {
     rescue_record: '抢救记录',
     manage_ment: '设备管理',
     nursing_record: '透析护理记录',
-    special_record: '特殊记录'
+    special_record: '特殊记录',
+    template_summary: '治疗小结',
+    template_plan: '个性化方案'
   }
 }

src/router/index_路由未分离前.js

@@ -604,7 +604,7 @@ export const xt_asyncRouterMap = [
         name: 'weight',
         meta: { title: 'weight', noCache: true }
       },
-   
+
       {
         path: '/patients/patient/:id/dialysisRecord',
         component: () => import('@/xt_pages/user/dialysisRecord'),
@@ -784,12 +784,14 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/otherStockInOrder'),
         name: 'otherStockInOrder',
         meta: { title: 'otherStockInOrder', noCache: true }
-      }, {
-        path: '/stock/return',
-        component: () => import('@/xt_pages/stock/salesReturnOrder'),
-        name: 'salesReturnOrder',
-        meta: { title: 'salesReturnOrder', noCache: true }
-      }, {
+      },
+      // {
+      //   path: '/stock/return',
+      //   component: () => import('@/xt_pages/stock/salesReturnOrder'),
+      //   name: 'salesReturnOrder',
+      //   meta: { title: 'salesReturnOrder', noCache: true }
+      // },
+      {
         path: '/stock/return/other',
         component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
         name: 'otherSalesReturnOrder',
@@ -820,19 +822,22 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/stockQuery'),
         name: 'stockQuery',
         meta: { title: 'stockQuery' }
-      }, {
+      },
+      {
         path: '/stock/detail',
         component: () => import('@/xt_pages/stock/stockDetailIndex'),
         name: 'stockDetail',
         meta: { title: 'stockDetail' }
-      }, {
+      },
+      {
         path: '/stock/in/add',
         component: () => import('@/xt_pages/stock/stockInOrderAdd'),
         name: 'stockInOrderAdd',
         hidden: true,
         is_menu: false,
         meta: { title: 'stockInOrderAdd' }
-      }, {
+      },
+      {
         path: '/stock/in/detail',
         component: () => import('@/xt_pages/stock/stockInDetail'),
         name: 'stockInDetail',
@@ -860,21 +865,24 @@ export const xt_asyncRouterMap = [
         hidden: true,
         is_menu: false,
         meta: { title: 'stockOutOrderAdd', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/out/detail',
         component: () => import('@/xt_pages/stock/stockOutDetail'),
         name: 'stockOutDetail',
         hidden: true,
         is_menu: false,
         meta: { title: 'stockOutDetail', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/cancel/add',
         component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
         name: 'cancelStockOrderAdd',
         hidden: true,
         is_menu: false,
         meta: { title: 'cancelStockOrderAdd', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/cancel/detail',
         component: () => import('@/xt_pages/stock/cancelStockDetail'),
         name: 'cancelStockDetail',
@@ -887,8 +895,8 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/index'),
         name: 'config',
         meta: { title: 'config' }
-      },
-     
+      }
+
     ]
   },
   {

src/router/modules/dialysis.js

@@ -399,6 +399,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/thirtySeven',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtySeven'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_thirtySeven',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirtyNine',
       component: () =>
@@ -411,6 +423,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/forty',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_forty'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_forty',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirtyThree_one',
       component: () =>

src/router/modules/drugs.js

@@ -13,40 +13,80 @@ export default {
   },
   children: [
     {
-        path: '/stock/drugs/stock/query',
-        component: () => import('@/xt_pages/stock/drugs/query'),
-        name: 'drugsQuery',
-        meta: { title: 'drugsQuery', noCache: true }
+      path: '/stock/drugs/stock/query',
+      component: () => import('@/xt_pages/stock/drugs/query'),
+      name: 'drugsQuery',
+      meta: { title: 'drugsQuery', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/in',
-        component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
-        name: 'drugsStockIn',
-        meta: { title: 'drugsStockIn', noCache: true }
+      path: '/stock/drugs/stock/in',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
+      name: 'drugsStockIn',
+      meta: { title: 'drugsStockIn', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/out',
-        component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
-        name: 'drugsStockOut',
-        meta: { title: 'drugsStockOut', noCache: true }
+      path: '/stock/drugs/stock/out',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
+      name: 'drugsStockOut',
+      meta: { title: 'drugsStockOut', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/return',
-        component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
-        name: 'drugsStockReturn',
-        meta: { title: 'drugsStockReturn', noCache: true }
+      path: '/stock/drugs/drugModifyPrice',
+      component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
+      name: 'drugModifyPrice',
+      meta: { title: 'drugModifyPrice', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/cancel',
-        component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-        name: 'drugsStockCancel',
-        meta: { title: 'drugsStockCancel', noCache: true }
+      path: '/stock/drugs/drugModifyPricePrint',
+      component: () => import('@/xt_pages/stock/drugs/drugModifyPricePrint'),
+      name: 'drugModifyPricePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugModifyPricePrint', noCache: true }
     },
     {
-      path:'/stock/drugs/stock/detail',
-      component:()=>import('@/xt_pages/stock/drugs/drugIndex'),
-      name:'drugDetail',
-      meta:{title:'明细查询',noCache:true}
+      path: '/stock/drugs/drugDamaged',
+      component: () => import('@/xt_pages/stock/drugs/drugDamaged'),
+      name: 'drugDamaged',
+      meta: { title: 'drugDamaged', noCache: true }
+    },
+    {
+      path: '/stock/drugs/drugWarning',
+      component: () => import('@/xt_pages/stock/drugs/drugWarning'),
+      name: 'drugWarning',
+      meta: { title: 'drugWarning', noCache: true }
+    },
+    {
+      path: '/stock/drugs/drugInventory',
+      component: () => import('@/xt_pages/stock/drugs/drugInventory'),
+      name: 'drugInventory',
+      meta: { title: 'drugInventory', noCache: true }
+    },
+    {
+      path: '/stock/drugs/inventoryPrint',
+      component: () => import('@/xt_pages/stock/drugs/inventoryPrint'),
+      name: 'inventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'inventoryPrint', noCache: true }
+    },
+    // {
+    //   path: '/stock/drugs/stock/return',
+    //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
+    //   name: 'drugsStockReturn',
+    //   meta: { title: 'drugsStockReturn', noCache: true }
+    // },
+    {
+      path: '/stock/drugs/stock/cancel',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
+      name: 'drugsStockCancel',
+      meta: { title: 'drugsStockCancel', noCache: true }
+    },
+    {
+      path: '/stock/drugs/stock/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugIndex'),
+      name: 'drugDetail',
+      meta: { title: '明细查询', noCache: true }
     },
     // {
     //     path: '/stock/drugs/stock/adjustPrice',
@@ -79,7 +119,8 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'drugStockInOrderAdd', noCache: true }
-    },{
+    },
+    {
       path: '/drugstock/in/detail',
       component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
       name: 'drugStockInDetail',
@@ -121,14 +162,23 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
-    },{
+    }, {
       path: '/drugstock/cancel/detail',
       component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
       name: 'cancelDrugStockDetail',
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelDrugStockDetail', noCache: true }
-    },{
+    },
+    {
+      path: '/drugstock/cancel/edit',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderEdit'),
+      name: 'cancelDrugStockOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderEdit', noCache: true }
+    },
+    {
       path: '/drugstock/user/detail',
       component: () => import('@/xt_pages/stock/drugs/drugStockUserDetail'),
       name: 'drugStockUserDetail',
@@ -136,5 +186,86 @@ export default {
       is_menu: false,
       meta: { title: 'drugStockUserDetail', noCache: true }
     },
+
+    // 编辑药品入库单
+    {
+      path: '/drugstock/in/order/edit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderEdit'),
+      name: 'drugStockInOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInOrderEdit', noCache: true }
+    },
+
+    {
+      path: '/drugstock/in/drugstockflow',
+      component: () => import('@/xt_pages/stock/drugs/drugStockFlow'),
+      name: 'drugStockFlow',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockFlow', noCache: true }
+    },
+
+    {
+      path: '/drugstock/in/drugbatchnumber',
+      component: () => import('@/xt_pages/stock/drugs/drugBatchNumber'),
+      name: 'drugBatchNumber',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugBatchNumber', noCache: true }
+    },
+    {
+      path: '/stock/stockoutorderedit',
+      component: () => import('@/xt_pages/stock/stockOutOrderEdit'),
+      name: 'stockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutOrderEdit', noCache: true }
+    },
+    {
+      path: '/stock/in/order/edit',
+      component: () => import('@/xt_pages/stock/stockInOrderEdit'),
+      name: 'stockInOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInOrderEdit' }
+    },
+
+    {
+      path: '/stock/in/stockflow',
+      component: () => import('@/xt_pages/stock/stockFlow'),
+      name: 'stockFlow',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockFlow' }
+    },
+
+    {
+      path: '/stock/in/stockbatchnumber',
+      component: () => import('@/xt_pages/stock/stockBatchNumber'),
+      name: 'stockBatchNumber',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockBatchNumber' }
+    },
+    {
+      path: '/drug/out/drugstockoutorderedit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderEdit'),
+      name: 'drugStockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderEdit' }
+
+    },
+    {
+      path: '/drug/cancel/print',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugOrderPrint'),
+      name: 'cancelDrugOrderPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugOrderPrint' }
+
+    }
+
   ]
 }

src/router/modules/outpatientDoctorStation.js

@@ -24,6 +24,24 @@ export default {
         name: 'outpatientDoctorStationPastInquiries',
         meta: { title: 'outpatientDoctorStationPastInquiries', noCache: true }
     },
+    {
+      path: '/outpatientDoctorStation/prescriptionTemplate',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
+      name: 'prescriptionTemplate',
+      meta: { title: 'prescriptionTemplate', noCache: true }
+    },
+
+    {
+      path: '/outpatientDoctorStation/prescriptionTemplatedetail',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail'),
+      name: 'prescriptionTemplatedetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'prescriptionTemplatedetail', noCache: true }
+    },
+
+
+
     {
         path: '/outpatientDoctorStation/templateManagement',
         component: () => import('@/xt_pages/outpatientDoctorStation/templateManagement'),

src/router/modules/patient.js

@@ -139,7 +139,7 @@ export default {
     }
   },
   {
-    path:"/patients/patients/:id/inspectionInfectious",
+    path: '/patients/patients/:id/inspectionInfectious',
     component: () => import('@/xt_pages/user/inspectionInfectious'),
     hidden: true,
     is_menu: false,
@@ -148,7 +148,17 @@ export default {
       title: 'inspectionInfectious',
       noCache: true
     }
-  
+  },
+  {
+    path: '/patient/patient/:id/templateSummary',
+    component: () => import('@/xt_pages/user/templateSummary'),
+    hidden: true,
+    is_menu: false,
+    name: 'templateSummary',
+    meta: {
+      title: 'templateSummary',
+      noCache: true
+    }
   },
   {
     path: '/patients/course',
@@ -182,7 +192,8 @@ export default {
       title: 'proeducation',
       noCache: true
     }
-  }, {
+  },
+  {
     path: '/course/print',
     component: () => import('@/xt_pages/user/coursePrint'),
     hidden: true,
@@ -192,6 +203,17 @@ export default {
       title: 'coursePrint',
       noCache: true
     }
+  },
+  {
+    path: '/patient/patient/templateSummary/print',
+    component: () => import('@/xt_pages/user/templateSummaryPrint'),
+    hidden: true,
+    is_menu: false,
+    name: 'templateSummary',
+    meta: {
+      title: 'templateSummary',
+      noCache: true
+    }
   }
   ]
 }

src/router/modules/selfPreparedMedicine.js

@@ -21,30 +21,30 @@ export default {
     },
 
     {
-        path: '/stock/selfPreparedMedicineIndex',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-        name: 'selfPreparedMedicineIndex',
-        meta: { title: 'selfPreparedMedicineIndex', noCache: true }
+      path: '/stock/selfPreparedMedicineIndex',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
+      name: 'selfPreparedMedicineIndex',
+      meta: { title: 'selfPreparedMedicineIndex', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineQuery',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
-        name: 'selfPreparedMedicineQuery',
-        meta: { title: 'selfPreparedMedicineQuery', noCache: true }
+      path: '/stock/selfPreparedMedicineQuery',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
+      name: 'selfPreparedMedicineQuery',
+      meta: { title: 'selfPreparedMedicineQuery', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineQueryPrint',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
-        name: 'selfPreparedMedicineQueryPrint',
-        hidden: true,
-        is_menu: false,
-        meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
+      path: '/stock/selfPreparedMedicineQueryPrint',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
+      name: 'selfPreparedMedicineQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineInfo',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
-        name: 'selfPreparedMedicineInfo',
-        meta: { title: 'selfPreparedMedicineInfo', noCache: true }
+      path: '/stock/selfPreparedMedicineInfo',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
+      name: 'selfPreparedMedicineInfo',
+      meta: { title: 'selfPreparedMedicineInfo', noCache: true }
     },
     {
       path: '/stock/stockprint',
@@ -53,40 +53,40 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
-     },
-     {
-       path:"/stock/selfstockprint",
-       component:()=>import('@/xt_pages/stock/selfStockPrint'),
-       name:'selfStockQuery',
-       hidden:true,
-       is_menu:false,
-       meta:{title:'selfStockPrint',noCache:true}
-     },
+    },
+    {
+      path: '/stock/selfstockprint',
+      component: () => import('@/xt_pages/stock/selfStockPrint'),
+      name: 'selfStockQuery',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'selfStockPrint', noCache: true }
+    },
 
-     {
+    {
       path: '/stock/stockprint',
       component: () => import('@/xt_pages/stock/stockPrint'),
       name: 'stockqueryprint',
       hidden: true,
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
-     },
+    },
 
-     {
+    {
       path: '/stock/in/detail/print',
       component: () => import('@/xt_pages/stock/stockInOrderDetailPrint'),
       name: 'stockInDetailPrint',
       hidden: true,
       is_menu: false,
-      meta: { title: 'stockInDetailPrint',noCache: true }
+      meta: { title: 'stockInDetailPrint', noCache: true }
     },
     {
-      path: '/stock/out/detail',
+      path: '/stock/out/detail/print',
       component: () => import('@/xt_pages/stock/stockOutOrderDetailPrint'),
       name: 'stockOutDetailPrint',
       hidden: true,
       is_menu: false,
-      meta: { title: 'stockOutDetailPrint',noCache: true }
-    },
+      meta: { title: 'stockOutDetailPrint', noCache: true }
+    }
   ]
 }

src/router/modules/stock.js

@@ -24,12 +24,12 @@ export default {
       name: 'stockInOrder',
       meta: { title: 'stockInOrder', noCache: true }
     },
-    {
-      path: '/stock/return',
-      component: () => import('@/xt_pages/stock/salesReturnOrder'),
-      name: 'salesReturnOrder',
-      meta: { title: 'salesReturnOrder', noCache: true }
-    },
+    // {
+    //   path: '/stock/return',
+    //   component: () => import('@/xt_pages/stock/salesReturnOrder'),
+    //   name: 'salesReturnOrder',
+    //   meta: { title: 'salesReturnOrder', noCache: true }
+    // },
     {
       path: '/stock/out',
       component: () => import('@/xt_pages/stock/stockOutOrder'),
@@ -42,7 +42,47 @@ export default {
       name: 'cancelStockOrder',
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-    
+    {
+      path: '/stock/stockModifyPrice',
+      component: () => import('@/xt_pages/stock/stockModifyPrice'),
+      name: 'stockModifyPrice',
+      meta: { title: 'stockModifyPrice', noCache: true }
+    },
+    {
+      path: '/stock/stockModifyPricePrint',
+      component: () => import('@/xt_pages/stock/stockModifyPricePrint'),
+      name: 'stockModifyPricePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockModifyPricePrint', noCache: true }
+    },
+    {
+      path: '/stock/stockDamaged',
+      component: () => import('@/xt_pages/stock/stockDamaged'),
+      name: 'stockDamaged',
+      meta: { title: 'stockDamaged', noCache: true }
+    },
+    {
+      path: '/stock/stockWarning',
+      component: () => import('@/xt_pages/stock/stockWarning'),
+      name: 'stockWarning',
+      meta: { title: 'stockWarning', noCache: true }
+    },
+    {
+      path: '/stock/stockInventory',
+      component: () => import('@/xt_pages/stock/stockInventory'),
+      name: 'stockInventory',
+      meta: { title: 'stockInventory', noCache: true }
+    },
+    {
+      path: '/stock/inventoryPrint',
+      component: () => import('@/xt_pages/stock/inventoryPrint'),
+      name: 'inventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'inventoryPrint', noCache: true }
+    },
+
     // {
     //   path: "/stock/",
     //   component: Layout,
@@ -93,7 +133,7 @@ export default {
     //     }
     //   ]
     // },
-    
+
     {
       path: '/stock/detail',
       component: () => import('@/xt_pages/stock/stockDetailIndex'),
@@ -202,19 +242,19 @@ export default {
       }
     },
     {
-      path:"/stock/drugcancelprint",
-      component:()=>import('@/xt_pages/stock/drugs/drugCancelOurderPrint'),
+      path: '/stock/drugcancelprint',
+      component: () => import('@/xt_pages/stock/drugs/drugCancelOurderPrint'),
       hidden: true,
       is_menu: false,
       name: 'stock_print',
       meta: {
-        title: '库存打印',
+        title: '退库打印',
         noCache: true
       }
     },
     {
-      path:"/stock/drugoutorderprint",
-      component:()=>import('@/xt_pages/stock/drugs/drugOutOrderPrint'),
+      path: '/stock/drugoutorderprint',
+      component: () => import('@/xt_pages/stock/drugs/drugOutOrderPrint'),
       hidden: true,
       is_menu: false,
       name: 'stock_print',
@@ -224,8 +264,8 @@ export default {
       }
     },
     {
-      path:"/stock/drugcanceldetaiprint",
-      component:()=>import('@/xt_pages/stock/drugs/drugCancelDetailPrint'),
+      path: '/stock/drugcanceldetaiprint',
+      component: () => import('@/xt_pages/stock/drugs/drugCancelDetailPrint'),
       hidden: true,
       is_menu: false,
       name: 'stock_print',
@@ -269,5 +309,28 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/stock/cancel/cancelstockorderedit',
+      component: () => import('@/xt_pages/stock/cancelStockOrderEdit'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugQueryPrint',
+      meta: {
+        title: '耗材退库打印',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/stock/drugs/cancelstockorderprint',
+      component: () => import('@/xt_pages/stock/cancelStockOrderPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '退库打印',
+        noCache: true
+      }
+    }
   ]
 }

src/store/modules/globalConfig.js

@@ -706,6 +706,21 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      11: {
+        id: 11,
+        name: '那曲肝素',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {
@@ -1866,49 +1881,49 @@ const global_config = {
       id: 27,
       name: '万u'
     }, {
-        id: 28,
-        name: '片'
-      },{
-        id: 29,
-        name: '只'
-      },{
-        id: 30,
-        name: '次'
-      },{
-        id: 31,
-        name: '米'
-      },{
-        id: 32,
-        name: '对'
-      },
-      {
-        id: 31,
-        name: '米'
-      },
-      {
-        id: 32,
-        name: '对'
-      },
-      {
-        id: 33,
-        name: '万份'
-      },
-      {
-        id: 34,
-        name: '副'
-      },
-      {
-        id: 35,
-        name: '本'
-      },
-      {
-        id: 36,
-        name: '轴'
-      },
-      {
-        id: 37,
-        name: '辆'
-      },
+      id: 28,
+      name: '片'
+    }, {
+      id: 29,
+      name: '只'
+    }, {
+      id: 30,
+      name: '次'
+    }, {
+      id: 31,
+      name: '米'
+    }, {
+      id: 32,
+      name: '对'
+    },
+    {
+      id: 31,
+      name: '米'
+    },
+    {
+      id: 32,
+      name: '对'
+    },
+    {
+      id: 33,
+      name: '万份'
+    },
+    {
+      id: 34,
+      name: '副'
+    },
+    {
+      id: 35,
+      name: '本'
+    },
+    {
+      id: 36,
+      name: '轴'
+    },
+    {
+      id: 37,
+      name: '辆'
+    }
     ],
     body_fluid: [{
       id: 1,

src/views/layout/Layout.vue

@@ -346,4 +346,7 @@ export default {
   .new-main-container{
     width: calc(100% - 220px);
   }
+  .sidebar-container{
+    transform: translate3d(0, 0, 0) !important;
+  }
 </style>

src/xt_pages/data/basicConfig.vue

@@ -26,6 +26,15 @@
           </p>
         </div>
 
+        <div class="configBox">
+            <p style="font-size:18px;font-weight:bold">处方项目同步到临时医嘱</p>
+            <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方的项目同步后，护士则在血透的临时医嘱中可以看到相关的耗材/检验检查数据</p>
+            <p style="margin-top:20px;">门诊处方项目同步到透析医嘱：
+                <el-switch v-model="is_open_xt_his_project" @change="changeFuncProject"></el-switch>
+            </p>
+        </div>
+
+
         <!-- <div class="configBox">
           <p style="font-size:18px;font-weight:bold">血压数据自动获取</p>
           <p style="font-size:14px;margin-top:5px;color:#333;">在联机的状态下,开启透析监测-血压数据自动获取功能后,则不需要手动输入,数据会自动上传到监测中</p>
@@ -71,14 +80,14 @@
                 <!--<el-switch v-model="value"></el-switch>-->
             <!--</p>-->
         <!--</div>-->
-        
+
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -95,6 +104,7 @@ export default {
       is_open_monitor:false,
       is_open_order:false,
       is_open_print:false,
+      is_open_xt_his_project: false,
     };
   },
   methods: {
@@ -104,10 +114,18 @@ export default {
           if (response.data.state === 1) {
             if(response.data.data.is_open_xt_his == 1) {
               this.is_open_xt_his = true
+
             }else{
               this.is_open_xt_his = false
             }
 
+            if(response.data.data.is_open_xt_his_project == 1) {
+              this.is_open_xt_his_project = true
+
+            }else{
+              this.is_open_xt_his_project = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -146,6 +164,38 @@ export default {
         )
       }
     },
+    changeFuncProject(val){
+      if(this.is_open_xt_his_project){
+        let params={
+          is_open:this.is_open_xt_his_project
+        }
+        postXtHisProjectIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his_project = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }else{
+        let params={
+          is_open:this.is_open_xt_his_project
+        }
+        postXtHisProjectIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his_project = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }
+    },
+
 
     changeFuncTwo(){
       console.log("3333333",this.is_open_monitor)
@@ -193,7 +243,7 @@ export default {
        }
       let params = {
          is_open:is_open,
-       } 
+       }
       addOrderConfig(params).then(response=>{
          if(response.data.state == 1){
            var config = response.data.data.config
@@ -224,11 +274,11 @@ export default {
       }
       if(val == false){
         is_open = 0
-      } 
+      }
       var params = {
         is_open:is_open,
       }
-     
+
       changeFuncPrint(params).then(response=>{
          if(response.data.state == 1){
            var dataPrint =  response.data.data.dataPrint

src/xt_pages/data/components/addConsumable.vue

@@ -48,9 +48,53 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="规格型号 : " prop="name" style="width:100%">
+                        <!-- <el-form-item label="规格型号 : " prop="name" style="width:100%">
                             <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
+                        </el-form-item> -->
+                       <div style="width:100%;">
+                          <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                        </div>
+                       <div style="width:100%;display:flex;align-items:center;">
+                            <el-form-item prop="dosage" class="noMargin">
+                              <el-input v-model="form.dosage" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                            </el-form-item>
+                            <el-form-item prop="max_unit" class="noMargin">
+                              <el-select v-model="form.max_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                            </el-select>
+                          </el-form-item>
+                            *
+                            <el-form-item prop="min_number" class="noMargin">
+                              <el-input v-model="form.min_number" style="width:100px" type="number" placeholder="拆零"> </el-input>
+                            </el-form-item>
+                            <el-form-item prop="min_unit" class="noMargin">
+                              <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                              </el-select>
+                          </el-form-item>
+                          /
+                          <el-form-item prop="packing_unit" class="noMargin">
+                            <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                            </el-select>
+                          </el-form-item>
+                        </div>
+                       
                         <el-form-item label="生产厂商 : " prop="name" style="width:100%">
                             <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
                                 <el-option

src/xt_pages/data/components/addDrugs.vue

@@ -9,31 +9,17 @@
         <el-tabs v-model="activeName">
             <el-tab-pane label="基础数据" name="first">
                 <div>
-                    <el-form :model="form" :rules="rules" ref="form" label-width="120px"
-                             style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+                    <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                         <el-form-item label="药品名称 : " prop="drug_name">
                             <el-input v-model="form.drug_name" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="拼音 : ">
-                            <el-input v-model="form.pinyin" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="五笔 : ">
-                            <el-input v-model="form.wubi" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
+
                         <el-form-item label="药品别名 : ">
                             <el-input v-model="form.drug_alias" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="别名拼音 : " prop="drug_alias_pinyin">
-                            <el-input v-model="form.drug_alias_pinyin" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="别名五笔 : " prop="drug_alias_wubi">
-                            <el-input v-model="form.drug_alias_wubi" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
+
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -44,10 +30,51 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="药品规格 : " prop="drug_spec">
-                            <el-input v-model="form.drug_spec" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
+                        <div style="width:100%;">
+                          <div><span style="width:120px;text-align:right;display:inline-block;margin-bottom:10px;"><span style="color:red;">*</span>单位&规格：</span><span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                        </div>
+                        <div style="width:100%;display:flex;align-items:center;margin-left:120px;">
+                            <el-form-item prop="dose" class="noMargin">
+                              <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" :disabled="dosageShow"></el-input>
+                            </el-form-item>
+                            <el-form-item prop="dose_unit" class="noMargin">
+                              <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeDoseUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                              </el-select>
+                            </el-form-item>
+                            <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">*</span>
+                            <el-form-item prop="min_number" class="noMargin">
+                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;" :disabled="minNumberShow" type="number" placeholder="拆零"> </el-input>
+                            </el-form-item>
+                            <el-form-item prop="min_unit" class="noMargin">
+                              <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                              </el-select>
+                            </el-form-item>
+                          <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">/</span>
+                          <el-form-item prop="max_unit" class="noMargin">
+                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位" @change="changeMaxUnit">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                            </el-select>
+                          </el-form-item>
+                        </div>
+
+
                         <el-form-item label="药品类型 : " prop="drug_type">
                             <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -58,7 +85,67 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="库存警戒:" prop="drug_stock_limit">
+
+                      <el-form-item label="默认给药途径:" prop="delivery_way">
+                        <el-select v-model="form.delivery_way" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="(item, index) in deliveryWayOptions"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.name">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="默认执行频率:" prop="execution_frequency">
+                        <el-select v-model="form.execution_frequency" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="(item,index) in executionFrequencyOptions"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.name">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="默认单次用量 : " prop="drug_dose">
+                         <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
+                                      maxlength="30"></el-input>
+                          <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
+                                <el-option
+                                        v-for="(item,index) in unitList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                           </el-select>
+                     </el-form-item>
+                    <el-form-item label="默认开药数量:" prop="prescribing_number">
+                        <el-input v-model="form.prescribing_number" style="width:70px;margin-right:5px;" placeholder=""
+                                  maxlength="30"></el-input>
+                        <el-select v-model="form.prescribing_number_unit" style="width:80px;" placeholder="开药数量单位">
+                              <el-option
+                                v-for="(item,index) in packingUnit"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                          </el-select>
+                    </el-form-item>
+                     <!-- <el-form-item label="开药数量单位:" prop="prescribing_number">
+                          <el-select v-model="form.prescribing_number_unit" style="width:160px;" placeholder="开药数量单位">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                          </el-select>
+                    </el-form-item> -->
+                    <el-form-item label="默认开药天数:" prop="prescribing_number">
+                        <el-input v-model="form.drug_day" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
+                    </el-form-item>
+                       <el-form-item label="库存警戒:" prop="drug_stock_limit">
                             <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
@@ -86,35 +173,20 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="最大单位 : " prop="max_unit">
-                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                        v-for="item,index in getDataConfig('hemodialysis','units')"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.name">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="最小单位 : " prop="min_unit">
-                            <el-select v-model="form.min_unit" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                        v-for="item,index in getDataConfig('hemodialysis','units')"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.name">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="单位换算 : ">
+
+                        <!-- <el-form-item label="单位换算 : ">
                             <el-input v-model="form.unit_matrixing" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
+                        </el-form-item> -->
+                        <el-form-item label="拆零零售价(元) : " prop="min_price">
+                            <el-input v-model="form.min_price" style="width:160px;" placeholder=""
+                                      maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="零售价(元) : " prop="retail_price">
-                            <el-input v-model="form.retail_price" style="width:160px;" placeholder=""
+                        <el-form-item label="包装零售价(元) : " prop="retail_price">
+                          <el-input v-model="form.retail_price" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="上次进价(元) : " prop="last_price">
+                        <el-form-item label="进货价(元) : " prop="last_price">
                             <el-input v-model="form.last_price" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
@@ -142,24 +214,13 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="剂量 : " prop="drug_dose">
-                            <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
-                                      maxlength="30"></el-input>
-                            <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="请选择">
-                                <el-option
-                                        v-for="item,index in getDataConfig('hemodialysis','units')"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+
 
 
                         <el-form-item label="限制性用药 : ">
                             <el-select v-model="form.lmt_used_flag" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in lmt_used_flags"
+                                        v-for="(item,index) in lmt_used_flags"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
@@ -171,7 +232,7 @@
                         <el-form-item label="审批标志 : ">
                             <el-select v-model="form.hosp_appr_flag" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in hosp_appr_flags"
+                                        v-for="(item,index) in hosp_appr_flags"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
@@ -185,14 +246,6 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
-                            <!-- <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
-                              <el-option
-                                v-for="item,index in manufacturers"
-                                :key="index"
-                                :label="item.manufacturer_name"
-                                :value="item.id">
-                              </el-option>
-                            </el-select> -->
 
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
                                 <el-option
@@ -230,7 +283,7 @@
                         <el-form-item label="是否特病目录:" prop="is_special_diseases">
                             <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in options"
+                                        v-for="(item,index) in options"
                                         :key="index"
                                         :label="item.label"
                                         :value="item.value">
@@ -240,7 +293,7 @@
                         <el-form-item label="是否备案 : " prop="is_record">
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in options"
+                                        v-for="(item,index) in options"
                                         :key="index"
                                         :label="item.label"
                                         :value="item.value">
@@ -251,7 +304,7 @@
                         <el-form-item label="处方药标志">
                             <el-select v-model="form.prescription_mark" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in options"
+                                        v-for="(item,index) in options"
                                         :key="index"
                                         :label="item.label"
                                         :value="item.value">
@@ -260,11 +313,14 @@
                         </el-form-item>
 
                         <el-form-item label="社保目录编码">
-                            <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
+                            <el-input v-model="form.social_security_directory_code" style="width:160px"></el-input>
                         </el-form-item>
 
+
+
                         <el-form-item label="备案日期:">
                             <el-date-picker
+                                    style="width:160px"
                                     value-format="yyyy-MM-dd"
                                     v-model="form.record_date"
                                     type="date"
@@ -273,11 +329,8 @@
                         </el-form-item>
 
                         <el-form-item label="药品备注:">
-                            <el-input v-model="form.drug_remark" style="width:180px"></el-input>
+                            <el-input v-model="form.drug_remark" style="width:160px"></el-input>
                         </el-form-item>
-                        <!-- <el-form-item label="代理商 : " prop="agent">
-                          <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item> -->
 
                         <el-form-item label="经销商: " style="width:100%">
 
@@ -314,38 +367,11 @@
             <el-tab-pane label="扩展数据" name="second">
                 <el-form :model="form" label-width="120px"
                          style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                    <el-form-item label="默认给药途径:" prop="delivery_way">
-                        <el-select v-model="form.delivery_way" style="width:160px;" placeholder="请选择">
-                            <el-option
-                                    v-for="item, index in deliveryWayOptions"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.name">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="默认执行频率:" prop="execution_frequency">
-                        <el-select v-model="form.execution_frequency" style="width:160px;" placeholder="请选择">
-                            <el-option
-                                    v-for="item,index in executionFrequencyOptions"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.name">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="默认单次用量:" prop="single_dose">
-                        <el-input v-model="form.single_dose" style="width:160px;" placeholder=""
-                                  maxlength="30"></el-input>
-                    </el-form-item>
-                    <el-form-item label="默认开药数量:" prop="prescribing_number">
-                        <el-input v-model="form.prescribing_number" style="width:160px;" placeholder=""
-                                  maxlength="30"></el-input>
-                    </el-form-item>
+
                     <el-form-item label="标签:" prop="label">
                         <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in sign"
+                                    v-for="(item,index) in sign"
                                     :key="index"
                                     :label="item.name"
                                     :value="item.id">
@@ -358,7 +384,7 @@
                     <el-form-item label="是否常用医嘱:" prop="is_use_doctor_advice">
                         <el-select v-model="form.is_use_doctor_advice" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
+                                    v-for="(item,index) in options"
                                     :key="index"
                                     :label="item.label"
                                     :value="item.value">
@@ -368,7 +394,7 @@
                     <el-form-item label="是否默认:" prop="is_default">
                         <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
+                                    v-for="(item,index) in options"
                                     :key="index"
                                     :label="item.label"
                                     :value="item.value">
@@ -520,23 +546,37 @@
           prescription_mark: '',//处方药标志
           social_security_directory_code: '',//社保目录编码
           record_date: '',//备案日期
-          drug_remark: ''//药品备注
+          drug_remark: '',//药品备注
+          drug_day:"",//默认开药天数
+          min_number:"",//拆零数量
+          min_price:"",//拆零零售价
+          dose_unit:"",//剂量
+          dose:"",//剂量单位
+          prescribing_number_unit:"",
+          total:"",
         },
 
         rules: {
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur' }],
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
-          drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
+          // drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
+          dose:[{required:true,message:'请输入剂量',trigger:'blur'}],
+          dose_unit:[{required:true,message:"请填写剂量",trigger:'blur'}],
+          max_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
+          min_unit: [{ required: true, message: '请填写拆零单位', trigger: 'change' }],
+          unval:[{required:true,message:"请填写拆零",trigger:'change'}],
+          min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
+          packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
           drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
           drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
           drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
-          max_unit: [{ required: true, message: '请填写最大单位', trigger: 'change' }],
-          min_unit: [{ required: true, message: '请填写最小单位', trigger: 'change' }],
+
           unit_matrixing: [{ required: true, message: '请填写单位换算', trigger: 'blur' }],
-          retail_price: [{ required: true, message: '请填写零售价', trigger: 'blur' }],
-          last_price: [{ required: true, message: '请填写上次进价', trigger: 'blur' }],
+          retail_price: [{ required: true, message: '请填写拆零零售价', trigger: 'blur' }],
+          last_price: [{ required: true, message: '请填写进货价', trigger: 'blur' }],
+          packing_price:[{required:true,message:'请填写包装零售价',trigger:'blur'}],
           drug_classify: [{ required: true, message: '请选择药物分类', trigger: 'change' }],
           drug_dose: [{ required: true, message: '请填写剂量', trigger: 'blur' }],
           manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
@@ -560,7 +600,11 @@
         drugControlList:[],
         drugClassifyList:[],
         statisticsCategoryList:[],
-        pharmacologyCategoryList:[]
+        pharmacologyCategoryList:[],
+        dosageShow:false,
+        unitList:[],
+        minNumberShow:false,
+        packingUnit:[]
       }
     },
     props: {
@@ -578,7 +622,7 @@
         type: Number,
         default: 1
       },
-     
+
 
     },
     methods: {
@@ -589,7 +633,7 @@
         this.$refs[formName].validate((valid) => {
           console.log(valid)
           if (valid) {
-            console.log(1111,this.getValue())
+            // console.log(1111,this.getValue())
             this.$emit('dialog-comfirm', this.getValue())
           }
         })
@@ -619,15 +663,67 @@
         this.form.intro = ''
       },
       show(id, obj) {
-        console.log("obj333333333",obj)
+        this.unitList = []
+        this.packingUnit = []
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i=0;i<arr.length;i++){
+          if(obj.min_unit == arr[i].name){
+            this.unitList.push(arr[i])
+            this.packingUnit.push(arr[i])
+          }
+          if(obj.dose_unit == arr[i].name){
+            this.unitList.push(arr[i])
+          }
+          if(obj.max_unit == arr[i].name){
+            this.packingUnit.push(arr[i])
+          } 
+
+          let idArr = []
+          this.unitList.map(item => {
+            idArr.push(item.id)
+          })
+          if(idArr.indexOf(obj.drug_dose_unit) == -1){
+            if(obj.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+          }
+          let packingIdArr = []
+          this.packingUnit.map(item => {
+            packingIdArr.push(item.id)
+          })
+          if(packingIdArr.indexOf(obj.prescribing_number_unit) == -1){
+            if(obj.prescribing_number_unit == arr[i].id || obj.prescribing_number_unit == arr[i].name){
+              this.packingUnit.push(arr[i])
+            }
+          }
+        }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
+
+        let newojb = {};
+        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
+        console.log('this.unitList',this.unitList)
         this.getInitializtion()
         this.getlist()
         this.GetAllConfig()
-        obj.drug_classify = parseInt(obj.drug_classify)
+        if(obj.drug_classify == 0){
+           obj.drug_classify = ""
+        }else{
+          obj.drug_classify = parseInt(obj.drug_classify)
+        }
+
         if(obj.dealer == 0){
            obj.dealer = ""
         }
-        
+
         this.visible = true
         if (id == 0) {
           this.formTitle = '新增'
@@ -654,6 +750,24 @@
           }
 
           this.formTitle = '编辑'
+          let unitArr = []
+          this.unitList.map(item => {
+            unitArr.push(item.id)
+          })
+          if(unitArr.indexOf(this.form.drug_dose_unit) == -1){
+            this.form.drug_dose_unit = ''
+          }
+          if(obj.dose_unit == obj.min_unit){
+            this.dosageShow = true
+          }else{
+            this.dosageShow = false
+          }
+
+          if(obj.min_unit == obj.max_unit){
+            this.minNumberShow = true
+          }else{
+            this.minNumberShow = false
+          }
 
         }
         this.getAdviceConfig()
@@ -679,7 +793,14 @@
         this.form.prescription_mark = ''
         this.form.record_date = ''
         this.form.drug_remark = ''
-
+        this.form.dose = ''
+        this.form.dose_unit = ""
+        this.form.min_number= ""
+        this.form.min_unit = ""
+        this.form.max_unit = ""
+        this.form.min_price = ""
+        this.form.prescribing_number_unit = ""
+        this.dosageShow = false
         this.visible = false
       },
       getValue: function() {
@@ -735,10 +856,15 @@
         form['social_security_directory_code'] = this.form.social_security_directory_code
         form['record_date'] = this.form.record_date
         form['drug_remark'] = this.form.drug_remark
-
         form['hosp_appr_flag'] = this.form.hosp_appr_flag
         form['lmt_used_flag'] = this.form.lmt_used_flag
-       
+        form['total'] = this.form.total
+        form['min_number'] = this.form.min_number
+        form["drug_day"] = this.form.drug_day
+        form['dose'] = this.form.dose,
+        form['dose_unit'] = this.form.dose_unit
+        form['min_price'] = this.form.min_price
+        form['prescribing_number_unit'] = this.form.prescribing_number_unit
         return form
       },
       getlist() {
@@ -749,7 +875,7 @@
 
         getManufacturerList(params).then(response => {
           var manufacturerList = response.data.data.manufacturer
-         
+
           this.manufacturerList = manufacturerList
         })
       },
@@ -768,31 +894,181 @@
         getInitializtion().then(response=>{
            if(response.data.state ==1){
              var drugCategoryList =  response.data.data.drugCategoryList
-             console.log("药品类别",drugCategoryList) 
+
              this.drugCategoryList = drugCategoryList
              var drugTypeList = response.data.data.drugTypeList
-              console.log("药物分类",drugTypeList)
+
               this.drugTypeList = drugTypeList
              var drugDosageFormList =  response.data.data.drugDosageFormList
-             console.log("药品剂型",drugDosageFormList) 
+
              this.drugDosageFormList = drugDosageFormList
              var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
-             console.log("医保等级",medicalInsuranceLevelList)
+
              this.medicalInsuranceLevelList = medicalInsuranceLevelList
              var drugControlList = response.data.data.drugControlList
-             console.log("开药控制",drugControlList)
+
              this.drugControlList = drugControlList
              var drugClassifyList = response.data.data.drugClassifyList
-             console.log("药物分类",drugClassifyList)
+
              this.drugClassifyList = drugClassifyList
              var statisticsCategoryList =  response.data.data.statisticsCategoryList
-             console.log("统计分类",statisticsCategoryList)
+
              this.statisticsCategoryList = statisticsCategoryList
              var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
-             console.log("药理分类",pharmacologyCategoryList)
+
              this.pharmacologyCategoryList = pharmacologyCategoryList
            }
         })
+      },
+      changeDoseUnit(val){
+        if(val == this.form.min_unit){
+          // this.form.dose = 1
+          this.form.min_number = 1
+          this.dosageShow = true
+        }
+        if(val !=this.form.min_unit){
+          this.dosageShow = false
+        }
+        var arr =  getDataConfig('hemodialysis','units')
+        this.unitList = []
+        for(let i=0;i<arr.length;i++){
+
+          if(this.form.min_unit == arr[i].name){
+            this.unitList.push(arr[i])
+          }
+          if(val == arr[i].name){
+            this.unitList.push(arr[i])
+          }
+          let idArr = []
+          this.unitList.map(item => {
+            idArr.push(item.id)
+          })
+          if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+            if(this.form.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+          }
+
+        }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+            //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+            ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+            return prevArr
+        }, [])
+
+      },
+      changeMinUnit(val){
+        if(val == this.form.dose_unit){
+          // this.form.dose = 1
+          this.form.min_number = 1
+          this.dosageShow = true
+        }else{
+          this.dosageShow = false
+        }
+        // if(val != this.form.max_unit){
+        //   this.dosageShow = false
+        // }
+        if(val == this.form.max_unit){
+          this.form.min_number = 1
+          this.minNumberShow = true
+        }else{
+          this.minNumberShow = false
+        }
+
+        // if(this.form.dosage == "" || this.form.max_unit == ""){
+        //    this.form.min_number = 1
+        // }
+        var arr = getDataConfig('hemodialysis','units')
+        this.unitList = []
+        this.packingUnit = []
+        for(let i=0;i<arr.length;i++){
+            if(val == arr[i].name){
+              this.unitList.push(arr[i])
+              this.packingUnit.push(arr[i])
+            }
+            if(this.form.max_unit == arr[i].name){
+              this.unitList.push(arr[i])
+              this.packingUnit.push(arr[i])
+            }
+            if(this.form.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+            if(this.form.prescribing_number_unit == arr[i].id){
+              this.packingUnit.push(arr[i])
+            }
+            
+
+
+
+            let idArr = []
+            this.unitList.map(item => {
+              idArr.push(item.id)
+            })
+            if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+              if(this.form.drug_dose_unit == arr[i].id){
+                this.unitList.push(arr[i])
+              }
+            }
+            let packingIdArr = []
+            this.packingUnit.map(item => {
+              packingIdArr.push(item.id)
+            })
+            if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
+              if(this.form.prescribing_number_unit == arr[i].id){
+                this.packingUnit.push(arr[i])
+              }
+            }
+        }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
+
+        let newojb = {};
+        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
+
+      },
+      changeMaxUnit(val){
+        if(val == this.form.min_unit){
+          this.form.min_number = 1
+          this.minNumberShow = true
+        }else{
+          this.minNumberShow = false
+        }
+        var arr = getDataConfig('hemodialysis','units')
+        this.packingUnit = []
+        for(let i=0;i<arr.length;i++){
+            if(val == arr[i].name){
+              this.packingUnit.push(arr[i])
+            }
+            if(this.form.min_unit == arr[i].name){
+              this.packingUnit.push(arr[i])
+            }
+            let packingIdArr = []
+            this.packingUnit.map(item => {
+              packingIdArr.push(item.id)
+            })
+            if(packingIdArr.indexOf(this.form.prescribing_number_unit) == -1){
+              if(this.form.prescribing_number_unit == arr[i].id){
+                this.packingUnit.push(arr[i])
+              }
+            }
+        }
+
+
+        let newojb = {};
+        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
       }
     }, watch: {
       visible(val) {
@@ -805,9 +1081,9 @@
        //获取所有经销商
       this.GetAllConfig()
       this.getlist()
-      
-      
-     
+
+
+
     }
   }
 </script>
@@ -815,9 +1091,14 @@
 <style lang="scss">
     .addDrugsDialog {
 
-    .el-dialog__body {
-        padding-top: 0px;
-    }
+      .el-dialog__body {
+          padding-top: 0px;
+      }
+      .noMargin{
+        .el-form-item__content{
+          margin-left: 0 !important;
+        }
+      }
 
     }
 </style>

src/xt_pages/data/components/addInspection.vue

@@ -1,12 +1,13 @@
 <template>
     <el-dialog
-        :title="formTitle"
-        width="900px"
-        :visible.sync="visible"
-        :before-close="_close"
+            :title="formTitle"
+            width="900px"
+            :visible.sync="visible"
+            :before-close="_close"
     >
         <div>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form" :rules="rules" ref="form" label-width="100px"
+                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                 <el-form-item label="组套名称 : " prop="project_team" style="width:100%">
                     <el-input v-model="form.project_team" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
@@ -19,61 +20,65 @@
                 <el-form-item label="五笔 : " prop="wubi" style="width:50%">
                     <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                
+
                 <el-form-item label="试管颜色 : " prop="tube_color" style="width:50%">
                     <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
                         <el-option
-                         v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id">
+                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                         </el-option>
-                  </el-select>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
                     <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
-  
-                 <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" placeholder="请选择">
+
+                <el-form-item label="组套明细" style="width:50%;">
+                    <el-select v-model="form.project_detail" filterable placeholder="请选择" @change="changeProject">
                         <el-option
-                        v-for="item in projectList"
-                        :key="item.id"
-                        :label="item.project_name"
-                        :value="item.id">
+                                v-for="item in projectList"
+                                :key="item.id"
+                                :label="item.project_name"
+                                :value="item.id">
                         </el-option>
                     </el-select>
+                </el-form-item>
 
-                    </el-form-item>
-                 <el-form-item label="数量" style="width:50%;"> 
-                      <div style="display:flex;"> 
-                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
-                         <el-button type="primary" @click="addProjectList">添加</el-button>
-                      </div>
-                  </el-form-item>
+                <el-form-item label="数量" style="width:50%;">
+                    <div style="display:flex;">
+                        <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+                        <el-button type="primary" @click="addProjectList">添加</el-button>
+                    </div>
+                </el-form-item>
             </el-form>
             <el-form>
-                <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
+                <el-table :data="tableData" border style="100%" :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">{{getId(scope.row.statistical_classification)}}</template>
+                        <template slot-scope="scope">
+                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
                         <template slot-scope="scope">{{scope.row.project_name}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="数量" width="120">
+                    <el-table-column align="center" prop="name" label="数量" width="120">
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="单位" width="120">
+                    <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">{{scope.row.unit}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -81,18 +86,18 @@
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="操作">
                         <template slot-scope="scope">
-                          <el-tooltip
-                            class="item"
-                            effect="dark"
-                            content="删除"
-                            placement="top"
+                            <el-tooltip
+                                    class="item"
+                                    effect="dark"
+                                    content="删除"
+                                    placement="top"
                             >
-                            <el-button
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="small"
-                                @click="DeleteProject(scope.row.id,scope.$index)"
-                            ></el-button>
+                                <el-button
+                                        type="danger"
+                                        icon="el-icon-delete"
+                                        size="small"
+                                        @click="DeleteProject(scope.row.id,scope.$index)"
+                                ></el-button>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -103,202 +108,269 @@
 
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script>
-import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
-import { saveProjectTeam,getAllProjectList,addProjectList,DeleteProject,getProjectDetail } from "@/api/project/project"
-export default {
-    data(){
-        return{
-            visible:false,
-            formTitle:'',
-            activeName:'first',
-            form:{
-              project_team:'',
-              price:"",
-              pinyin:"",
-              wubi:"",
-              tube_color:"",
-              team_type:"",
-              remark:"",
-              project_detail:"",
-              number:""
-            },
-            options: [
-            {value: 1,label: '是'},
-            {value: 2,label: '否'}
-            ],
-            value: '',
-            radio:'1',
-            rules: {
-              project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
-            //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-            //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
-              price: [{ required: true, message: '请填写价格', trigger: 'change' }],
-              team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
-           },
-           tableData:[],
-           projectList:[],
-           tabList:[],
-           itemList:[]
-        }
-    },
-    methods:{
-        getDataConfig(module, filed_name){
-            return getDataConfig(module, filed_name)
-        },
-            getDictionaryDataConfig(module, filed_name) {
-            return getDictionaryDataConfig(module, filed_name)
-        },
-        _close: function(done) {
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show(id) {
-            this.visible = true
-            this.formTitle = '新增' 
-         },
-        hide() {
-         this.visible = false
+  import { getDataConfig, getDictionaryDataConfig } from '@/utils/data'
+  import {
+    addProjectList,
+    DeleteProject,
+    getAllProjectList,
+    getProjectDetail,
+    saveProjectTeam
+  } from '@/api/project/project'
+
+  import { saveTeam } from '@/api/his/his'
+
+  export default {
+    data() {
+      return {
+        project_name: '',
+        visible: false,
+        formTitle: '',
+        activeName: 'first',
+        form: {
+          project_team: '',
+          price: 0,
+          pinyin: '',
+          wubi: '',
+          tube_color: '',
+          team_type: '',
+          remark: '',
+          project_detail: '',
+          number: '1'
         },
-        submitAction(formName){
-           this.$refs[formName].validate((valid)=>{
-                var arr = []
-                var listId = []
-                for(let i=0;i<this.tableData.length;i++){
-                    arr.push(this.tableData[i].id)
-                    
-                }
-                console.log("arr",arr)
-                console.log("table",this.tableData)
-                var ids = arr.join(",")
-                var listIds = this.itemList.join(",")
-                var params = {
-                 project_team:this.form.project_team,
-                 price:this.form.price,
-                 pinyin:this.form.pinyin,
-                 wubi:this.form.wubi,
-                 tube_color:this.form.tube_color,
-                 team_type:this.form.team_type,
-                 remark:this.form.remark,
-                 ids:ids,
-                 item_id:listIds
-               }
-              
-              saveProjectTeam(params).then(response=>{
-                 if(response.data.state == 1){
-                   var projectTeam = response.data.data.projectTeam
-                   console.log("projectTeam",projectTeam)
-                   this.$message.success("保存成功")  
-                   this.visible = false
-                   this.form.project_team = "",
-                   this.form.price = "",
-                   this.form.pinyin = "",
-                   this.form.wubi = "",
-                   this.form.tube_color = "",
-                   this.form.team_type = "",
-                   this.form.remark = ""
-                   this.tableData = []
-                   this.form.number = ""
-                   this.$parent.getlist()
-                 }else{
-                    this.$message.error("项目组套名称已存在!")
-                 }
-              }) 
-           })
+        options: [
+          { value: 1, label: '是' },
+          { value: 2, label: '否' }
+        ],
+        value: '',
+        radio: '1',
+        rules: {
+          project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur' }],
+          //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+          //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+          price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+          team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
-        getlist(){
-          getAllProjectList().then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               console.log('projectlist33333',projectList)
-              
-               this.projectList = projectList
-            //    var hisprojectlist = response.data.data.hisprojectlist
-            //    console.log("hisprojectlist",hisprojectlist)
-            //    this.tableData = hisprojectlist
-             }
-          })   
-        },
-       
-        getId(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
-             }
+        tableData: [],
+        projectList: [],
+        tabList: [],
+        itemList: []
+      }
+    },
+    methods: {
+      changeProject() {
+        this.form.number = 1
+
+      },
+      querySearch(queryString, cb) {
+        var restaurants = this.projectList
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+
+      }, createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.project_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      handleSelect(val) {
+        this.project_name = val.project_name
+        this.form.project_detail = val.id
+      },
+      getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      _close: function(done) {
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(id) {
+        this.visible = true
+        this.formTitle = '新增'
+      },
+      hide() {
+        this.visible = false
+      },
+      submitAction(formName) {
+        this.$refs[formName].validate((valid) => {
+          var params = {
+            project_team: this.form.project_team,
+            price: this.form.price,
+            pinyin: this.form.pinyin,
+            wubi: this.form.wubi,
+            tube_color: this.form.tube_color,
+            team_type: this.form.team_type,
+            remark: this.form.remark
           }
-          return name
-        },
-        chagneInspection(id){
-           getProjectDetail(id).then(response=>{
-              if(response.data.state == 1){
-               var projectdetail = response.data.data.projecDetail
-               console.log("projectdetail",projectdetail)
-               this.tableData.push(projectdetail)
-              }
-           })
-        },
-       addProjectList(){
-          
-          for(let i=0;i<this.projectList.length;i++){
-            if(this.form.project_detail == this.projectList[i].id){
-                this.projectList[i].number = this.form.number
-                this.tableData.push(this.projectList[i])
-            }
-         }
-         console.log("33333",this.tableData)
-      
-         
-            const params = {
-              id:this.form.project_detail,
-              number:parseInt(this.form.number)
-            }
-           console.log("params",params)
-          addProjectList(params).then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               var item = response.data.data.item
-               console.log("item22222",item)
-               this.itemList.push(item.id)
-               this.$message.success("保存成功")
-               this.form.project_detail = ""
-               this.form.number = ""
-            //    this.getlist()
-             }
-          })
-        },
-        DeleteProject(id,index){
-           this.$confirm("确认删除此项目吗?", "删除", {
-            confirmButtonText: "确 定",
-            cancelButtonText: "取 消",
-            type: "warning"
-         }).then(() => {
-          DeleteProject(id).then(response => {
+          let data = {
+            'info': this.tableData
+          }
+          saveTeam(data, params).then(response => {
             if (response.data.state == 1) {
-               this.tableData.splice(index, 1);
+              var projectTeam = response.data.data.projectTeam
+              console.log('projectTeam', projectTeam)
+              this.$message.success('保存成功')
+              this.visible = false
+              this.form.project_team = '',
+                this.form.price = '',
+                this.form.pinyin = '',
+                this.form.wubi = '',
+                this.form.tube_color = '',
+                this.form.team_type = '',
+                this.form.remark = ''
+              this.tableData = []
+              this.form.number = ''
+              this.$parent.getlist()
             } else {
-             
+              this.$message.error('项目组套名称已存在!')
             }
-          });
+          })
         })
-        .catch(() => {});
+      },
+      getlist() {
+        let params = {
+          keyword: ''
+
         }
+        getAllProjectList(params).then(response => {
+          if (response.data.state == 1) {
+            var projectList = response.data.data.projectList
+            var goodInfos = response.data.data.good_info
+
+            for (let i = 0; i < projectList.length; i++) {
+              let obj = {
+                id: projectList[i].id,
+                statistical_classification: projectList[i].statistical_classification,
+                number: '1',
+                project_name: projectList[i].project_name,
+                unit: projectList[i].unit,
+                price: projectList[i].price,
+                type: 2
+              }
+              this.projectList.push(obj)
+
+            }
+
+            for (let i = 0; i < goodInfos.length; i++) {
+              let obj = {
+                id: goodInfos[i].id,
+                statistical_classification: goodInfos[i].statistical_classification,
+                number: '1',
+                project_name: goodInfos[i].good_name,
+                unit: goodInfos[i].good_unit,
+                price: goodInfos[i].retail_price,
+                type: 3
+              }
+              this.projectList.push(obj)
+            }
+
+            console.log(this.projectList)
+
+            // this.projectList = projectList
+            //    var hisprojectlist = response.data.data.hisprojectlist
+            //    console.log("hisprojectlist",hisprojectlist)
+            //    this.tableData = hisprojectlist
+          }
+        })
+      },
+
+      getId(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
+      },
+      chagneInspection(id) {
+        getProjectDetail(id).then(response => {
+          if (response.data.state == 1) {
+            var projectdetail = response.data.data.projecDetail
+            console.log('projectdetail', projectdetail)
+            this.tableData.push(projectdetail)
+          }
+        })
+      },
+      addProjectList() {
+        console.log(this.projectList)
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (this.form.project_detail == this.projectList[i].id) {
+            this.projectList[i].number = this.form.number
+            this.projectList[i].number = this.projectList[i].number.toString()
+            this.tableData.push(this.projectList[i])
+            this.form.project_detail = ''
+            this.form.number = 1
+          }
+        }
+        // console.log("33333",this.tableData)
+        //
+        //
+        //    const params = {
+        //      id:this.form.project_detail,
+        //      number:parseInt(this.form.number)
+        //    }
+        //   console.log("params",params)
+        //  addProjectList(params).then(response=>{
+        //     if(response.data.state == 1){
+        //       var projectList = response.data.data.projectList
+        //       var item = response.data.data.item
+        //       console.log("item22222",item)
+        //       this.itemList.push(item.id)
+        //       this.$message.success("保存成功")
+        //       this.form.project_detail = ""
+        //       this.form.number = ""
+        //    //    this.getlist()
+        //     }
+        //  })
+      },
+      DeleteProject(id, index) {
+        this.$confirm('确认删除此项目吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          this.tableData.splice(index, 1)
+        })
+          .catch(() => {
+          })
+      }
     },
-    created(){
+    created() {
       //获取所以的项目
       this.getlist()
-   
+
+    }, watch: {
+      'tableData': function() {
+        let c = 0
+        this.form.price  = 0
+        for (let i = 0; i < this.tableData.length; i++) {
+          let a = parseFloat(this.tableData[i].number).toFixed(2)
+          let b = parseFloat(this.tableData[i].price).toFixed(2)
+          console.log(a)
+          console.log(b)
+
+
+          c = c + this.form.price + (a * b)
+
+        }
+        this.form.price = c.toFixed(2)
+      }
+
     }
-}
+  }
 </script>

src/xt_pages/data/components/consumables.vue

@@ -10,8 +10,8 @@
         <label class="title"><span class="name">是否启用</span> : </label>
         <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
           <el-option
-            v-for="item in options"
-            :key="item.value"
+            v-for="(item,z) in options"
+            :key="z"
             :label="item.label"
             :value="item.value">
           </el-option>
@@ -19,8 +19,8 @@
         <label class="title"><span class="name">生产厂商</span> : </label>
         <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
           <el-option
-            v-for="item in manufacturers"
-            :key="item.id"
+            v-for="(item,y) in manufacturers"
+            :key="y"
             :label="item.manufacturer_name"
             :value="item.id">
           </el-option>
@@ -28,34 +28,13 @@
         <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
         <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
           <el-option
-            v-for="item in optionOne"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-        <!-- <label class="title"><span class="name">是否收费</span> : </label>
-        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
+            v-for="(item,index) in optionOne"
+            :key="index"
             :label="item.label"
             :value="item.value">
           </el-option>
         </el-select>
-        <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
-        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeKind">
-          <el-option
-            label="全部"
-            value="0">
-          </el-option>
-          <el-option
-            v-for="item,index in  getDictionaryDataConfig('system','good_kind')"
-            :key="index"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select> -->
+
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
@@ -64,8 +43,8 @@
     </div>
 
      <div style="display:flex; align-items:center;margin-bottom:10px;">
-        <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
-        <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+        <!--<el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">批量备案</el-button>-->
+        <!--<el-button type="primary" size="mini">批量备案</el-button>-->
         <el-link target="_blank" href="https://kuyi.shengws.com/stockTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -121,14 +100,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="最小单位" width="60" align="center">
+      <!-- <el-table-column label="最小单位" width="60" align="center">
         <template slot-scope="scope">
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
-      </el-table-column>
-      <el-table-column label="零售价" width="60" align="center">
+      </el-table-column> -->
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.retail_price }}
+          {{ scope.row.packing_price }}
         </template>
       </el-table-column>
        <el-table-column label="社保目录编码" width="110" align="center">
@@ -145,18 +124,18 @@
 
       </el-table-column>
 
-      <el-table-column prop="date" label="操作" width="300" align="center">
+      <el-table-column prop="date" label="操作" width="320" align="center">
         <template slot-scope="scope">
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
-             <span v-if="scope.row.is_mark == 0">备案</span>
-             <span v-if="scope.row.is_mark == 1">撤销</span>
-          </el-button>
+          <!--<el-button type="primary" size="small" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">-->
+             <!--<span v-if="scope.row.is_mark == 0">备案</span>-->
+             <!--<span v-if="scope.row.is_mark == 1">撤销</span>-->
+          <!--</el-button>-->
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+          <el-button type="primary" size="small" >
             <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
             <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>
@@ -206,7 +185,7 @@
       width="40%"
     >
 
-      <div v-for="(item,index) in logs" :key="index">
+      <div v-for="(item,i) in logs" :key="i">
         <span> {{ item.export_time | parseTime('{y}-{m}-{d} {h}:{i}:{s}')}}</span>
         <br/>
         <br/>
@@ -327,7 +306,13 @@
               good_number:'',
               social_security_directory_code:"",
               special_medical:"",
-              production_type:""
+              production_type:"",
+              min_number:"",
+              packing_unit:"",
+              packing_price:'',
+              default_count_unit:"",
+              min_unit:"",
+              total:"",
             },
             isVisibility: false,
 
@@ -681,6 +666,13 @@
                 response.data.data.goodInfo.sort.toString()
             }
 
+            if (response.data.data.goodInfo.total <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.total = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.total =
+                      response.data.data.goodInfo.total
+            }
+
 
             if (response.data.data.goodInfo.is_doctor_use <= 0) {
               this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
@@ -706,8 +698,15 @@
             }else{
               this.goodInfo.goodInfoDialog.formValue.special_medical = response.data.data.goodInfo.special_medical.toString()
             }
-
+            this.goodInfo.goodInfoDialog.formValue.min_unit = response.data.data.goodInfo.min_unit
+            this.goodInfo.goodInfoDialog.formValue.min_number = response.data.data.goodInfo.min_number
+            this.goodInfo.goodInfoDialog.formValue.packing_unit = response.data.data.goodInfo.packing_unit
+            this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
+            this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
+
+
+
           }
         })
       },
@@ -791,16 +790,12 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-
+        console.log("val22222",val)
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
           val['good_code'] = this.goodInfo.good_code;
 
-
-
-
-
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)

src/xt_pages/data/components/drugs.vue

@@ -2,20 +2,12 @@
   <div class="page_drugs">
     <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
       <div class="cell clearfix" style="margin-bottom:0;">
-        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+        <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction'
                   class="filter-item" v-model="keywords"/>
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
-        <!-- <label class="title"><span class="name">是否启用</span> : </label>
-        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select> -->
+
        <label class="title"><span class="name">生产厂商</span> : </label>
         <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
           <el-option
@@ -25,7 +17,7 @@
             :value="item.id">
           </el-option>
         </el-select>
-        <label class="title"><span class="name">是否收费</span> : </label>
+        <label class="title"><span class="name">是否备案</span> : </label>
         <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
           <el-option
             v-for="item in options"
@@ -34,15 +26,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <!-- <span style="color: #909399;font-size:14px;">是否注射类别 : &nbsp;</span>
-        <el-select v-model="is_inject" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeInject">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select> -->
+
 
         <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
         <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
@@ -56,14 +40,13 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
-        <!-- <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
-        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button> -->
+
       </div>
 
     </div>
     <div style="display:flex; align-items:center;margin-bottom:10px;">
-        <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
-        <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>-->
+        <el-button type="primary" size="small"  @click="GDYBBatchPutOnRecord()">批量备案</el-button>
         <el-link target="_blank" href="https://kuyi.shengws.com/drugTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -93,17 +76,20 @@
        ></el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
 
-      <el-table-column prop="date" label="药品名称" align="center" width="100">
+      <el-table-column prop="date" label="药品名称" align="center" >
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="规格" width="60" align="center">
+      <el-table-column prop="date" label="单位&规格" align="center">
         <template slot-scope="scope">
-          <div>{{scope.row.drug_spec}}</div>
+          <!-- <div>{{scope.row.drug_spec}}</div> -->
+          <div>
+            <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="最大单位" width="60" align="center">
+      <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.max_unit}}</div>
         </template>
@@ -112,13 +98,13 @@
         <template slot-scope="scope">
           <div>{{scope.row.min_unit}}</div>
         </template>
-      </el-table-column>
-      <el-table-column prop="date" label="进货价" width="60" align="center">
+      </el-table-column> -->
+      <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="零售价" width="60" align="center">
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>
@@ -158,18 +144,18 @@
           <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="操作" width="250" align="center" fixed="right">
+      <el-table-column prop="date" label="操作" width="280" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
 
-        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >
-          <span v-if="scope.row.is_mark == 0">备案</span>
-          <span v-if="scope.row.is_mark == 1">撤消</span>
-        </el-button>
+        <!--<el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138" >-->
+          <!--<span v-if="scope.row.is_mark == 0">备案</span>-->
+          <!--<span v-if="scope.row.is_mark == 1">撤消</span>-->
+        <!--</el-button>-->
 
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+          <el-button type="primary" size="small" icon="el-icon-refresh-left">
             <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
             <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>
@@ -329,6 +315,10 @@
           drug_code: '',
           hosp_appr_flag:'',
           lmt_used_flag:'',
+          dose_unit:'',
+          min_price:'',
+          drug_day:"",//默认开药天数,
+          total:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -381,6 +371,12 @@
           prescription_mark:'',
           hosp_appr_flag:'',
           lmt_used_flag:'',
+          dosage:'', //剂量
+          unval:'',//拆零
+          packing_unit:"",//包装单位
+          packing_price:"",//包装零售价
+          drug_day:"",//默认开药天数
+          total:"",
 
         },
 
@@ -500,6 +496,9 @@
         if (val.id > 0) {
           //修改
           val['id'] = this.current_id;
+
+          val.min_number =  parseInt(val.min_number)
+
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -513,7 +512,6 @@
         } else if (val.id == 0) {
           //新增
 
-
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -567,7 +565,7 @@
               this.$message.error(response.data.msg);
               return false
             } else {
-
+              console.log("药品详情",response.data.data.drug)
               for (let key in response.data.data.drug) {
                 this.formValue[key] = response.data.data.drug[key]
               }
@@ -680,6 +678,11 @@
               if(this.formValue.hosp_appr_flag == 0){
                 this.formValue.hosp_appr_flag = ""
               }
+              if(this.formValue.drug_classify == 0){
+                 this.formValue.drug_classify = ""
+              }
+
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 
@@ -733,11 +736,12 @@
             return false
           } else {
             this.total = response.data.data.total;
-            this.list = [];
 
+            this.list = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
+            console.log("数据库字典",this.list)
           }
         })
       },
@@ -928,40 +932,48 @@
      },
 
       handleSuccessTwo({ results, header }) {
-
+         console.log("header22222",header)
         if (header != undefined && header.length > 0) {
 
           var isHasDrugName = header.includes('*药品名称');
-
-          var isHasDrugSpec = header.includes('*药品规格');
-
+          console.log("isHasDrugName",isHasDrugName)
+          var isHasUnval = header.includes('*拆零');
+          console.log("isHasUnval",isHasUnval)
+          var isHasMinUnit= header.includes('*拆零单位');
+           console.log("isHasMinUnit",isHasMinUnit)
+          var isHasDosage =  header.includes('*剂量')
+          console.log("isHasDosage",isHasDosage)
+
+          var isHasMaxUnit= header.includes('*剂量单位');
+          console.log("isHasMaxUnit",isHasMaxUnit)
+          var isHasPackingUnit = header.includes('*包装单位')
+          console.log("isHasPackingUnit",isHasPackingUnit)
           var isHasDrugType =  header.includes('*药品类型');
-
+          console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
-
+          console.log("isHasDrugStockLimit",isHasDrugStockLimit)
           var isHasDrugOriginPlace= header.includes('*产地');
-
+          console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
-
-          var isHasMaxUnit= header.includes('*最大单位');
-
-          var isHasMinUnit= header.includes('*最小单位');
+          console.log("isHasDrugDosageForm",isHasDrugDosageForm)
 
           var isHasUnitMatrixing= header.includes("*单位换算");
-
-          var isHasRetailPrice = header.includes('*单零售价');
-
-          var isHasLastPrice = header.includes('*上次进价');
-
+          console.log("isHasUnitMatrixing",isHasUnitMatrixing)
+          var isHasRetailPrice = header.includes('*拆零零售价');
+          console.log("isHasRetailPrice",isHasRetailPrice)
+          var isHasLastPrice = header.includes('*进货价');
+          var isHasPackingPrice= header.includes('*包装零售价');
+         console.log("isHasLastPrice",isHasLastPrice)
           var isHasDrugClassifye = header.includes('*药物分类');
-
+         console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
-
-         var isHasDrugDose = header.includes('*剂量');
-
-         var isDrugDoseUnit = header.includes('*剂量单位');
-
-          if (!(isHasDrugName  && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
+         console.log("isHasManufacturer",isHasManufacturer)
+         var isHasDrugDose = header.includes('*默认单次用量');
+        console.log("isHasDrugDose",isHasDrugDose)
+         var isDrugDoseUnit = header.includes('*默认单次用量单位');
+         console.log("isDrugDoseUnit",isDrugDoseUnit)
+          if (!(isHasDrugName  && isHasUnval && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasPackingPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit && isHasDosage && isHasPackingUnit)) {
+            console.log("分区222222222222222222222222222222")
             this.dialogVisible = true;
             return
           }
@@ -984,22 +996,74 @@
            }
 
 
-           if (results[i]['药品别名'] === undefined) {
-                obj['drug_alias'] = ''
+          if (results[i]['*拆零'] === undefined) {
+                obj['min_number'] = ''
               } else {
-           if (key == '药品别名') {
-               obj['drug_alias'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零') {
+               obj['min_number'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-            if (results[i]['*药品规格'] === undefined) {
-                obj['drug_spec'] = ''
+           if (results[i]['*拆零单位'] === undefined) {
+                obj['min_unit'] = ''
               } else {
-           if (key == '*药品规格') {
-               obj['drug_spec'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零单位') {
+               obj['min_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+
+            if (results[i]['*剂量'] === undefined) {
+                obj['dosage'] = ''
+              } else {
+            if (key == '*剂量') {
+                obj['dosage'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*剂量单位'] === undefined) {
+                obj['max_unit'] = ''
+              } else {
+           if (key == '*剂量单位') {
+               obj['max_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*包装单位'] === undefined) {
+                obj['packing_unit'] = ''
+              } else {
+           if (key == '*包装单位') {
+               obj['packing_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+          if (results[i]['默认给药途径'] === undefined) {
+                obj['delivery_way'] = ''
+              } else {
+           if (key == '默认给药途径') {
+               obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['默认执行频率'] === undefined) {
+                obj['execution_frequency'] = ''
+              } else {
+           if (key == '默认执行频率') {
+               obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['默认开药天数'] === undefined) {
+                obj['drug_day'] = ''
+              } else {
+           if (key == '默认开药天数') {
+               obj['drug_day'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+
             if (results[i]['*药品类型'] === undefined) {
                 obj['drug_type'] = ''
               } else {
@@ -1017,6 +1081,7 @@
               }
            }
 
+
            if (results[i]['*产地'] === undefined) {
                 obj['drug_origin_place'] = ''
               } else {
@@ -1042,21 +1107,7 @@
               }
            }
 
-           if (results[i]['*最大单位'] === undefined) {
-                obj['max_unit'] = ''
-              } else {
-           if (key == '*最大单位') {
-               obj['max_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
 
-           if (results[i]['*最小单位'] === undefined) {
-                obj['min_unit'] = ''
-              } else {
-           if (key == '*最小单位') {
-               obj['min_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
 
 
             if (results[i]['*单位换算'] === undefined) {
@@ -1067,23 +1118,36 @@
               }
            }
 
-            if (results[i]['*单零售价'] === undefined) {
+
+
+
+          if (results[i]['*拆零零售价'] === undefined) {
                 obj['retail_price'] = ''
               } else {
-           if (key == '*单零售价') {
+           if (key == '*拆零零售价') {
                obj['retail_price'] = results[i][key].replace(/\s/g,"")
               }
            }
 
 
-         if (results[i]['*上次进价'] === undefined) {
+          if (results[i]['*包装零售价'] === undefined) {
+                obj['packing_price'] = ''
+              } else {
+           if (key == '*包装零售价') {
+               obj['packing_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+         if (results[i]['*进货价'] === undefined) {
                 obj['last_price'] = ''
               } else {
-           if (key == '*上次进价') {
+           if (key == '*进货价') {
                obj['last_price'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+
             if (results[i]['*药物分类'] === undefined) {
                 obj['drug_classify'] = ''
               } else {
@@ -1093,64 +1157,63 @@
            }
 
 
-            if (results[i]['*生产厂商'] === undefined) {
-                obj['manufacturer'] = ''
-              } else {
-           if (key == '*生产厂商') {
-               obj['manufacturer'] = results[i][key].replace(/\s/g,"")
-              }
-           }
 
-            if (results[i]['经销商'] === undefined) {
-                obj['dealer'] = ''
+
+
+           if (results[i]['*默认单次用量'] === undefined) {
+                obj['drug_dose'] = ''
               } else {
-            if (key == '经销商') {
-                obj['dealer'] = results[i][key].replace(/\s/g,"")
+           if (key == '*默认单次用量') {
+               obj['drug_dose'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-           if (results[i]['拼音'] === undefined) {
-                obj['pinyin'] = ''
+
+           if (results[i]['*默认单次用量单位'] === undefined) {
+                obj['drug_dose_unit'] = ''
               } else {
-            if (key == '拼音') {
-                obj['pinyin'] = results[i][key].replace(/\s/g,"")
+           if (key == '*默认单次用量单位') {
+               obj['drug_dose_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-           if (results[i]['五笔'] === undefined) {
-                obj['wubi'] = ''
+           if (results[i]['*生产厂商'] === undefined) {
+                obj['manufacturer'] = ''
               } else {
-            if (key == '五笔') {
-                obj['wubi'] = results[i][key].replace(/\s/g,"")
+           if (key == '*生产厂商') {
+               obj['manufacturer'] = results[i][key].replace(/\s/g,"")
               }
            }
 
 
 
-            if (results[i]['别名拼音'] === undefined) {
-                obj['drug_alias_pinyin'] = ''
+            if (results[i]['经销商'] === undefined) {
+                obj['dealer'] = ''
               } else {
-            if (key == '别名拼音') {
-                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
+            if (key == '经销商') {
+                obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-            if (results[i]['别名拼音'] === undefined) {
-                obj['drug_alias_pinyin'] = ''
+           if (results[i]['限制性用药'] === undefined) {
+                obj['lmt_used_flag'] = ''
               } else {
-            if (key == '别名拼音') {
-                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
+            if (key == '限制性用药') {
+                obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-            if (results[i]['别名五笔'] === undefined) {
-                obj['drug_alias_wubi'] = ''
+
+
+           if (results[i]['药品别名'] === undefined) {
+                obj['drug_alias'] = ''
               } else {
-            if (key == '别名五笔') {
-                obj['drug_alias_wubi'] = results[i][key].replace(/\s/g,"")
+           if (key == '药品别名') {
+               obj['drug_alias'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+
              if (results[i]['药品类别'] === undefined) {
                 obj['drug_category'] = ''
               } else {
@@ -1159,6 +1222,8 @@
               }
            }
 
+
+
            if (results[i]['开药控制'] === undefined) {
                 obj['drug_control'] = ''
               } else {
@@ -1175,13 +1240,7 @@
               }
            }
 
-          if (results[i]['审批标志'] === undefined) {
-                obj['hosp_appr_flag'] = ''
-              } else {
-            if (key == '审批标志') {
-                obj['hosp_appr_flag'] = results[i][key].replace(/\s/g,"")
-              }
-           }
+
 
             if (results[i]['审批标志'] === undefined) {
                 obj['hosp_appr_flag'] = ''
@@ -1207,6 +1266,7 @@
               }
            }
 
+
            if (results[i]['统计分类'] === undefined) {
                 obj['statistics_category'] = ''
               } else {
@@ -1288,31 +1348,6 @@
               }
            }
 
-          if (results[i]['*剂量'] === undefined) {
-                obj['drug_dose'] = ''
-              } else {
-            if (key == '*剂量') {
-                obj['drug_dose'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['*剂量单位'] === undefined) {
-                obj['drug_dose_unit'] = ''
-              } else {
-            if (key == '*剂量单位') {
-                obj['drug_dose_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['限制性用药'] === undefined) {
-                obj['lmt_used_flag'] = ''
-              } else {
-            if (key == '限制性用药') {
-                obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
          }
          var newArr = [];
          tableData.push(obj);
@@ -1384,6 +1419,7 @@
        let params = {
           'drugs':tableData
         };
+        console.log("params222222222",params)
 
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){

src/xt_pages/data/components/editInspection.vue

@@ -1,12 +1,13 @@
 <template>
     <el-dialog
-        :title="formTitle"
-        width="900px"
-        :visible.sync="visible"
-        :before-close="_close"
+            :title="formTitle"
+            width="900px"
+            :visible.sync="visible"
+            :before-close="_close"
     >
         <div>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form" :rules="rules" ref="form" label-width="100px"
+                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                 <el-form-item label="组套名称 : " prop="project_team" style="width:100%">
                     <el-input v-model="form.project_team" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
@@ -19,60 +20,64 @@
                 <el-form-item label="五笔 : " prop="wubi" style="width:50%">
                     <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                
+
                 <el-form-item label="试管颜色 : " prop="name" style="width:50%">
-                     <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
+                    <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
                         <el-option
-                         v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id">
+                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                         </el-option>
-                  </el-select>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
-                    <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
+                    <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择" @change="changeProject">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
-                 <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" placeholder="请选择">
+                <el-form-item label="组套明细" style="width:50%;">
+                    <el-select v-model="form.project_detail" filterable placeholder="请选择">
                         <el-option
-                        v-for="item in projectList"
-                        :key="item.id"
-                        :label="item.project_name"
-                        :value="item.id">
+                                v-for="item,index in projectList"
+                                :key="index"
+                                :label="item.project_name"
+                                :value="item.id">
                         </el-option>
                     </el-select>
 
-                    </el-form-item>
-                 <el-form-item label="数量" style="width:50%;"> 
-                      <div style="display:flex;"> 
-                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
-                         <el-button type="primary" @click="addProjectList">添加</el-button>
-                      </div>
-                  </el-form-item>
+                </el-form-item>
+                <el-form-item label="数量" style="width:50%;">
+                    <div style="display:flex;">
+                        <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+                        <el-button type="primary" @click="addProjectList">添加</el-button>
+                    </div>
+                </el-form-item>
             </el-form>
             <el-form>
-                <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
+                <el-table :data="tableData" border style="100%" :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">{{getId(scope.row.statistical_classification)}}</template>
+                        <template slot-scope="scope">
+                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
                         <template slot-scope="scope">{{scope.row.project_name}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="数量" width="120">
+                    <el-table-column align="center" prop="name" label="数量" width="120">
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="单位" width="120">
+                    <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">{{scope.row.unit}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -80,18 +85,18 @@
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="操作">
                         <template slot-scope="scope">
-                          <el-tooltip
-                            class="item"
-                            effect="dark"
-                            content="删除"
-                            placement="top"
+                            <el-tooltip
+                                    class="item"
+                                    effect="dark"
+                                    content="删除"
+                                    placement="top"
                             >
-                            <el-button
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="small"
-                                @click="DeleteProject(scope.row.id,scope.$index)"
-                            ></el-button>
+                                <el-button
+                                        type="danger"
+                                        icon="el-icon-delete"
+                                        size="small"
+                                        @click="DeleteProject(scope.row.m_id,scope.$index)"
+                                ></el-button>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -102,234 +107,300 @@
 
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script>
-import { getProjectTeamDetail,updatedProjectTeam,getAllProjectList,addProjectList,DeleteProject } from "@/api/project/project"
-import { getDictionaryDataConfig,getDataConfig} from "@/utils/data";
-export default {
-    data(){
-        return{
-            visible:false,
-            formTitle:'',
-            activeName:'first',
-            form:{
-              id:"",
-              project_team:'',
-              price:"",
-              pinyin:"",
-              wubi:"",
-              tube_color:"",
-              team_type:"",
-              remark:"",
-              project_detail:"",
-              number:"",
-              item_id:"",
-            },
-            options: [{
-            value: 1,
-            label: '是'
-            }, {
-            value: 2,
-            label: '否'
-            },],
-            value: '',
-            radio:'1',
-            rules: {
-              project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
-            //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-            //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
-              price: [{ required: true, message: '请填写价格', trigger: 'change' }],
-              team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
-           },
-           tableData:[],
-           item_id:[],
-           projectList:[]
-        }
-    },
-    methods:{
-         getDataConfig(module, filed_name){
-            return getDataConfig(module, filed_name)
-        },
-            getDictionaryDataConfig(module, filed_name) {
-            return getDictionaryDataConfig(module, filed_name)
-        },
-        _close: function(done) {
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show(id) {
-         this.visible = true
-         this.formTitle = '编辑'
-         this.getProjectTeamDetail(id) 
+  import {
+    editTeam
+  } from '@/api/his/his'
+  import {
+    addProjectList,
+    DeleteProject,
+    getAllProjectList,
+    getProjectTeamDetail,
+    updatedProjectTeam
+  } from '@/api/project/project'
+  import { getDataConfig, getDictionaryDataConfig } from '@/utils/data'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        formTitle: '',
+        activeName: 'first',
+        form: {
+          id: '',
+          project_team: '',
+          price: '',
+          pinyin: '',
+          wubi: '',
+          tube_color: '',
+          team_type: '',
+          remark: '',
+          project_detail: '',
+          number: '',
+          item_id: ''
         },
-        hide() {
-    
-            this.visible = false
+        options: [{
+          value: 1,
+          label: '是'
+        }, {
+          value: 2,
+          label: '否'
+        }],
+        value: '',
+        radio: '1',
+        rules: {
+          project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur' }],
+          //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+          //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+          price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+          team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
-        getProjectTeamDetail(id){
-           getProjectTeamDetail(id).then(response=>{
-              if(response.data.state == 1){
-                 var projectTeamDetail =  response.data.data.projectTeamDetail
-                 console.log("projectTeamDetail",projectTeamDetail)
-                 var str  = projectTeamDetail.project_id
-                 var arr = str.split(",")
-                 console.log("Arr33333",arr)
-                 var list = response.data.data.list
-                 console.log("list",list)
-                 var hisList = response.data.data.hisList
-                 console.log("histList",hisList)
-                 for(let i=0;i<list.length;i++){
-                   for(let j=0;j<hisList.length;j++){
-                       if(list[i].id == hisList[j].project_id){
-                           list[i].number = hisList[j].number
-                       }
-                   }
-                 }
-                
-                 var strArr = []
-                 for(let i=0;i<arr.length;i++){
-                   for(let j=0;j<list.length;j++){
-                      if((arr[i]== list[j].id)){
-                          strArr.push(list[j])
-                      }
-                   }
-                 }
-                 console.log("数据222222",strArr)
-                 this.tableData = strArr
-               
-               
-                 this.form.id = projectTeamDetail.id
-                 this.form.project_team = projectTeamDetail.project_team
-                 this.form.price = projectTeamDetail.price
-                 this.form.pinyin = projectTeamDetail.pinyin
-                 this.form.wubi  = projectTeamDetail.wubi
-                 this.form.tube_color = projectTeamDetail.tube_color
-                 if(projectTeamDetail.tube_color == 0){
-                    this.form.tube_color = ""
-                 }
-                 this.form.team_type = projectTeamDetail.team_type
-                 if(projectTeamDetail.team_type == 0){
-                    this.form.team_type = ""
-                 }     
-                 this.form.remark = projectTeamDetail.remark
-                 this.form.item_id = projectTeamDetail.item_id
-                //  console.log("project",projectTeamDetail)
+        tableData: [],
+        item_id: [],
+        projectList: []
+      }
+    },
+    methods: {
+      changeProject() {
+        this.form.number = 1
+
+      },
+      getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      _close: function(done) {
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(id) {
+        this.visible = true
+        this.formTitle = '编辑'
+        this.getlist(id)
+        this.getProjectTeamDetail(id)
+
+      }, getlist(id) {
+
+        getAllProjectList().then(response => {
+          if (response.data.state == 1) {
+            console.log(id)
+            console.log('!~~~~')
+
+            var projectList = response.data.data.projectList
+            var goodInfos = response.data.data.good_info
+
+            for (let i = 0; i < projectList.length; i++) {
+              let obj = {
+                id: projectList[i].id,
+                statistical_classification: projectList[i].statistical_classification,
+                number: '1',
+                project_name: projectList[i].project_name,
+                unit: projectList[i].unit,
+                price: projectList[i].price,
+                type: 2,
+                m_id: 0
               }
-           }) 
-        },
-        submitAction(formName){
-           this.$refs[formName].validate((valid)=>{
-               var arr = []
-                for(let i=0;i<this.tableData.length;i++){
-                    arr.push(this.tableData[i].id)
-                }
-             
-               var ids = arr.join(",")
-               var item_id = this.form.item_id + "," + this.item_id.join(",") 
-               console.log("item_id",item_id)
-               
-               if(valid){
-                var params = {
-                    id:this.form.id,
-                    project_team:this.form.project_team,
-                    price:this.form.price,
-                    pinyin:this.form.pinyin,
-                    wubi:this.form.wubi,
-                    tube_color:this.form.tube_color,
-                    team_type:this.form.team_type,
-                    remark:this.form.remark,
-                    ids:ids,
-                    item_id:item_id
-                }
-                // console.log("params",params)
-                 updatedProjectTeam(params).then(response=>{
-                   if(response.data.state == 1){
-                     var projectTeam = response.data.data.projectTeam
-                     this.$message.success("保存成功")
-                     this.visible = false
-                     this.$parent.getlist()
-                   }
-                 })
+              this.projectList.push(obj)
+
+            }
+
+            for (let i = 0; i < goodInfos.length; i++) {
+              let obj = {
+                id: goodInfos[i].id,
+                statistical_classification: goodInfos[i].statistical_classification,
+                number: '1',
+                project_name: goodInfos[i].good_name,
+                unit: goodInfos[i].good_unit,
+                price: goodInfos[i].retail_price,
+                type: 3,
+                m_id: 0
+
               }
-           })  
-        
-        },
-       getlist(){
-          getAllProjectList().then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               console.log('projectlist33333',projectList)
-               this.projectList = projectList
-               var hisprojectlist = response.data.data.hisprojectlist
-             console.log("hisprojectlist",hisprojectlist)
-            //    this.tableData = hisprojectlist
-             }
-          })   
-        },
-        getId(id){
-          console.log("id",id)
-          var name = ""
-          var statistics_category =  getDictionaryDataConfig('system','statistics_category') 
-          console.log("statics",statistics_category)
-          for(let i=0;i<statistics_category.length;i++){
-             if(id == statistics_category[i].id){
-                 name = statistics_category[i].name
-             }
+              this.projectList.push(obj)
+            }
+
           }
-          return name
-        },
-       addProjectList(){
-           
-           console.log("表格",this.tableData)
-            const params = {
-              id:this.form.project_detail,
-              number:parseInt(this.form.number)
+        })
+      },
+
+      hide() {
+        this.visible = false
+      },
+      getProjectTeamDetail(id) {
+        getProjectTeamDetail(id).then(response => {
+          if (response.data.state == 1) {
+            this.tableData = []
+            var projectTeamDetail = response.data.data.projectTeamDetail
+            var hisList = response.data.data.hisList
+
+            console.log(this.projectList)
+            console.log(hisList)
+
+            for (let i = 0; i < hisList.length; i++) {
+
+              let obj = {
+                m_id: hisList[i].id,
+                id: hisList[i].project_id,
+                number: hisList[i].number,
+                type: hisList[i].type
+              }
+              if (hisList[i].type == 2) {
+                obj['statistical_classification'] = hisList[i].project.statistical_classification
+                obj['project_name'] = hisList[i].project.project_name
+                obj['unit'] = hisList[i].project.unit
+                obj['price'] = hisList[i].project.price
+
+              } else {
+                obj['project_name'] = hisList[i].good_info.good_name
+                obj['unit'] = hisList[i].good_info.good_unit
+                obj['price'] = hisList[i].good_info.retail_price
+              }
+              this.tableData.push(obj)
             }
-           console.log("params",params)
-          addProjectList(params).then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               projectList.number = parseInt(this.form.number)
-               this.tableData.push(projectList)
-               console.log("23333",this.tableData)
-               var item = response.data.data.item
-               this.item_id.push(item.id)
-               this.$message.success("保存成功")
-               this.form.project_detail = ""
-               this.form.number = ""
-               this.getlist()
-             }
-          })
-        },
-        DeleteProject(id,index){
-
-           this.$confirm("确认删除此项目吗?", "删除", {
-            confirmButtonText: "确 定",
-            cancelButtonText: "取 消",
-            type: "warning"
-         }).then(() => {
-          DeleteProject(id).then(response => {
-            if (response.data.state == 1) {
-               this.tableData.splice(index, 1);
-               
-            } else {
-             
+            this.form.id = projectTeamDetail.id
+            this.form.project_team = projectTeamDetail.project_team
+            this.form.price = projectTeamDetail.price
+            this.form.pinyin = projectTeamDetail.pinyin
+            this.form.wubi = projectTeamDetail.wubi
+            this.form.tube_color = projectTeamDetail.tube_color
+            if (projectTeamDetail.tube_color == 0) {
+              this.form.tube_color = ''
+            }
+            this.form.team_type = projectTeamDetail.team_type
+            if (projectTeamDetail.team_type == 0) {
+              this.form.team_type = ''
             }
-          });
+            this.form.remark = projectTeamDetail.remark
+            // this.form.item_id = projectTeamDetail.item_id
+            //  console.log("project",projectTeamDetail)
+          }
         })
-        .catch(() => {});
+      },
+      submitAction(formName) {
+        this.$refs[formName].validate((valid) => {
+          var arr = []
+          for (let i = 0; i < this.tableData.length; i++) {
+            if (this.tableData[i].m_id == 0) {
+              arr.push(this.tableData[i])
+            }
+          }
+
+          if (valid) {
+            var params = {
+              id: this.form.id,
+              project_team: this.form.project_team,
+              price: this.form.price,
+              pinyin: this.form.pinyin,
+              wubi: this.form.wubi,
+              tube_color: this.form.tube_color,
+              team_type: this.form.team_type,
+              remark: this.form.remark
+            }
+            let data = {
+              'info': arr
+            }            // console.log("params",params)
+            editTeam(params, data).then(response => {
+              if (response.data.state == 1) {
+                // var projectTeam = response.data.data.projectTeam
+                this.$message.success('保存成功')
+                this.visible = false
+                // this.$parent.getlist()
+              }
+            })
+          }
+        })
+
+      },
+      getId(id) {
+        console.log('id', id)
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        console.log('statics', statistics_category)
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      addProjectList() {
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (this.form.project_detail == this.projectList[i].id) {
+            this.projectList[i].number = this.form.number
+            this.projectList[i].number = this.projectList[i].number.toString()
+            this.tableData.push(this.projectList[i])
+            this.form.project_detail = ''
+            this.form.number = ''
+          }
         }
+
+      },
+      DeleteProject(id, index) {
+
+        if (id == 0) {
+          this.$confirm('确认删除此项目吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            this.tableData.splice(index, 1)
+
+          })
+            .catch(() => {
+            })
+
+        } else {
+          this.$confirm('确认删除此项目吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            DeleteProject(id).then(response => {
+              if (response.data.state == 1) {
+                this.tableData.splice(index, 1)
+
+              } else {
+
+              }
+            })
+          })
+            .catch(() => {
+            })
+
+        }
+
+      }
     },
-    created(){
-       this.getlist()   
+    created() {
+      this.getlist()
+    },watch: {
+      'tableData': function() {
+        let c = 0
+        this.form.price  = 0
+        for (let i = 0; i < this.tableData.length; i++) {
+          let a = parseFloat(this.tableData[i].number).toFixed(2)
+          let b = parseFloat(this.tableData[i].price).toFixed(2)
+          console.log(a)
+          console.log(b)
+
+
+          c = c + this.form.price + (a * b)
+
+        }
+        this.form.price = c.toFixed(2)
+      }
+
     }
-}
+  }
 </script>

src/xt_pages/data/components/inspection.vue

@@ -37,7 +37,7 @@
                    {{scope.row.wubi}}
                 </template>
             </el-table-column>
-            <el-table-column label="价格" width="60" align="center">
+            <el-table-column label="价格" width="100" align="center">
                 <template slot-scope="scope">
                    {{scope.row.price}}
                 </template>

src/xt_pages/data/components/project.vue

@@ -39,8 +39,8 @@
             </div>
         </div>
         <div style="display:flex; align-items:center;margin-bottom:10px;">
-        <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
-        <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>-->
+        <el-button type="primary" size="small" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
         <el-link target="_blank" href="https://kuyi.shengws.com/itemTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -114,12 +114,12 @@
                 <template slot-scope="scope">
                     <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
                     <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
-                      <span v-if="scope.row.is_mark ==0">备案</span>
-                      <span v-if="scope.row.is_mark ==1">撤销</span>
-                    </el-button>
+                    <!--<el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">-->
+                      <!--<span v-if="scope.row.is_mark ==0">备案</span>-->
+                      <!--<span v-if="scope.row.is_mark ==1">撤销</span>-->
+                    <!--</el-button>-->
 
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left">
                         <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
                         <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
                     </el-button>
@@ -214,7 +214,7 @@ export default {
             total:0,
             tableData: [],
             is_start:0,
-            is_charge:0,
+            is_charge:'',
             selectDrug:[],
             optionOne: [
             {
@@ -228,7 +228,6 @@ export default {
               label: '未备案'
           }],
           is_mark:"",
-          limit:100,
           page:1,
           departMentList:[],
            dialogVisible:false,

src/xt_pages/data/components/templateTable.vue

@@ -354,6 +354,7 @@ export default {
         }
 
         if (valid) {
+           
           createConfig(this.temp).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/data/druguseTemplate.vue

@@ -347,6 +347,7 @@
                           :fetch-suggestions="querySearch"
                           placeholder="请输入内容"
                           @input="changeDrugName"
+                          @select="hangleSelectChange"
                       ></el-autocomplete>
                     </el-form-item>
                   </el-col>
@@ -549,6 +550,7 @@
                           :fetch-suggestions="querySearch"
                           placeholder="请输入内容"
                           @input="changeDrugNameTwo"
+                          @select="hangdleSelectTwo"
                          ></el-autocomplete>
                     </el-form-item>
                   </el-col>
@@ -1685,6 +1687,7 @@
         let name = encodeURIComponent(this.form.name)
         console.log("params",params)
         let sort = this.form.sort
+        
         postAdviceTemplate(params, name,sort, this.form.advice_type).then(response => {
 
           if (response.data.state == 0) {
@@ -1814,17 +1817,20 @@
         })
       },
       handleSelect1(){
-
+       this.templateForm.drug_id =  val.id
+       this.templateForm.way = 1
       },
-      handleSelect(){
-
+      handleSelect(val){
+        console.log("val23232",val)
+        this.templateForm.drug_id =  val.id
+        this.templateForm.way = 1
       },
       submitTemplate(formName) {
 
-        if(this.src_type == ""){
-            this.templateForm.way = 0
-            this.templateForm.drug_id = 0
-        }
+        // if(this.src_type == ""){
+        //     this.templateForm.way = 0
+        //     this.templateForm.drug_id = 0
+        // }
 
         if(this.src_type == 2){ //自备药
             var arr = this.templateForm.advice_name.split("(自备药)")
@@ -2198,13 +2204,13 @@
       //编辑医嘱
       submitEditTemplate(formName) {
 
-         var drug_id = 0
-         for(let i=0;i<this.all_drug.length;i++){
-           if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
-              drug_id = this.all_drug[i].id
-           }
-         }
-        this.templateFormEdit.drug_id = drug_id
+        //  var drug_id = 0
+        //  for(let i=0;i<this.all_drug.length;i++){
+        //    if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
+        //       drug_id = this.all_drug[i].id
+        //    }
+        //  }
+        // this.templateFormEdit.drug_id = drug_id
 
         console.log("编辑子药",this.templateFormEdit)
 
@@ -2373,9 +2379,11 @@
           this.templateForm.week_days = this.templateForm.weekday.filter(function(s) {
             return s && s.trim()
           }).join(',')
+          this.templateForm.way = 1
         }
+        this.templateForm.way = 1
         console.log("编辑模板",this.templateForm)
-
+      
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
@@ -2896,6 +2904,11 @@
             }
         }
       },
+      hangdleSelectTwo(val){
+        console.log("我的223232",val)
+
+        this.templateFormEdit.drug_id = val.id
+      },
       changeDrugDescTwo(name) {
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
@@ -2913,6 +2926,8 @@
       },
 
 
+
+
      querySearch(queryString, cb) {
         console.log('queryString',queryString)
         var restaurants = this.all_drug;
@@ -2945,7 +2960,11 @@
       },
      sortData(a, b) {
        return a.sort - b.sort
-     }
+     },
+     hangleSelectChange(val){
+      this.templateForm.way = 1
+      this.templateForm.drug_id = val.id
+    }
     }
   }
 </script>

src/xt_pages/data/specialDictionary.vue

@@ -6,44 +6,44 @@
     <div class="app-container">
       <el-tabs v-model="activeName">
         <el-tab-pane label="药品" name="1">
-          <drugs></drugs>
+          <drugs v-if="activeName == 1"></drugs>
         </el-tab-pane>
         <el-tab-pane label="耗材" name="2">
-          <consumables></consumables>
+          <consumables v-if="activeName == 2"></consumables>
         </el-tab-pane>
         <el-tab-pane label="项目" name="3">
-         <project></project>
+         <project v-if="activeName == 3"></project>
         </el-tab-pane>
         <el-tab-pane label="项目组套" name="4">
-        <inspection></inspection>
+        <inspection v-if="activeName == 4"></inspection>
         </el-tab-pane>
         <el-tab-pane label="生产厂商" name="5">
           <!--<manufacturer></manufacturer>-->
-          <manufacturer></manufacturer>
+          <manufacturer v-if="activeName == 5"></manufacturer>
         </el-tab-pane>
         <el-tab-pane label="经销商" name="6">
           <!--<supplier></supplier>-->
-          <dealer></dealer>
+          <dealer v-if="activeName == 6"></dealer>
         </el-tab-pane>
         <el-tab-pane label="疾病类型" name="7">
         <!--<manufacturer></manufacturer>-->
-        <diagnosis></diagnosis>
+        <diagnosis v-if="activeName == 7"></diagnosis>
       </el-tab-pane>
         <!--<el-tab-pane label="医疗类别" name="8">-->
           <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
           <!--<diagnosis></diagnosis>-->
         <!--</el-tab-pane>-->
         <el-tab-pane label="附加收费配置" name="8">
-          <addtion></addtion>
+          <addtion v-if="activeName == 8"></addtion>
         </el-tab-pane>
 
         <el-tab-pane label="配置项字典" name="9">
-          <configure></configure>
+          <configure v-if="activeName == 9"></configure>
         </el-tab-pane>
 
         <el-tab-pane label="诊断信息" name="10">
           <!--<diagnosis></diagnosis>-->
-          <diagnose-other></diagnose-other>
+          <diagnose-other v-if="activeName == 10"></diagnose-other>
         </el-tab-pane>
 
       </el-tabs>

src/xt_pages/data/template.vue

@@ -45,7 +45,9 @@ export default {
         { label: this.$t("data_config.nursing_record"), key: "nursing_record" },
         { label: this.$t("data_config.special_record"), key: "special_record" },
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
-        { label: this.$t("data_config.rescue_record"), key: "rescue_record" }
+        { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
+        { label: this.$t("data_config.template_summary"), key: "template_summary" },
+        { label: this.$t("data_config.template_plan"), key: "template_plan" }
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -2049,10 +2049,18 @@ export default {
 
 
           for (const index in this.records) {
+            for(const index2 in this.records[index].his_project){
+              if(this.records[index].his_project[index2].type == 2){
+                this.records[index].his_project[index2]['advice_name'] = this.records[index].his_project[index2].project.project_name
+              }else if(this.records[index].his_project[index2].type == 3){
+                this.records[index].his_project[index2]['advice_name'] =this.records[index].his_project[index2].good_info.good_name
+              }
+              this.records[index].his_project[index2]['advice_doctor'] = this.records[index].his_project[index2].doctor
+            }
             this.records[index].advices = this.records[index].advices.concat(this.records[index].his_advices)
+            this.records[index].advices = this.records[index].advices.concat(this.records[index].his_project)
           }
 
-
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -249,6 +249,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 37">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 39">
         <el-button
           size="small"
@@ -259,6 +269,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 40">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -837,8 +857,12 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyTwo" });
       } else if (this.template_id == 33) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
+      } else if (this.template_id == 37) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtySeven" });
       } else if (this.template_id == 39) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
+      } else if (this.template_id == 40) {
+        this.$router.push({ path: "/dialysis/print/batch/forty" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -56,17 +56,23 @@
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
-          <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_zongliang != "0" ? "ml" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+            <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_zongliang != "0" ? "ml" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          </span>
+          <span v-else>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-else>{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          </span>
         </li>
 
         <li v-if="isShow('透析器/灌流器')">
@@ -134,17 +140,23 @@
         <li v-if=" isShow('首剂') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>首剂 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
-          <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span >
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+            <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          </span>
+          <span v-else>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-else>{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          </span>
         </li>
 
         <li v-if="isShow('钙')">
@@ -224,17 +236,23 @@
         <li v-if="isShow('维持') && getValueStr('anticoagulant', 'anticoagulant') != 5">
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
-          <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_weichi != "0" ? "ml/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101">
+            <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_weichi != "0" ? "ml/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          </span>
+          <span v-else>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-else>{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          </span>
         </li>
 
         <li

src/xt_pages/dialysis/details/NavIgation.vue

@@ -90,6 +90,7 @@
       :schedual="temp_schedual"
       :stockType="stockType"
       :lastAssessment="lastAssessment"
+      :mode_id="mode_id"
     ></dialysis-prescription-dialog>
 
     <double-check-dialog
@@ -209,12 +210,16 @@ export default {
 
   data() {
     return {
-      temp_schedual: {}
+      temp_schedual: {},
+      mode_id:1
     };
   },
   mounted() {},
 
   props: {
+    mode_id:{
+      type:Number
+    },
     longAdvices: {
       // 临时医嘱
       type: Array,

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -40,7 +40,7 @@
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id == 40">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id != 40">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">
@@ -309,6 +309,10 @@
           <label>跌倒风险: </label>
           <span class="content" >{{ getFallrisk(this.record.fallrisk)}}</span>
         </li>
+        <li v-if="isShow('机器运行')">
+          <label>机器运行: </label>
+          <span class="content" >{{ this.record.machine_run}}</span>
+        </li>
       </ul>
     </div>
     <div class="note">

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -432,7 +432,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 40" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">
@@ -678,6 +678,21 @@
              </el-select>
             </el-form-item>
         </el-col>
+
+      <el-col :span="8" v-if="isShow('机器运行')">
+            <el-form-item label="机器运行: ">
+              <el-select v-model="form.machine_run">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option
+                  v-for="item in machineList"
+                  :label="item.name"
+                  :value="item.name"
+                  :key="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+       </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">
             <el-form-item label="KT/V：">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
@@ -853,11 +868,13 @@ export default {
         lapse:"",
         consciousness:"",
         fallrisk:"",
+        machine_run:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
       consciousnessList:[],
-      fallriskList:[]
+      fallriskList:[],
+      machineList:[],
     }
   },
   watch: {
@@ -1068,7 +1085,9 @@ export default {
       data["lapse"] = this.form.lapse
       data["consciousness"] = this.form.consciousness
       data["fallrisk"] = this.form.fallrisk
+      data["machine_run"] = this.form.machine_run
       console.log("Paramsquery",data)
+     
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
           this.loading = false
@@ -1231,6 +1250,7 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
+      
 
 
       this.form.leave_office_method = predialysis.leave_office_method
@@ -1250,6 +1270,12 @@ export default {
             }
           }
         }
+        if(last_after.id > 0){
+         this.form.hypertenison = last_after.hypertenison.toString()
+        }
+        if(last_after.id > 0){
+          this.form.hypopiesia = last_after.hypopiesia.toString()
+        }
       }
 
 
@@ -1350,6 +1376,8 @@ export default {
     this.leaveOfficeMethod = getDataConfig('hemodialysis','leave_office_method')
     this.consciousnessList = getDataConfig("hemodialysis","consciousness")
     this.fallriskList = getDataConfig("hemodialysis","fallrisk")
+     this.machineList = getDataConfig("hemodialysis","machine_run")
+     console.log("机器运行",this.machineList)
     this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
     this.patientGoseOptions = this.$store.getters.patient_gose
     this.observationContentOptions = this.$store.getters.observation_content

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -24,33 +24,7 @@
       </div>
 
 
-      <!--<el-table-->
-      <!--:header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"-->
-      <!--:data="other_doctor_advices"-->
-      <!--border-->
-      <!--style="width: 100%"-->
-      <!--ref="advices_list"-->
-      <!--@row-click="cellMouseEnter"-->
-      <!--:row-class-name="tableRowClassName"-->
-      <!--:span-method="objectSpanMethod"-->
-      <!--:cell-class-name="adviceNameShow"-->
-      <!--:modal-append-to-body="false"-->
-      <!--highlight-current-row-->
-      <!--@current-change="handleCurrentChange"-->
-      <!--&gt;-->
-
-      <!--<el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">-->
-      <!--<template slot-scope="scope">-->
-      <!--<span class="el-dropdown-link">-->
-      <!--{{ getAdviceContent(scope.row, 1)-->
-      <!--}}-->
-      <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-      <!--</span>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-
-
-      <!--</el-table>-->
+      
       <el-form
         ref="adForm"
         :rules="adRules"
@@ -1301,43 +1275,55 @@
               this.exceLoading = false
               return false
             } else {
-
               this.$notify({
                 title: '成功',
                 message: '执行医嘱成功',
                 type: 'success',
                 duration: 2000
               })
-              var exid = response.data.data.advice.id
-              if (response.data.data.advice.parent_id > 0) {
-                exid = response.data.data.advice.parent_id
-              }
-              // if (this.currentRow.parent_id > 0) {
-              //     exid = this.currentRow.parent_id;
-              // }
-              this.currentRow.execution_state = 1
-              this.currentRow.execution_staff =
-                response.data.data.advice.execution_staff
-              this.currentRow.execution_time =
-                response.data.data.advice.execution_time
-              var alen = this.doctor_advices.length
-
-              for (var index in this.doctor_advices) {
-                if (
-                  this.doctor_advices[index].id == exid ||
-                  this.doctor_advices[index].parent_id == exid
-                ) {
-                  this.doctor_advices[index].execution_state = 1
-                  this.doctor_advices[index].execution_staff =
+              var msg = response.data.data.msg
+              if(msg == 1){
+                var exid = response.data.data.advice.id
+                  if (response.data.data.advice.parent_id > 0) {
+                    exid = response.data.data.advice.parent_id
+                  }
+                
+                  this.currentRow.execution_state = 1
+                  this.currentRow.execution_staff =
                     response.data.data.advice.execution_staff
-                  this.doctor_advices[index].execution_time =
+                  this.currentRow.execution_time =
                     response.data.data.advice.execution_time
-                  // this.doctor_advices[index].checker = response.data.data.advice.checker;
-                  break
-                }
+                  var alen = this.doctor_advices.length
+
+                  for (var index in this.doctor_advices) {
+                    if (
+                      this.doctor_advices[index].id == exid ||
+                      this.doctor_advices[index].parent_id == exid
+                    ) {
+                      this.doctor_advices[index].execution_state = 1
+                      this.doctor_advices[index].execution_staff =
+                        response.data.data.advice.execution_staff
+                      this.doctor_advices[index].execution_time =
+                        response.data.data.advice.execution_time
+                      // this.doctor_advices[index].checker = response.data.data.advice.checker;
+                      break
+                    }
+                  }
+                  this.execTimeDialogVisible = false
+                  return false
               }
-              this.execTimeDialogVisible = false
-              return false
+
+              if(msg == 2){
+                this.$message.error("库存不足,请入库")
+                this.execTimeDialogVisible = false
+                return false
+              }
+              if(msg == 3){
+                this.$message.error("无库存,请入库")
+                this.execTimeDialogVisible = false
+                return false
+              }
+              
             }
           })
           .catch(() => {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -693,13 +693,18 @@ export default {
             adviceNames: [],
             advice_doctor: this.groupForm.advice_doctor,
             remark: this.groupForm.remark,
-            parent_id: this.groupForm.parent_id
-          };
+            parent_id: this.groupForm.parent_id,
+            id:this.groupForm.id,
          
+          };
+          console.log("hhhhh",this.drug_id,this.nameForm.way)
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           }
+          for(let i=0;i<adviceNames.length;i++){
+            adviceNames[i].template_id = "888888888"
+          }
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
@@ -729,7 +734,7 @@ export default {
              }
           }
           console.log("2222",submitForm)
-          
+         
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -853,8 +858,8 @@ export default {
     submitNameForm(formName) {
       
        if(this.src_type == ""){
-          this.nameForm.way = 0
-          this.nameForm.drug_id = 0
+          this.nameForm.way = 1
+          this.nameForm.drug_id = this.drug_id
           this.nameForm.drug_name_id = 0
        }
 
@@ -1555,6 +1560,7 @@ export default {
                 obj.type = 2
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
+                obj.id = medicalList[i].id
                 this.all_drug.push(obj)
               }
             }
@@ -1590,6 +1596,7 @@ export default {
                 obj.type = 1
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
+                obj.id = base_drug_list[i].id
                 this.all_drug.push(obj)
 
               }
@@ -1610,8 +1617,10 @@ export default {
             this.drugSpec = this.all_drug[i].drug_specs
           }
        }
+     
     },
     changeDrugDesc(name) {
+      
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1669,8 +1678,12 @@ export default {
         cb(results);
       },
 
-      handleSelect(){
-
+      handleSelect(val){
+        console.log("22222",val)
+        this.drug_id = val.id
+        this.nameForm.way = 1 
+        console.log("hhhh23",this.drug_id) 
+        console.log("hhhhhh",this.nameForm.way)
       },
       handleSelect1(){
 
@@ -1684,6 +1697,7 @@ export default {
   created(){
     //获取自备药
     this.getSelfMedicalList()
+    console.log("模板数据",this.adviceTemplates)
   }
 };
 </script>

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -566,7 +566,7 @@
           </el-col>
           
           <el-col :span="8">
-            <el-form-item label="预计进食量:" v-if="isShow('预计进食量')">
+            <el-form-item label="预计进食量(g):" v-if="isShow('预计进食量')">
              <el-input v-model="assessmentBeforeDislysis.estimated_food_intake"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -168,6 +168,7 @@
                   template_id == 38 ||
                   template_id == 39 ||
                   template_id == 40 ||
+                  template_id == 41 ||
                   org_id == 9555)
             "
           >
@@ -212,6 +213,7 @@
                 template_id != 38 &&
                 template_id != 39 &&
                 template_id != 40 &&
+                template_id != 41 &&
                 org_id!=9555
             "
           >
@@ -229,7 +231,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38  || template_id == 41) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -240,7 +242,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38  && template_id != 41"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -578,12 +580,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38 && template_id != 41">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -591,7 +593,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 41 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -599,7 +601,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38  && template_id!=41 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -512,6 +512,46 @@ export default {
             console.log("列表数据",schedules)
             var config = resp.data.config
             console.log("config222222",config.is_open)
+            let project_config = resp.data.project_config
+            console.log('project_config',)
+            if(project_config.is_open == 1){
+              this.project = resp.data.project
+              resp.data.hisAdvices.map((item,index) => {
+                if(this.project[index].project.length > 0){
+                  this.project[index].project.map(it => {
+                    let obj = {
+                      advice_doctor: it.doctor,
+                      start_time:it.start_time,
+                      advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                      execution_time:it.execution_time,
+                      execution_state:it.execution_state,
+                      execution_staff:it.execution_staff,
+                      check_time:it.check_time,
+                      check_state:it.check_state,
+                      checker:it.checker,
+                      created_time:it.ctime,
+                      delivery_way:'',
+                      execution_frequency:'',
+                      remark:'',
+                      id:it.id,
+                      patient_id:it.patient_id,
+                      parent_id:0,
+                      groupno:0
+                    }
+                    // let advice = []
+                    // advice.push(obj)
+                    // let advices = {
+                    //   advices: advice,
+                    //   group_no: 123
+                    // }
+
+                //     // console.log(11111,item.new_advice)
+                    item.doctor_advice.push(obj)
+                  })
+                }
+              })
+            }
+            console.log('resp.data.hisAdvices',resp.data.hisAdvices)
            if(config.is_open == 0 || config.is_open == 2){
             this.show = true
             this.showOne = false
@@ -578,7 +618,7 @@ export default {
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
-          
+            console.log("hhhhhhhh22323232323232",schedules)
             let arr = []
             let newArr = []
             let newSchedules = []
@@ -638,7 +678,7 @@ export default {
             this.indexInfoList = newArr
            }
          }
-        //  console.log("列表22222",this.scheduleMap)
+         console.log("列表22222",this.indexInfoList)
         })
     },
     getValue: function(val) {
@@ -878,7 +918,7 @@ export default {
             tempSingleDoseDesc =
               ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
           } else {
-            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+            tempSingleDoseDesc = row.single_dose ? row.single_dose : '' + '' + row.single_dose_unit ? row.single_dose_unit : ''
           }
         }
 
@@ -887,7 +927,12 @@ export default {
         }
 
         if (isChild == 1) {
-          // 不是子药
+          // 不是子药 
+          console.log(tempDrugSpecDesc)
+          console.log(tempPrescribingNumberDesc)
+          console.log(tempSingleDoseDesc)
+          console.log(11,row.delivery_way)
+          console.log(22,row.execution_frequency)
 
           return (
             row.advice_name +

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -563,6 +563,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 41">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -843,6 +853,11 @@
             v-if="org_template_info.template_id == 40"
           >
           </DialysisPrintOrderForty>
+          <DialysisPrintOrderFortyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 41"
+          >
+          </DialysisPrintOrderFortyOne>
         </div>
       </el-container>
     </div>
@@ -902,9 +917,11 @@ import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySe
 import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEight";
 import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNine";
 import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
+import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortyOne,
     DialysisPrintOrderForty,
     DialysisPrintOrderThirtyNine,
     DialysisPrintOrderThirtyEight,
@@ -1390,6 +1407,13 @@ export default {
           style: style5,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 41){
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -285,6 +285,43 @@ export default {
                 if (resp.state == 1) {
                 this.admin_user = resp.data.adminUser
                 var config = resp.data.config
+                let project_config = resp.data.project_config
+                console.log('project_config',resp.data.project_config)
+                if(project_config.is_open == 1){
+                    this.project = resp.data.project
+                    resp.data.hisAdvices.map((item,index) => {
+                    item.new_advice = item.new_advice ? item.new_advice : []
+                    if(this.project[index].project.length > 0){
+                        this.project[index].project.map(it => {
+                        let obj = {
+                            advice_doctor: it.doctor,
+                            start_time:it.start_time,
+                            advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                            execution_time:it.execution_time,
+                            execution_state:it.execution_state,
+                            execution_staff:it.execution_staff,
+                            check_time:it.check_time,
+                            check_state:it.check_state,
+                            checker:it.checker,
+                            created_time:it.ctime,
+                            remark:'',
+                            id:it.id,
+                            parent_id:0,
+                            groupno:0
+                        }
+                        // let advice = []
+                        // advice.push(obj)
+                        // let advices = {
+                        //   advices: advice,
+                        //   group_no: 123
+                        // }
+
+                        // console.log(11111,item.new_advice)
+                        item.doctor_advice.push(obj)
+                        })
+                    }
+                    })
+                }
                 if(config.is_open == 0 || config.is_open == 2){
                 
                    var schedulesArr = resp.data.scheduals

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -506,7 +506,7 @@
                      {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
                   </div>
                 </td>
-                <td width="10">ml)</td>
+                <td width="10">L)</td>
                 <td width="50"><label-box :isChecked="prescription.mode_id != 5 && prescription.mode_id != 1 && prescription.mode_id != 2 ? true : false" showValue="其他"></label-box></td>
                 <td width="50">
                   <div class="under-line">&nbsp;
@@ -542,7 +542,7 @@
                 </td>
                 <td width="10">(</td>
                 <td width="35">首剂</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_shouji}}</span>
                     </div>
@@ -550,14 +550,14 @@
                 <td width="20">mg</td>
                 <td width="10"></td>
                 <td width="35">追加</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_weichi}}</span>
                     </div>
                 </td>
                 <td width="40">mg/h</td>
                 <td width="35">总量</td>
-                <td width="40">
+                <td width="50">
                     <div class="under-line">&nbsp;
                     <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_zongliang}}</span>
                     </div>
@@ -2185,65 +2185,65 @@ export default {
             for (let index = 0; index < this.doctor_advices.length; index++) {
               this.doctor_advices[index]['isShow'] = 2
             }
-            if (this.doctor_advices.length === 0) {
-              var obj = { advice_name: '', start_time: '' }
-              var obj1 = { advice_name: '', start_time: '' }
-              var obj2 = { advice_name: '', start_time: '' }
-              var obj3 = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj3)
-              this.doctor_advices.push(obj3)
-              this.doctor_advices.push(obj3)
-              this.doctor_advices.push(obj3)
-            }
-            if (this.doctor_advices.length === 1) {
-              var obj = { advice_name: '', start_time: '' }
-              var obj1 = { advice_name: '', start_time: '' }
-              var obj2 = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj2)
-              this.doctor_advices.push(obj2)
-            }
-            if (this.doctor_advices.length === 2) {
-              var obj = { advice_name: '', start_time: '' }
-              var obj1 = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj1)
-              this.doctor_advices.push(obj1)
-            }
-            if (this.doctor_advices.length === 3) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-            }
-            if (this.doctor_advices.length === 4) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-            }
-            if (this.doctor_advices.length === 5) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-            }
-            if (this.doctor_advices.length === 6) {
-              // eslint-disable-next-line no-redeclare
-              var obj = { advice_name: '', start_time: '' }
-              this.doctor_advices.push(obj)
-            }
+            // if (this.doctor_advices.length === 0) {
+            //   var obj = { advice_name: '', start_time: '' }
+            //   var obj1 = { advice_name: '', start_time: '' }
+            //   var obj2 = { advice_name: '', start_time: '' }
+            //   var obj3 = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj3)
+            //   this.doctor_advices.push(obj3)
+            //   this.doctor_advices.push(obj3)
+            //   this.doctor_advices.push(obj3)
+            // }
+            // if (this.doctor_advices.length === 1) {
+            //   var obj = { advice_name: '', start_time: '' }
+            //   var obj1 = { advice_name: '', start_time: '' }
+            //   var obj2 = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj2)
+            //   this.doctor_advices.push(obj2)
+            // }
+            // if (this.doctor_advices.length === 2) {
+            //   var obj = { advice_name: '', start_time: '' }
+            //   var obj1 = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj1)
+            //   this.doctor_advices.push(obj1)
+            // }
+            // if (this.doctor_advices.length === 3) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            // }
+            // if (this.doctor_advices.length === 4) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            // }
+            // if (this.doctor_advices.length === 5) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            //   this.doctor_advices.push(obj)
+            // }
+            // if (this.doctor_advices.length === 6) {
+            //   // eslint-disable-next-line no-redeclare
+            //   var obj = { advice_name: '', start_time: '' }
+            //   this.doctor_advices.push(obj)
+            // }
             this.adviceLength = this.doctor_advices.length + 1
 
             if (this.doctor_advices.length > 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1465,7 +1465,7 @@ export default {
           this.afterdialysis = afterdialysis
           // eslint-disable-next-line no-unused-vars
           var doctoradvce = response.data.data.doctorAdvice
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
           this.newTableAdvice = response.data.data.doctorAdevieInfo
           console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
           var tableAdvice = doctorAdevieInfo

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -47,13 +47,15 @@
         <div class="inline_block">
           病区：
           <div class="under_line" style="width: 50px;text-align: center;">
-            {{ "/" }}
+            <span v-if="org_id == 10121">{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
+            <span v-else>{{ "/" }}</span>
           </div>
         </div>
         <div class="inline_block">
           床号：
           <div class="under_line" style="width: 50px;text-align: center;">
-            {{ "/" }}
+            <span v-if="org_id == 10121">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
+            <span v-else>{{ "/" }}</span>
           </div>
         </div>
         <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -487,6 +487,7 @@
                     </tr>
                     <tr>
                       <td width="60">时间</td>
+                      <td width="50">体温<br />°C</td>
                       <td width="60">血压<br />(mmHg)</td>
                       <td width="50">脉搏<br />(次/分)</td>
                       <td width="50">呼吸<br />(次/分)</td>
@@ -517,6 +518,7 @@
 
                     <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                       <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                      <td>{{ monitor.temperature ? monitor.temperature : "" }}</td>
                       <td>
                         {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -236,7 +236,7 @@
               预设脱水
               <div class="inline_block under_line" style="width:100px;">
                   {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : ' ' }}
-              </div>kg
+              </div>L
           </div>
       </div>
       <div class="row">
@@ -259,7 +259,7 @@
               实际脱水
               <div class="inline_block under_line" style="width:100px;">
                   {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : " " }}
-              </div>kg
+              </div>L
           </div>
       </div>
       <div class="row">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -14,9 +14,9 @@
       <div class="lineHeight">基本信息</div>
       <div class="lineHeight">
           <div class="widthLength25">年龄：{{ getAge(patientInfo) }}</div>
-          <div class="widthLength25">透析年龄：{{ patientInfo.dialysis_age ? patientInfo.dialysis_age : '/' }}月</div>
+          <div class="widthLength25">透析年龄：{{ patientInfo.first_dialysis_date ? getMonths(patientInfo.first_dialysis_date) : '/' }}月</div>
           <div class="widthLength25">入院方式：{{ receiverTreatmentAccess.way ? receiverTreatmentAccess.way : '/' }}</div>
-          <div class="widthLength25">累计：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+          <div class="widthLength25">累计：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }} 次</div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">首次透析时间：{{ patientInfo.first_treatment_date ? getTime(patientInfo.first_treatment_date ? patientInfo.first_treatment_date : 0, "{y}-{m}-{d}") : '/' }}</div>
@@ -85,7 +85,7 @@
           <div class="widthLength25">附加重物量：{{ predialysis.additional_weight ? predialysis.additional_weight : 0 }} Kg</div>
           <div class="widthLength25">透前体重：{{ predialysis.weight_before ? predialysis.weight_before : "" }} Kg</div>
           <div class="widthLength25">干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "" }} Kg</div>
-          <div class="widthLength25">预计进食量：{{ predialysis.estimated_food_intake ? predialysis.estimated_food_intake : '无' }}</div>
+          <div class="widthLength25">预计进食量：{{ predialysis.estimated_food_intake ? predialysis.estimated_food_intake + ' g' : '无' }}</div>
       </div>
       <div class="lineHeight">
           其他：{{ predialysis.remark ? predialysis.remark : '' }}
@@ -111,7 +111,8 @@
       <div class="lineHeight">
           <div class="widthLength25">实际进食量：{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>
           <div class="widthLength25">透后体重：{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} Kg</div>
-          <div class="widthLength25">脉搏：{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} 次/分</div>
+          <div class="widthLength25">脉搏：{{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }} 次/分</div>
+          <div class="widthLength25"></div>
       </div>
       <div class="lineHeight">治疗方案：</div>
       <div class="lineHeight">
@@ -169,7 +170,6 @@
             <td colspan="3" style="width:130px;height:40px">执行时间</td>
             <td colspan="2" style="width:130px;height:40px">核对护士</td>
             <td colspan="2" style="width:108px;height:40px">执行护士</td>
-            <td colspan="2" style="width:108px;height:40px">带教学生</td>
           </tr>
 
           <tr v-for="(advice, advice_index) in tableAdvice" style="height:30px">
@@ -211,7 +211,6 @@
               </span>
               <img style="height:20px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
             </td>
-            <td colspan="2"><span v-if="advice.start_time">无</span></td>
           </tr>
         </tbody>
       </table>
@@ -260,9 +259,8 @@
               <img class="es-img" style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
             </span>
           </div>
-          <div style="width:16%;">学生：无</div>
       </div>
-      <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? monitors[0].blood_pressure_monitoring_site : '' }}</div>
+      <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? getBloodPressureMmonitoringSite(monitors[0].blood_pressure_monitoring_site) : '' }}</div>
       <table class="print-table" border="1">
         <tbody>
           <tr>
@@ -300,7 +298,7 @@
             <td>&nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
             <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
-            <td>&nbsp;{{ monitor.complication ? monitor.complication : "" }}</td>
+            <td>&nbsp;{{ monitor.complication ? getComplication(monitor.complication) : "" }}</td>
             <td style="text-align:left;padding-left:10px;">
               <div v-if="monitor.operate_time" style="line-height:20px;text-align: left;display: inline-block;">
                 {{ monitor.dispose ? monitor.dispose : '无' }}
@@ -331,7 +329,7 @@
           <div class="widthLength25">实际治疗时长：{{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : 0 }}小时
             {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}分钟
           </div>
-          <div class="widthLength25">静脉管道：
+          <!-- <div class="widthLength25">静脉管道：
             <span v-if="afterdialysis.intravenous_tube == 1">0级</span>
             <span v-if="afterdialysis.intravenous_tube == 2">I级</span>
             <span v-if="afterdialysis.intravenous_tube == 3">Ⅱ级</span>
@@ -342,8 +340,10 @@
             <span v-if="afterdialysis.arterial_tube == 2">I级</span>
             <span v-if="afterdialysis.arterial_tube == 3">Ⅱ级</span>
             <span v-if="afterdialysis.arterial_tube == 4">Ⅲ级</span>
-          </div>
+          </div> -->
           <div class="widthLength25">透析器凝血：{{ afterdialysis.cruor ? afterdialysis.cruor : "" }}</div>
+          <div class="widthLength25"></div>
+          <div class="widthLength25"></div>
           
       </div>
       <div class="lineHeight">
@@ -413,8 +413,6 @@
               <img class="es-img" style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
             </span>
           </div>
-          <div style="width:16%;">学生：无</div>
-          <div style="width:16%;">带教老师：无</div>
       </div>
       <div class="lineHeight">
           病程记录：
@@ -573,10 +571,40 @@ export default {
         finish_nurse: "",
         url: ""
       },
-      displaceLiquiPartOptions: []
+      displaceLiquiPartOptions: [],
+      complicationList:[],
+      bloodPressureMmonitoringSite:[]
     };
   },
   methods: {
+    getMonths(t){
+      var ot=new Date(t); //转为时间对象（js的时间戳是毫秒数）
+      var oy=ot.getFullYear(); //年
+      var om=ot.getMonth()+1; //月
+      var tt=new Date(); //今天
+      var ty=tt.getFullYear(); //今天年
+      var tm=tt.getMonth()+1; //今天月
+      var gm=(ty-oy)*12+(tm-om); //距今月数
+      return gm
+    },
+    getBloodPressureMmonitoringSite(id){
+      var name = "";
+      for(let i=0;i<this.bloodPressureMmonitoringSite.length;i++){
+         if(id == this.bloodPressureMmonitoringSite[i].id){
+            name = this.bloodPressureMmonitoringSite[i].name
+         }
+      }
+      return name
+    },
+    getComplication(id){
+      var name = "";
+      for(let i=0;i<this.complicationList.length;i++){
+         if(id == this.complicationList[i].id){
+            name = this.complicationList[i].name
+         }
+      }
+      return name
+    },
     getDisplaceLiquiPart: function(val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;
@@ -727,7 +755,7 @@ export default {
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
           console.log("上次透后体重", this.assessmentafter);
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo;
-          var doctorAdevieInfo = response.data.data.advices;
+          var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
           var tableAdvice = doctorAdevieInfo;
           console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
@@ -883,30 +911,6 @@ export default {
           if (prescription.anticoagulant == 7) {
             prescription.anticoagulant = "低分子肝素钠";
           }
-          if (prescription.blood_access === 1) {
-            prescription.blood_access = "正常";
-          }
-          if (prescription.blood_access === 2) {
-            prescription.blood_access = "震颤";
-          }
-          if (prescription.blood_access === 3) {
-            prescription.blood_access = "堵塞";
-          }
-          if (prescription.blood_access === 4) {
-            prescription.blood_access = "血肿";
-          }
-          if (prescription.blood_access === 5) {
-            prescription.blood_access = "淤血";
-          }
-          if (prescription.blood_access === 6) {
-            prescription.blood_access = "感染";
-          }
-          if (prescription.blood_access === 7) {
-            prescription.blood_access = "自体内瘘";
-          }
-          if (prescription.blood_access === 8) {
-            prescription.blood_access = "人工血管内瘘";
-          }
           if (prescription.replacement_way === 1) {
             prescription.replacement_way = "前置换";
           }
@@ -1303,6 +1307,8 @@ export default {
     this.lapse_arr = getDataConfig("hemodialysis", "lapse");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
+    this.complicationList = getDataConfig('hemodialysis','complication')
+    this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site');
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -72,14 +72,15 @@
                 L
               </span>
               ）
-              <label-box :isChecked="prescription.mode_id > 2 ? true : false" showValue="其他："></label-box>
+              <label-box :isChecked="prescription.mode_id == 9 ? true : false" showValue="HFHD+HP"></label-box>&nbsp;
+              <label-box :isChecked="prescription.mode_id > 2 && prescription.mode_id != 9 ? true : false" showValue="其他："></label-box>
               <span v-if="prescription.mode_id == 3">{{ prescription.mode_id == 3 ? "HD+HP" : "" }}</span>
               <span v-if="prescription.mode_id == 4">{{ prescription.mode_id == 4 ? "HP" : "" }}</span>
               <span v-if="prescription.mode_id == 5">{{ prescription.mode_id == 5 ? "HF" : "" }}</span>
               <span v-if="prescription.mode_id == 6">{{ prescription.mode_id == 6 ? "SCUF" : "" }}</span>
               <span v-if="prescription.mode_id == 7">{{ prescription.mode_id == 7 ? "IUF" : "" }}</span>
               <span v-if="prescription.mode_id == 8">{{ prescription.mode_id == 8 ? "HFHD" : "" }}</span>
-              <span v-if="prescription.mode_id == 9">{{ prescription.mode_id == 9 ? "HFHD+HP" : "" }}</span>
+              <!-- <span v-if="prescription.mode_id == 9">{{ prescription.mode_id == 9 ? "HFHD+HP" : "" }}</span> -->
               <span v-if="prescription.mode_id == 10">{{ prescription.mode_id == 10 ? "PHF" : "" }}</span>
               <span v-if="prescription.mode_id == 11">{{ prescription.mode_id == 11 ? "HFR" : "" }}</span>
               <span v-if="prescription.mode_id == 12">{{ prescription.mode_id == 12 ? "HDF+HP" : "" }}</span>
@@ -112,7 +113,7 @@
               <span v-if="prescription.anticoagulant == '普通肝素'">iu</span>
               <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
-              <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp; 
+              <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp;
               追加：
               <span style="width:35px;display: inline-block;">
                 {{ prescription.anticoagulant_weichi && prescription.anticoagulant == "普通肝素" ? prescription.anticoagulant_weichi : "" }}
@@ -191,7 +192,7 @@
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1 ? true : false" showValue="临时颈内静脉导管"></label-box>&nbsp;
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="临时股静脉导管"></label-box>&nbsp;
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('移植血管') > -1 ? true : false" showValue="其他"></label-box>&nbsp;
-              
+
               穿刺方式：
               <span style="width:60px;display: inline-block;">
                 {{ predialysis.puncture_way ? predialysis.puncture_way : "" }}
@@ -681,6 +682,7 @@
             <td colspan="2" style="width:110px;height:40px">医生签名</td>
 
             <td colspan="2" style="width:108px;height:40px">执行</td>
+            <td colspan="2" style="width:108px;height:40px">核对</td>
             <td colspan="3" style="width:130px;height:40px">执行时间</td>
             <!-- <td style="width:60px;height:60px">
               <p style="height:20px;line-height:20px">核对</p>
@@ -726,6 +728,12 @@
               </span>
               <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
             </td>
+            <td colspan="2" style="height:40px">
+              <span v-if="setAdminUserES(advice.checker) == ''">
+                {{ getAdminUser(advice.checker) }}
+              </span>
+              <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset v-else />
+            </td>
             <td colspan="3" style="width:130px;">
               {{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}
             </td>
@@ -830,7 +838,7 @@
             <td width="100" style="border:none;padding-left:5px;">
               透析器凝血:
             </td>
-            <td width="100" style="text-align:left;border:none;">
+            <td style="text-align:left;border:none;">
               <div>
                 <span style="width:100px;display:inline-block;border:none;">
                   {{ afterdialysis.cruor ? afterdialysis.cruor : "" }}
@@ -839,7 +847,7 @@
             </td>
             <!-- <td width="10" style="border:none;"></td> -->
 
-            <td width="70" style="border:none;padding-left:5px;">内瘘:</td>
+            <!-- <td width="70" style="border:none;padding-left:5px;">内瘘:</td>
             <td width="200" style="text-align:left;border:none;line-height: 30px;">
               <div>
                 <span style="width:200px;display:inline-block">
@@ -854,7 +862,7 @@
                   {{ afterdialysis.catheter ? afterdialysis.catheter : "" }}
                 </span>
               </div>
-            </td>
+            </td> -->
           </tr>
         </tbody>
       </table>
@@ -1360,14 +1368,14 @@ export default {
           this.adminUser = response.data.data.users;
           this.users = response.data.data.users;
           var patientInfo = response.data.data.patientInfo;
-          console.log("烧腊店就拉萨讲道理看", patientInfo);
+          // console.log("烧腊店就拉萨讲道理看", patientInfo);
           if (patientInfo.gender === 1) {
             patientInfo.gender = "男";
           }
           if (patientInfo.gender === 2) {
             patientInfo.gender = "女";
           }
-          console.log("patientInfo", patientInfo);
+          // console.log("patientInfo", patientInfo);
           this.patientInfo = patientInfo;
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,
@@ -1383,7 +1391,7 @@ export default {
             this.patientInfo.first_dialysis_date = "";
           }
           this.check = response.data.data.check;
-          console.log("核对信息", this.check);
+          // console.log("核对信息", this.check);
           this.predialysis = response.data.data.PredialysisEvaluation;
           console.log("透前评估", this.predialysis);
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -318,7 +318,7 @@
                         <td width="80">VP<br>mmHg</td>
                         <td width="80">TMP<br>mmHg</td>
                         <td width="80">Na<br>mmol/L</td>
-                        <td width="80">UF<br>ml</td>
+                        <td width="80">UF<br>L</td>
                         <td width="80">体温</td>
                         <td width="">备注</td>
                         <td width="80">签名</td>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -139,7 +139,7 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="右"></label-box>）
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : false" showValue="中心静脉置管"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="中心静脉置管"></label-box>
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1340,6 +1340,183 @@
           </tr>
         </tbody>
       </table>
+      <table class="print-table" border="1">
+        <tbody>
+          <tr>
+            <td class="title-box" width="30px">透后评估</td>
+            <td>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="90">实际治疗时间</td>
+                    <td width="40">
+                      <div class="under-line">
+                        &nbsp;{{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : "0" }}
+                      </div>
+                    </td>
+                    <td width="10">h</td>
+                    <td width="40">
+                      <div class="under-line">
+                        &nbsp;{{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : "0" }}
+                      </div>
+                    </td>
+                    <td width="35">min</td>
+                    <td></td>
+                    <td width="75">实际超滤量</td>
+                    <td width="70">
+                      <div class="under-line">
+                        &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
+                      </div>
+                    </td>
+                    <td width="20">ml</td>
+                    <td></td>
+                    <td width="60">透后体重</td>
+                    <td width="50">
+                      <div class="under-line">
+                        &nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}
+                      </div>
+                    </td>
+                    <td width="20">Kg</td>
+                    <td width='20'></td>
+                    <td width='100'>血管杂音及震颤</td>
+                    <td width='160'>
+                        <label-box :isChecked="afterdialysis.internal_fistula&&afterdialysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="afterdialysis.internal_fistula&&afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="afterdialysis.internal_fistula&&afterdialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="无"></label-box>
+                    </td>
+                    <td></td>
+                    <!-- <td width="95">透析器堵塞:</td>
+                    <td width="200">
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('凝血0级') > -1 ? true : false) :false" showValue="0级"></label-box>
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('凝血Ⅰ级') > -1 ? true : false) :false" showValue="Ⅰ级"></label-box>
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('凝血Ⅱ级') > -1 ? true : false) :false" showValue="Ⅱ级"></label-box>
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('凝血Ⅲ级') > -1 ? true : false) :false" showValue="Ⅲ级"></label-box>
+                    </td> -->
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="80">透析器凝血</td>
+                    <td width="200">
+                      <label-box :isChecked="afterdialysis.cruor ? afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.cruor ? afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false : false" showValue="+"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.cruor ? afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false : false" showValue="+ +"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.cruor ? afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false : false" showValue="+ + +"></label-box>&nbsp;
+                    </td>
+                    <td width="70">静脉管道:</td>
+                    <td width="200">
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
+                    </td>
+                    <td width="70">动脉管道:</td>
+                    <td width="200">
+                      <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
+                    </td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width='100'>
+                        <label-box :isChecked="afterdialysis.puncture_point_haematoma == 1 ? true : false" showValue="穿刺处血肿"></label-box>
+                    </td>
+                    <td width='100'>导管特殊情况</td>
+                    <td width='200'>
+                        <div class="under-line">
+                            &nbsp;{{ afterdialysis.catheter ? afterdialysis.catheter : '' }}
+                        </div>
+                    </td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
+
+
+
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="55">并发症:</td>
+                    <td width="560">
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('无') > -1 ? true : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血压') > -1 ? true : false" showValue="低血压"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('高血压') > -1 ? true : false" showValue="高血压"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血糖') > -1 ? true : false" showValue="低血糖"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('头晕') > -1 ? true : false" showValue="头晕"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('头痛') > -1 ? true : false" showValue="头痛"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('呕吐') > -1 ? true : false" showValue="呕吐"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('肌肉痉挛') > -1 ? true : false" showValue="肌肉痉挛"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('出血') > -1 ? true : false" showValue="出血"></label-box>
+                    </td>
+                    <td width='40'>其他</td>
+                    <td width='160'>
+                      <div class="under-line">
+                        &nbsp;{{ afterdialysis.other_complication ? afterdialysis.other_complication : '' }}
+                      </div>
+                    </td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
+
+
+
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="40">冲管:</td>
+                    <td width="100">
+                      <div class="under-line">&nbsp;
+                        <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
+                        <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
+                      </div>
+                    </td>
+                    <td width=30></td>
+                    <td width="40">穿刺:</td>
+                    <td width="100">
+                      <div class="under-line">&nbsp;
+                        <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
+                        <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
+                      </div>
+                    </td>
+                    <td width='30'></td>
+                    <td width="80">责任护士:</td>
+                    <td width="100">
+                      <div class="under-line">&nbsp;
+                        <!--<span v-if="afterdialysis.creater==0">&nbsp;</span>-->
+                        <!--<img class="es-img" :src="setAdminUserES(afterdialysis.creater)" alt="" srcset="" v-else>-->
+
+                        <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
+                        <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
+                      </div>
+                    </td>
+                    <td width='30'></td>
+                    <td width='70'>医生签名</td>
+                    <td width='100'>
+                        <div class="under-line">
+                            &nbsp;
+                            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+                            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                        </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
   </div>
 </template>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

@@ -246,7 +246,7 @@
                         <td width="30"></td>
                         <td width='70'>体重增加:</td>
                         <td width="50">
-                            <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
+                            <div class="under-line">&nbsp;{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}</div>
                         </td>
                         <td width="10">Kg</td>
                         <td width="30"></td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -506,6 +506,13 @@
                   </tr>
                 </tbody>
               </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td style="text-align:left;padding-left:5px;">备注:{{ predialysis.remark ? predialysis.remark : '' }}</td>
+                  </tr>
+                </tbody>
+              </table>
             </td>
           </tr>
         </tbody>

src/xt_pages/hospitalStation/allListPrint.vue

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

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

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

src/xt_pages/hospitalStation/components/callPrescription.vue

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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -264,12 +264,7 @@
                       <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 slot-scope="scope">{{scope.row.total }}
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
@@ -279,6 +274,10 @@
                 </div>
 
               </el-tab-pane>
+              <!--// stockInCount(scope.row) - -->
+              <!--// salesReturnCount(scope.row) - -->
+              <!--// stockOutCount(scope.row) +-->
+              <!--// cancelStockCount(scope.row)-->
               <!--<el-tab-pane label="医嘱模板" name="2">-->
               <!--<div style="margin-bottom:5px;">-->
               <!--&lt;!&ndash;<el-input style="width:50%;" v-model="input" placeholder=""></el-input>&ndash;&gt;-->
@@ -473,12 +472,12 @@
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         isLastOrNextVisible: false,
@@ -577,7 +576,6 @@
       }
     },
     methods: {
-
       changeClass(id) {
         this.tabProject = [];
         if (id == 0) {
@@ -591,6 +589,9 @@
         }
       },
       setMonthPrescription(month_prescriptions) {
+
+
+
         this.month_prescriptions = [];
 
         let drug_month_prescriptions = {
@@ -663,12 +664,6 @@
           return cur
         }, []); // 设置cur默认类型为数组，并且初始值为空的数组
 
-        console.log(drug_ids);
-        console.log(project_ids);
-        console.log(additions_ids);
-
-        console.log(additions_ids);
-
         let drugs = [];
         let projects = [];
         let additions = [];
@@ -689,7 +684,10 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
-              count = count + drug_month_prescriptions.advices[a].prescribing_number
+              obj['drug'] = drug_month_prescriptions.advices[a].drug;
+
+
+                      count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
@@ -702,19 +700,35 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
+
+              if (project_month_prescriptions.project[a].type == 2) {
+                console.log("~~~~~~~????????")
+
+                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+
+              } else if (project_month_prescriptions.project[a].type == 3) {
+                console.log("~~~~~~~????????2222222")
+
+                obj['statistical_classification'] = ''
+                obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
+              }
+
             }
           }
           obj['total'] = count;
@@ -767,6 +781,12 @@
 
         this.curMonthPrescriptions = this.month_prescriptions[0]
 
+        console.log("~~~~~~~~~")
+
+        console.log(this.curMonthPrescriptions)
+        console.log("~~~~~~~~~")
+
+
       },
 
       // setMonthPrescription(month_prescriptions) {
@@ -999,7 +1019,10 @@
                       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
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1019,8 +1042,18 @@
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit
+                      unit: prescription.project[b].unit
                     };
+                    if (prescription.project[b].type == 2) {
+                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['medical_code'] = prescription.project[b].project.medical_code
+                      obj['project_name'] = prescription.project[b].project.project_name
+
+                    } else if (prescription.project[b].type == 3) {
+                      obj['statistical_classification'] = ''
+                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] = prescription.project[b].good_info.good_name
+                    }
                     tempProject.push(obj)
                   }
 
@@ -1104,7 +1137,9 @@
                       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
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1124,8 +1159,18 @@
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit
+                      unit: prescription.project[b].unit
                     };
+                    if (prescription.project[b].type == 2) {
+                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['medical_code'] = prescription.project[b].project.medical_code
+                      obj['project_name'] = prescription.project[b].project.project_name
+
+                    } else if (prescription.project[b].type == 3) {
+                      obj['statistical_classification'] = ''
+                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] = prescription.project[b].good_info.good_name
+                    }
                     tempProject.push(obj)
                   }
 
@@ -2257,8 +2302,6 @@
       },
 
       comfirm() {
-        console.log("222222222222",this.curPrescriptions);
-
 
         if (this.curPrescriptions.order_status == 2) {
           this.$message.error('该处方已经结算，无法继续添加药品或者项目');
@@ -2377,7 +2420,8 @@
                   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
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b],
 
                 };
 
@@ -2389,20 +2433,19 @@
               this.curStatus = 1
             }
 
-           if(this.activeName == 2){
-
-              for(let i = 0; i<temp2.length;i++){
-               for(let j=0;j<this.hisList.length;j++){
-                   if(temp2[i].id == this.hisList[j].project_id){
-                      temp2[i].total =  this.hisList[j].number
-                   }
-               }
-              }
-            }
+           // if(this.activeName == 2){
+           //
+           //  //   for(let i = 0; i<temp2.length;i++){
+           //  //    for(let j=0;j<this.hisList.length;j++){
+           //  //        if(temp2[i].id == this.hisList[j].project_id){
+           //  //           temp2[i].total =  this.hisList[j].number
+           //  //        }
+           //  //    }
+           //  //   }
+           //  // }
 
 
             if (temp2.length > 0) {
-              console.log("temp2222222222",temp2);
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
                   id: 0,
@@ -2417,19 +2460,22 @@
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit
-                };
+                  unit: temp2[b].unit,
+                  type: temp2[b].type
+                }
                 if (obj.total == 0) {
                   obj.total = 1
                 }
+                if (obj.type == 3) {
+                  obj.single_dose = 1
+                }
+                console.log(obj)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
             }
 
             this.curPrescriptions = this.prescriptions[i];
-            console.log("~~~~~~~~~");
-            console.log("~~~~~~~~~");
 
             this.$refs.multipleTable.clearSelection();
             this.$refs.tables.clearSelection()
@@ -2440,7 +2486,8 @@
         this.preDrugs = [];
         this.teamList = []
 
-      }, changeAllGoodInfoTableDataTwo(row) {
+      },
+      changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
       selectChange(row) {
@@ -2449,12 +2496,49 @@
       getlist() {
         getHisProject().then(response => {
           if (response.data.state == 1) {
-            var project = response.data.data.project;
-            this.tabProject = project;
-            this.allProject = project
+            var project = response.data.data.project
+            for (let i = 0; i < project.length; i++) {
+              let obj = {
+                id: project[i].id,
+                project_name: project[i].project_name,
+                statistical_classification: project[i].statistical_classification,
+                single_dose: project[i].single_dose,
+                delivery_way: project[i].delivery_way,
+                execution_frequency: project[i].execution_frequency,
+                number_days: project[i].number_days,
+                price: project[i].price,
+                medical_code: project[i].medical_code,
+                unit: project[i].unit,
+                type: 2
+              }
+
+              this.tabProject.push(obj)
+            }
+
+            var good_info = response.data.data.good_info
+
+            for (let i = 0; i < good_info.length; i++) {
+              let obj = {
+                id: good_info[i].id,
+                project_name: good_info[i].good_name,
+                statistical_classification: 0,
+                single_dose: 1,
+                delivery_way: '',
+                execution_frequency: '',
+                number_days: 1,
+                price: good_info[i].retail_price,
+                medical_code: good_info[i].medical_insurance_number,
+                unit: this.getGoodUnit(good_info[i].good_unit),
+                type: 3
+              }
+              this.tabProject.push(obj)
+            }
+
+            this.allProject = this.tabProject
 
           }
         })
+
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
@@ -2477,12 +2561,19 @@
             this.tabPrjectTeam = team
           }
         })
+      }, getGoodUnit(id) {
+        var goodUnit = this.$store.getters.good_unit
+        for (let i = 0; i < goodUnit.length; i++) {
+          if (goodUnit[i].id == id) {
+            return goodUnit[i].name
+          }
+        }
       },
       selectTeam(row) {
         console.log("row",row);
         var arr = [];
         for (let i = 0; i < row.length; i++) {
-          arr.push(row[i].project_id)
+          arr.push(row[i].item_id)
         }
         var ids = arr.join(',');
         var strArr = ids.split(',');
@@ -2507,11 +2598,61 @@
         };
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
-            var project = response.data.data.project;
-            this.teamList = [];
-            this.teamList = project
+            this.teamList = []
+            var project = response.data.data.project
+            for (let i = 0; i < project.length; i++) {
+              if (project[i].type == 2) {
+
+                let obj = {
+                  id: project[i].project_id,
+                  project_name: project[i].project.project_name,
+                  statistical_classification: project[i].project.statistical_classification,
+                  single_dose: project[i].project.single_dose,
+                  delivery_way: project[i].project.delivery_way,
+                  execution_frequency: project[i].project.execution_frequency,
+                  number_days: project[i].project.number_days,
+                  total: project[i].number,
+                  price: project[i].project.price,
+                  remark: '',
+                  medical_code: project[i].project.medical_code,
+                  unit: project[i].project.unit,
+                  type: project[i].type
+                }
+                if (obj.total == 0) {
+                  obj.total = 1
+                }
+
+                this.teamList.push(obj)
+              } else if (project[i].type == 3) {
+                let obj = {
+                  id: project[i].project_id,
+                  project_name: project[i].good_info.good_name,
+                  statistical_classification: "",
+                  single_dose: "",
+                  delivery_way: "",
+                  execution_frequency:"",
+                  number_days:"",
+                  total: project[i].number,
+                  price: project[i].good_info.retail_price,
+                  remark: '',
+                  medical_code: project[i].good_info.medical_insurance_number,
+                  unit: project[i].good_info.unit,
+                  type: project[i].type
+                }
+                if (obj.total == 0) {
+                  obj.total = 1
+                }
+                this.teamList.push(obj)
+
+                console.log( this.teamList)
+
+              }
+            }
+
+
           }
         })
+
       }, changeDoctor(val) {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.doctorValue) {

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -77,7 +77,7 @@
     </el-form>
     <div class="mainTitle">病历信息：</div>
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
-     <el-form-item label="疾病类型: " prop="name" style="width:49%;">
+     <el-form-item filterable label="疾病类型: " prop="name" style="width:49%;">
         <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
           <el-option
             v-for="(item,index) in sick"

src/xt_pages/hospitalStation/components/inquiriesDetail.vue

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

src/xt_pages/hospitalStation/components/newPrescriptionTable.vue

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

src/xt_pages/hospitalStation/components/nextOrLastPrescription.vue

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

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -75,15 +75,14 @@
         </template>
       </el-table-column>
     </el-table>
-
     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
@@ -95,11 +94,11 @@
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
           <el-autocomplete
-            style="width:100%;"
-            class="inline-input"
-            v-model="scope.row.delivery_way"
-            :fetch-suggestions="querySearch2"
-            placeholder="请输入内容"
+                  style="width:100%;"
+                  class="inline-input"
+                  v-model="scope.row.delivery_way"
+                  :fetch-suggestions="querySearch2"
+                  placeholder="请输入内容"
           ></el-autocomplete>
         </template>
       </el-table-column>
@@ -108,10 +107,12 @@
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
+      <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
@@ -132,7 +133,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-           <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
+          <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -155,7 +155,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+      <el-form-item label="挂号类型：" :validate-event="is_Name">
         <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
@@ -197,12 +197,12 @@
       return {
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},
@@ -260,7 +260,10 @@
           {value: 4, label: '农保'},
           {value: 5, label: '会员'},
           {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          {value: 7, label: '合同'},
+          {value: 8, label: '医保自费'},
+
+
         ],
         sex: [{
           value: 1,
@@ -330,7 +333,7 @@
           name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
           gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
           id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
-          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
+          // register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
           doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
           department: [{required: true, message: '请填写科室', trigger: 'blur'}],
           age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -50,16 +50,16 @@
             </el-form-item>
 
 
-            <el-form-item label="医疗类别：" prop="medical_care">
-                <el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="(item,index) in medical_care"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
+            <!--<el-form-item label="医疗类别：" prop="medical_care">-->
+                <!--<el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in medical_care"-->
+                            <!--:key="index"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
 
 
             <el-form-item label="证件类型：" prop="certificates" >
@@ -186,12 +186,12 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},
@@ -241,7 +241,9 @@
           {value: 4, label: '农保'},
           {value: 5, label: '会员'},
           {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          {value: 7, label: '合同'},
+          {value: 8, label: '医保自费'},
+
         ],
         sex: [{
           value: 1,

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -463,6 +463,8 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
+              obj['drug'] = drug_month_prescriptions.advices[a].drug
+
               count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
@@ -476,6 +478,21 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+
+              }
+              obj['type'] = project_month_prescriptions.project[a].type
+
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
@@ -776,7 +793,6 @@
             this.patientInfo = response.data.data.xt_info;
             this.hisPatientInfo = response.data.data.his_info;
             this.case_history = response.data.data.case_history;
-            console.log("病历222222",this.case_history);
             this.info = response.data.data.info;
             this.doctors = response.data.data.doctors;
             this.department = response.data.data.department;
@@ -833,6 +849,9 @@
             //处方相关
             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];
@@ -856,7 +875,8 @@
                     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
+                    id: prescription.advices[b].drug_id,
+                    drug:prescription.advices[b].drug,
                   };
                   tempAdvice.push(obj)
                 }
@@ -878,7 +898,19 @@
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
+                    type: prescription.project[b].type
                   };
+
+                  if(prescription.project[b].type == 2){
+                    obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                    obj['medical_code'] =  prescription.project[b].project.medical_code
+                    obj['project_name'] =  prescription.project[b].project.project_name
+
+                  }else if(prescription.project[b].type == 3){
+                    obj['statistical_classification'] = ""
+                    obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                    obj['project_name'] =  prescription.project[b].good_info.good_name
+                  }
                   tempProject.push(obj)
                 }
 
@@ -916,13 +948,16 @@
                 this.prescriptions.push(obj)
               }
             } else {
+
+
+
               let obj = {
                 id: 0,
                 name: '处方' + 1,
                 advices: [],
                 project: [],
                 addition: [],
-                orderStatus: 0,
+                order_status: 0,
                 pre_time: nowTime,
 
               };
@@ -1046,7 +1081,8 @@
                           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
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
                         };
                         tempAdvice.push(obj)
                       }
@@ -1064,8 +1100,19 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type: prescription.project[b].type,
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1106,7 +1153,7 @@
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
@@ -1215,7 +1262,9 @@
                           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
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1233,8 +1282,22 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type:prescription.project[b].type,
+
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
+
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1275,7 +1338,7 @@
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
@@ -1385,7 +1448,9 @@
                           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
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1403,8 +1468,21 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type:prescription.project[b].type,
+
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1445,7 +1523,7 @@
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
@@ -1607,7 +1685,9 @@
                         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
+                        id: prescription.advices[b].drug_id,
+                        drug:prescription.advices[b].drug,
+
                       };
                       tempAdvice.push(obj)
                     }
@@ -1625,8 +1705,21 @@
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].unit
+                        unit: prescription.project[b].unit,
+                        type:prescription.project[b].type,
+
                       };
+                      if(prescription.project[b].type == 2){
+                        obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                        obj['medical_code'] =  prescription.project[b].project.medical_code
+                        obj['project_name'] =  prescription.project[b].project.project_name
+
+                      }else if(prescription.project[b].type == 3){
+                        obj['statistical_classification'] = ""
+                        obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] =  prescription.project[b].good_info.good_name
+                      }
+
                       tempProject.push(obj)
                     }
                     for (let b = 0; b < prescription.addition.length; b++) {
@@ -1669,7 +1762,7 @@
                     advices: [],
                     project: [],
                     addition: [],
-                    orderStatus: 0,
+                    order_status: 0,
                     pre_time: nowTime
 
                   };
@@ -1782,7 +1875,9 @@
                       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
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1800,8 +1895,21 @@
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
+                      type:prescription.project[b].type,
+
                       unit: prescription.project[b].unit
                     };
+                    if(prescription.project[b].type == 2){
+                      obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                      obj['medical_code'] =  prescription.project[b].project.medical_code
+                      obj['project_name'] =  prescription.project[b].project.project_name
+
+                    }else if(prescription.project[b].type == 3){
+                      obj['statistical_classification'] = ""
+                      obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] =  prescription.project[b].good_info.good_name
+                    }
+
                     tempProject.push(obj)
                   }
                   for (let b = 0; b < prescription.addition.length; b++) {
@@ -1842,7 +1950,7 @@
                   advices: [],
                   project: [],
                   addition: [],
-                  orderStatus: 0,
+                  order_status: 0,
                   pre_time: nowTime,
                 };
                 this.prescriptions.push(obj)

src/xt_pages/hospitalStation/index.vue

@@ -75,7 +75,7 @@
         <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
 
           <el-form-item label="疾病类型：" prop="sick_type" :validate-event="is_Name">
-            <el-select v-model="form.sick_type" placeholder="">
+            <el-select filterable v-model="form.sick_type" placeholder="">
               <el-option
                 v-for="(item,index) in sick"
                 :key="index"
@@ -176,12 +176,12 @@
         read_loading: false,
         registers: [
           {value: 11, label: '普通门诊'},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: '急诊'},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: '急诊'},
           {value: 14, label: '门诊特殊病'},
-          {value: 15, label: '门诊统筹'},
-          {value: 16, label: '门诊慢性病'},
-          {value: 21, label: '普通住院'}
+          // {value: 15, label: '门诊统筹'},
+          // {value: 16, label: '门诊慢性病'},
+          // {value: 21, label: '普通住院'}
 
         ],
         sick: [],
@@ -628,7 +628,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 10138) {
         this.form.certificates = 2;
         this.form.id_card_type = 1
       } else {

src/xt_pages/hospitalStation/listPrint.vue

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

src/xt_pages/hospitalStation/newStatementPrint.vue

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

src/xt_pages/hospitalStation/newStatementPrintTwo.vue

@@ -86,14 +86,14 @@
 
       },
       getInfo(obj) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
             params: obj
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
+                // this.$message.error(response.data.msg);
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -310,6 +310,7 @@
                              v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
 
         <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
+
         <el-dialog
                 class="centerDialog"
                 width="900px"
@@ -401,12 +402,12 @@
       return {
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         loading: false,
@@ -581,7 +582,7 @@
         form['patient_id'] = this.patientInfo.id;
         form['admin_user_id'] = this.$store.getters.xt_user.user.id;
         form['order_id'] = this.order.id;
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
           var that = this;
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
             params: form
@@ -696,7 +697,7 @@
         this.loadingone = true;
 
         var that = this;
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
             headers: {
@@ -787,7 +788,7 @@
 
         var that = this;
 
-        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
@@ -1028,12 +1029,9 @@
               }
 
               for (let b = 0; b < prescription.project.length; b++) {
-                console.log(prescription.project[b].project.project_name);
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
@@ -1041,9 +1039,22 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].unit,
+                  type:prescription.project[b].type,
+
                 };
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
 
                 tempProject.push(obj)
               }
@@ -2606,13 +2617,29 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+                obj['type'] = 2
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+                obj['type'] = 3
+
+              }
+
+
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
@@ -2800,12 +2827,11 @@
               }
 
               for (let b = 0; b < prescription.project.length; b++) {
-                console.log(prescription.project[b].project.project_name);
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
@@ -2813,9 +2839,25 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].project.unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].project.unit,
+                  type:prescription.project[b].type,
+
                 };
+
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
+
+
                 tempProject.push(obj)
               }
 
@@ -2977,7 +3019,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
+                  // that.$message.error(response.data.msg);
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
@@ -3098,6 +3140,7 @@
         let paramsObj = {
           order_id: this.hisPatientInfo.id,
           patient_id: this.hisPatientInfo.patient_id,
+          record_time:this.record_date,
           name:this.hisPatientInfo.name,
           gend:this.hisPatientInfo.gend,
           setl_time:this.hisPatientInfo.out_hosptial_time

src/xt_pages/hospitalStation/summary.vue

@@ -100,7 +100,7 @@
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
             <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
+                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
               结算单
             </el-button>
             <el-button size="mini" type="primary" @click="toRefund(scope.row)"
@@ -499,19 +499,24 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138)){
           this.statementVisible9504 = true;
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
-            admin_user_id: this.$store.getters.xt_user.user.id
+            admin_user_id: this.$store.getters.xt_user.user.id,
+
+
           };
           this.orderObj9504 = obj
         } else {
           this.statementVisible = true;
           let obj = {
-            order_id: row.id
+            order_id: row.id,
+            settle_type:row.settle_type,
+            start_time:row.settle_start_time,
+            end_time:row.settle_end_time,
           };
           this.orderObj = obj
         }

src/xt_pages/hospitalStation/summaryDetail.vue

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

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='prescription-print' class="prescription-print">
-            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028">
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{org_code}}</div>
@@ -346,7 +346,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
         this.orgname = xtuser.org.org_name;
         var form = {
           'order_id': this.paramsObj.order_id,
@@ -360,7 +360,7 @@
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg);
+              // that.$message.error(response.data.msg);
               return false
             } else {
               if (response.data.data.failed_code == -10) {

src/xt_pages/management/components/QualityForm.vue

@@ -58,9 +58,7 @@
     </el-row>
     <el-row style="display: flex;align-items: center;">
       <el-col :span="2">
-        <el-checkbox v-model="checkAllStatus" @change="changeCheck"
-          >全选</el-checkbox
-        >
+        <el-checkbox v-model="checkAllStatus" @change="changeCheck">全选</el-checkbox>
       </el-col>
       <el-col :span="3">
         <el-button size="small" @click="BatchDelete" v-show="show"

src/xt_pages/outpatientCharges/allListPrint.vue

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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -82,8 +82,8 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
-    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 
@@ -111,7 +111,8 @@
           found_price:'',
           total:0,
           fapiao_code:"",
-          fapiao_number:""
+          fapiao_number:"",
+          order:null
 
 
         },
@@ -164,8 +165,8 @@
       }
     },
     methods: {
-      show: function (total) {
-        this.total = total
+      show: function (total,order) {
+        this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total
         this.form.total = total + this.form.medical_insurance_price
@@ -174,8 +175,14 @@
 
         this.form.fapiao_code =""
         this.form.fapiao_number = ""
+        this.order = order
 
-
+        if(this.order && this.order.id > 0){
+          this.form.total = this.order.medfee_sumamt
+          this.form.pay_price = this.order.medfee_sumamt
+          this.form.medical_insurance_price = this.order.fund_pay_sumamt
+          this.form.private_price =  this.order.psn_part_amt
+        }
 
         this.visibility = true
 

src/xt_pages/outpatientCharges/components/chargeMonthPrescriptionTable.vue

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

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

@@ -44,23 +44,25 @@
 
       <el-table-column align="center" prop="day" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
+            <span>{{'天'}}</span>
+          </div>
         </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;">
-            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>
-            <div> {{scope.row.prescribing_number_unit}}</div>
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>{{scope.row.prescribing_number_unit}}
           </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="70" 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>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
@@ -81,8 +83,10 @@
       </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>
-          <div>{{scope.row.unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+            <div>{{scope.row.unit}}</div>
+          </div>
 
         </template>
       </el-table-column>
@@ -105,8 +109,10 @@
       </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>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
@@ -117,10 +123,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>
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -186,6 +194,8 @@
         }],
         value: '1',
         input: 1,
+        efs:[],
+        drugways:[]
       }
     },
     methods:{

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -61,56 +61,32 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+        <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
 
       </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>
+        <template slot-scope="scope">{{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}}
-
-        </template>
+        <template slot-scope="scope">{{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>-->
-          {{scope.row.number_days}}天
-
-        </template>
+        <template slot-scope="scope">{{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>-->
-            {{scope.row.total}} {{scope.row.unit}}
-
-          </div>
+          <div>{{scope.row.total}} {{scope.row.unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{scope.row.price}}元
-
-        </template>
+        <template slot-scope="scope">{{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>
+        <template slot-scope="scope">{{scope.row.remark}}</template>
       </el-table-column>
     </el-table>
 

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,192 +1,192 @@
 <template>
-  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
-             :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">
-
-    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
-      <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
-        <el-autocomplete
-          class="checkSearch"
-          popper-class="my-autocomplete"
-          v-model="form.name"
-          :fetch-suggestions="querySearchAsync"
-          :trigger-on-focus="false"
-          placeholder="请输入病人名字"
-          @select="handleSelect"
-          style="width:160px;"
-        >
-          <i class="el-icon-search el-input__icon" slot="suffix"></i>
-          <template slot-scope="{ item }">
-            <div class="name">{{ item.name }}</div>
-          </template>
-        </el-autocomplete>
-      </el-form-item>
-
-      <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
-        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in sex"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-
-
-      </el-form-item>
-
-      <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
-        <el-input v-model="form.age"></el-input>
-      </el-form-item>
-
-
-      <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="手机号码：" prop="phone">
-        <el-input v-model="form.phone"></el-input>
-      </el-form-item>
-
-
-      <el-form-item label="医疗类别：">
-        <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="(item,index) in medical_care"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
-        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in certificates"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
-        <el-input v-model="form.id_card"></el-input>
-      </el-form-item>
-
-      <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
-        >
-          <el-option
-            v-for="(item,index) in registers"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
-          <el-option
-            v-for="(item,index) in sick"
-            :key="index"
-            :label="item.class_name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
-          <el-option
-            v-for="(item,index) in diagnoses"
-            :key="index"
-            :label="item.class_name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="结算类型：">
-        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in settlement"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="社保类型：">
-        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in medicalCare"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
-        <el-select v-model="form.id_card_type" placeholder="请选择">
-          <el-option
-            v-for="item in IDCardTypes"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item class="specialFormItem" label="医保卡号：">
-        <div style="display:flex;">
-          <el-input v-model="form.medical_insurance_card"></el-input>
-          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
-
-        </div>
-      </el-form-item>
-
-      <el-form-item label="挂号类型："  >
-        <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in register"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="挂号费：">
-        <el-input v-model="form.registration_fee"></el-input>
-      </el-form-item>
-      <el-form-item label="诊疗费：">
-        <el-input v-model="form.medical_expenses"></el-input>
-      </el-form-item>
-    </el-form>
-
-    <span slot="footer" class="dialog-footer">
+    <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+               :close-on-click-modal="isClose"
+               :close-on-press-escape="isClose">
+
+        <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+            <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+                <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="false"
+                        placeholder="请输入病人名字"
+                        @select="handleSelect"
+                        style="width:160px;"
+                >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.name }}</div>
+                    </template>
+                </el-autocomplete>
+            </el-form-item>
+
+            <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
+                <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in sex"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+
+
+            </el-form-item>
+
+            <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+                <el-input v-model="form.age"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+                <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="手机号码：" prop="phone">
+                <el-input v-model="form.phone"></el-input>
+            </el-form-item>
+
+
+            <!--<el-form-item label="医疗类别：">-->
+                <!--<el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in medical_care"-->
+                            <!--:key="index"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
+
+
+            <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+                <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in certificates"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
+                <el-input v-model="form.id_card"></el-input>
+            </el-form-item>
+
+            <!--<el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">-->
+                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""-->
+                <!--&gt;-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in registers"-->
+                            <!--:key="index"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">-->
+                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in sick"-->
+                            <!--:key="index"-->
+                            <!--:label="item.class_name"-->
+                            <!--:value="item.id">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
+
+            <!--<el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">-->
+                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in diagnoses"-->
+                            <!--:key="index"-->
+                            <!--:label="item.class_name"-->
+                            <!--:value="item.id">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
+
+
+            <el-form-item label="结算类型：">
+                <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in settlement"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="社保类型：">
+                <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in medicalCare"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+                <el-select v-model="form.id_card_type" placeholder="请选择">
+                    <el-option
+                            v-for="item in IDCardTypes"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item class="specialFormItem" label="医保卡号：">
+                <div style="display:flex;">
+                    <el-input v-model="form.medical_insurance_card"></el-input>
+                    <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+
+                </div>
+            </el-form-item>
+
+            <el-form-item label="挂号类型：" :validate-event="is_Name">
+                <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in register"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="挂号费：">
+                <el-input v-model="form.registration_fee"></el-input>
+            </el-form-item>
+            <el-form-item label="诊疗费：">
+                <el-input v-model="form.medical_expenses"></el-input>
+            </el-form-item>
+        </el-form>
+
+        <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
     <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
-  </el-dialog>
+    </el-dialog>
 
 </template>
 
 <script>
-  import {jsGetAge, uParseTime} from "@/utils/tools";
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import axios from 'axios'
-  import {PostSearch} from '@/api/patient'
+  import { PostSearch } from '@/api/patient'
 
-  import {getDictionaryDataConfig} from '@/utils/data'
+  import { getDictionaryDataConfig } from '@/utils/data'
 
   export default {
 
@@ -196,31 +196,30 @@
 
       return {
         registers: [
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
-          {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          { value: 11, label: '普通门诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
+          { value: 14, label: '门诊特殊病' },
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
         ],
         medical_care: [
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '家庭通道'},
-          {value: 13, label: "门诊大病"},
-          {value: 14, label: "重疾特药"},
-          {value: 15, label: "门诊慢病"},
-          {value: 16, label: "门诊特检"},
-          {value: 17, label: "健康体检"},
-          {value: 18, label: "预防接种"},
-          {value: 19, label: "门诊输血"},
-          {value: 91, label: "新冠肺炎门诊"},
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '家庭通道' },
+          { value: 13, label: '门诊大病' },
+          { value: 14, label: '重疾特药' },
+          { value: 15, label: '门诊慢病' },
+          { value: 16, label: '门诊特检' },
+          { value: 17, label: '健康体检' },
+          { value: 18, label: '预防接种' },
+          { value: 19, label: '门诊输血' },
+          { value: 91, label: '新冠肺炎门诊' }
         ],
 
-
         form: {
           id: '',
-          settlement_value: '',
+          settlement_value: 1,
           medical_insurance_card: '',
           name: '',
           gender: '',
@@ -236,29 +235,31 @@
           doctor: '',
           id_card_type: 1,
           department: '',
-          registration_fee: 0,
-          medical_expenses: 0,
+          registration_fee: '',
+          medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: '',
+          social_type: ''
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
         }, {
           value: 2,
-          label: "身份证"
+          label: '身份证'
         }, {
           value: 3,
-          label: "电子凭证"
-        },],
+          label: '电子凭证'
+        }],
         settlement: [
-          {value: 1, label: '医保'},
-          {value: 2, label: '自费'},
-          {value: 3, label: '公费'},
-          {value: 4, label: '农保'},
-          {value: 5, label: '会员'},
-          {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          { value: 1, label: '医保' },
+          { value: 2, label: '自费' },
+          { value: 3, label: '公费' },
+          { value: 4, label: '农保' },
+          { value: 5, label: '会员' },
+          { value: 6, label: '职工' },
+          { value: 7, label: '合同' },
+          {value: 8, label: '医保自费'},
+
         ],
         sex: [{
           value: 1,
@@ -272,72 +273,71 @@
           label: '内地身份证'
         }, {
           value: 2,
-          label: "社保卡"
+          label: '社保卡'
         }, {
           value: 3,
-          label: "护照"
+          label: '护照'
         }, {
           value: 4,
-          label: "军官证"
+          label: '军官证'
         }, {
           value: 5,
-          label: "台胞证"
+          label: '台胞证'
         }, {
           value: 6,
-          label: "港澳地区身份证"
+          label: '港澳地区身份证'
         }],
         medicalCare: [{
           value: 1,
           label: '职工基本医疗保险'
         }, {
           value: 2,
-          label: "公务员医疗补助"
+          label: '公务员医疗补助'
         }, {
           value: 3,
-          label: "大额医疗费用补助"
+          label: '大额医疗费用补助'
         }, {
           value: 4,
-          label: "离休人员医疗"
+          label: '离休人员医疗'
         }, {
           value: 5,
-          label: "城乡居民基本医疗保险"
+          label: '城乡居民基本医疗保险'
         }, {
           value: 6,
-          label: "城乡居民大病医疗保险"
+          label: '城乡居民大病医疗保险'
         }, {
           value: 7,
-          label: "生育保险"
+          label: '生育保险'
         }],
         register: [{
           value: 1,
           label: '普通'
         }, {
           value: 2,
-          label: "主治"
+          label: '主治'
         }, {
           value: 3,
-          label: "主任"
+          label: '主任'
         }, {
           value: 4,
-          label: "免收诊金"
+          label: '免收诊金'
         }, {
           value: 5,
-          label: "专家"
+          label: '专家'
         }],
         rules: {
-          name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
-          gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
-          id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
-          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
-          doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
-          department: [{required: true, message: '请填写科室', trigger: 'blur'}],
-          age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
-          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
-          certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
-          id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-          p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
-          sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
-          diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
+          name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
+          gender: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
+          id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
+          doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
+          department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
+          age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],
+          birthday: [{ required: true, message: '患者出生日期不能为空', trigger: 'blur' }],
+          certificates: [{ required: true, message: '证件类型不能为空', trigger: 'change' }],
+          id_card_type: [{ required: true, message: '读卡类型不能为空', trigger: 'change' }],
+          p_type: [{ required: true, message: '处方类型不能为空', trigger: 'change' }],
+          // sick_type: [{ required: true, message: '大病类别不能为空', trigger: 'change' }],
+          // diagnosis: [{ required: true, message: '诊断不能为空', trigger: 'change' }]
         },
         visibility: false,
         labelPosition: 'right',
@@ -360,8 +360,8 @@
           medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: '',
-        },
+          social_type: ''
+        }
 
       }
     },
@@ -385,125 +385,124 @@
 
       },
       sick: Array,
-      diagnoses: Array,
+      diagnoses: Array
     },
     methods: {
       handleSelect(val) {
-        this.form.id = val.id;
-        this.form.name = val.name;
-        this.form.gender = val.gender;
-        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}');
-        this.form.phone = val.phone;
-        this.form.id_card = val.id_card_no;
-        var thisLen = this.form.id_card.length;
-        var birth = "";
+        this.form.id = val.id
+        this.form.name = val.name
+        this.form.gender = val.gender
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
+        this.form.phone = val.phone
+        this.form.id_card = val.id_card_no
+        var thisLen = this.form.id_card.length
+        var birth = ''
         if (thisLen == 15) {
-          birth = "19" + this.form.id_card.substr(6, 6);
+          birth = '19' + this.form.id_card.substr(6, 6)
         } else {
-          birth = this.form.id_card.substr(6, 8);
+          birth = this.form.id_card.substr(6, 8)
         }
         var births =
           birth.substr(0, 4) +
-          "-" +
+          '-' +
           birth.substr(4, 2) +
-          "-" +
-          birth.substr(6, 2);
-        this.form.age = jsGetAge(births, "-");
+          '-' +
+          birth.substr(6, 2)
+        this.form.age = jsGetAge(births, '-')
       },
       querySearchAsync(keyword, cb) {
-        let key = '';
+        let key = ''
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = [];
+        let searchArray = []
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient;
+            searchArray = response.data.data.patient
             cb(searchArray)
           } else {
             cb([])
           }
         })
       },
-      reading(medicalInsuranceCard) {
-        var that = this;
+      reading() {
+        var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error("请先选择读卡类型");
+          this.$message.error('请先选择读卡类型')
           return
         }
         let params = {
           'id_card_type': this.form.id_card_type,
           'admin_user_id': this.$store.getters.xt_user.user.id,
-
-        };
-        axios.get('http://127.0.0.1:9532/api/sscard', {
+          'certificates':this.form.certificates,
+        }
+        axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })
-          .then(function (response) {
+          .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg);
+              that.$message.error(response.data.msg)
               return false
             } else {
-              var patient = response.data.data.patient;
+              var patient = response.data.data.patient
 
               if (that.form.id_card_type == 1) {
-                this.form.id = patient.id;
-                that.form.name = patient.name;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
-                that.form.idCard = patient.id_card_no;
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
                 that.form.medicalInsuranceCard = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id;
-                that.form.name = patient.name;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
                 that.form.idCard = patient.id_card_no
               }
-              that.$message({message: '读卡成功', type: 'success'})
+              that.$message({ message: '读卡成功', type: 'success' })
             }
           })
-          .catch(function (error) {
-
-          });
+          .catch(function(error) {
 
+          })
 
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      show: function () {
-        this.visibility = true;
+      show: function() {
+        this.visibility = true
         // this.form = Object.assign({}, this.resetForm)
-        this.form.id = 0;
-        this.form.settlement_value = '';
-        this.form.medical_insurance_card = '';
-        this.form.name = '';
-        this.form.gender = '';
-        this.form.medical_care = '';
-        this.form.birthda = '';
-        this.form.age = '';
-        this.form.id_card = '';
-        this.form.register = '';
-        this.form.doctor = '';
-        this.form.department = '';
-        this.form.registration_fee = 0;
-        this.form.medical_expenses = 0;
-        this.form.cost = '';
-        this.form.phone = '';
-        this.form.social_type = '';
-
-        this.form.p_type = 14;
-        this.form.sick_type = this.sick[0].id;
-        this.form.diagnosis = this.diagnoses[0].id;
-        this.form.id_card_type = 2;
-        this.form.certificates = 1;
+        this.form.id = 0
         this.form.settlement_value = 1
+        this.form.medical_insurance_card = ''
+        this.form.name = ''
+        this.form.gender = ''
+        this.form.medical_care = ''
+        this.form.birthda = ''
+        this.form.age = ''
+        this.form.id_card = ''
+        this.form.register = ''
+        this.form.doctor = ''
+        this.form.department = ''
+        this.form.registration_fee = ''
+        this.form.medical_expenses = ''
+        this.form.cost = ''
+        this.form.phone = ''
+        this.form.social_type = ''
+
+        this.form.p_type = 14
+        this.form.sick_type = this.sick[0].id
+        this.form.diagnosis = this.diagnoses[0].id
+        this.form.id_card_type = 2
+        this.form.certificates = 1
+
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -519,24 +518,24 @@
       },
 
       hide: function () {
-        this.visibility = false;
+        this.visibility = false
         this.$refs['formValue'].resetFields()
-      }, cancel: function (formName) {
-        this.$emit('cancel', this.getValue());
+      }, cancel: function(formName) {
+        this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
-      confirm: function (formName) {
+      confirm: function(formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
-            let value = {};
-            value = this.getValue();
+            let value = {}
+            value = this.getValue()
             this.$emit('confirm', value)
           }
         })
       },
-      getValue: function () {
-        let form = {};
-        form = this.form;
+      getValue: function() {
+        let form = {}
+        form = this.form
         return form
       }
     }
@@ -545,16 +544,16 @@
 </script>
 
 <style lang="scss" scoped>
-  .registerDialog {
+    .registerDialog {
 
-  .el-form {
-    display: flex;
-    flex-wrap: wrap;
-  }
+    .el-form {
+        display: flex;
+        flex-wrap: wrap;
+    }
 
-  .el-form-item {
-    width: 50%;
-  }
+    .el-form-item {
+        width: 50%;
+    }
 
-  }
+    }
 </style>

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -35,9 +35,9 @@
 
             </el-form-item>
 
-            <el-form-item label="年龄：" prop="age" >
+            <!-- <el-form-item label="年龄：" prop="age" >
                 <el-input v-model="form.age"></el-input>
-            </el-form-item>
+            </el-form-item> -->
 
 
             <el-form-item label="出生日期：" prop="birthday" >
@@ -50,16 +50,16 @@
             </el-form-item>
 
 
-            <el-form-item label="医疗类别：" prop="medical_care">
-                <el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="(item,index) in medical_care"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
+            <!--<el-form-item label="医疗类别：" prop="medical_care">-->
+                <!--<el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">-->
+                    <!--<el-option-->
+                            <!--v-for="(item,index) in medical_care"-->
+                            <!--:key="index"-->
+                            <!--:label="item.label"-->
+                            <!--:value="item.value">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
+            <!--</el-form-item>-->
 
 
             <el-form-item label="证件类型：" prop="certificates" >
@@ -173,10 +173,11 @@
 </template>
 
 <script>
-  import {uParseTime} from "@/utils/tools";
+  import {uParseTime,jsGetAge} from "@/utils/tools";
   import axios from 'axios'
   import {PostSearch} from '@/api/patient'
   import {getDictionaryDataConfig} from '@/utils/data'
+
   export default {
     name: 'registerDialog9504',
 
@@ -186,12 +187,12 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},
@@ -241,7 +242,9 @@
           {value: 4, label: '农保'},
           {value: 5, label: '会员'},
           {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          {value: 7, label: '合同'},
+          {value: 8, label: '医保自费'},
+
         ],
         sex: [{
           value: 1,
@@ -314,11 +317,10 @@
           register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
           doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
           department: [{required: true, message: '请填写科室', trigger: 'blur'}],
-          age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
           birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
           certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
           id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-          medical_care: [{required: true, message: "医疗类别不能为空", trigger: 'change'}],
+          // medical_care: [{required: true, message: "医疗类别不能为空", trigger: 'change'}],
 
         },
         visibility: false,
@@ -433,7 +435,7 @@
 
         }
         this.read_loading = true
-        axios.get('http://127.0.0.1:9532/sz/api/readcard', {
+        axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })
           .then(function (response) {
@@ -454,6 +456,23 @@
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
                 that.form.medical_insurance_card = response.data.data.health_card_no
+
+                var thisLen = that.form.id_card.length
+                var birth = ''
+                if (thisLen == 15) {
+                  birth = '19' + that.form.id_card.substr(6, 6)
+                } else {
+                  birth = that.form.id_card.substr(6, 8)
+                }
+                var births =
+                  birth.substr(0, 4) +
+                  '-' +
+                  birth.substr(4, 2) +
+                  '-' +
+                  birth.substr(6, 2)
+                that.form.age = jsGetAge(births, '-')
+
+
               } else if (that.form.id_card_type == 2) {
                 this.form.id = patient.id
                 that.form.name = patient.name
@@ -462,6 +481,21 @@
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
                 that.form.id_card = patient.id_card_no
+
+                var thisLen = that.form.id_card.length
+                var birth = ''
+                if (thisLen == 15) {
+                  birth = '19' + that.form.id_card.substr(6, 6)
+                } else {
+                  birth = that.form.id_card.substr(6, 8)
+                }
+                var births =
+                  birth.substr(0, 4) +
+                  '-' +
+                  birth.substr(4, 2) +
+                  '-' +
+                  birth.substr(6, 2)
+                that.form.age = jsGetAge(births, '-')
               }
               that.$message({message: '读卡成功', type: 'success'})
 
@@ -488,6 +522,12 @@
         // this.form.social_type = patientInfo.health_care_type
         this.form.id_card_type = 1
         this.form.certificates = 1
+        this.form.medical_care = 11
+        this.form.settlement_value = 1
+        this.form.register = 4
+        this.form.registration_fee = 0
+        this.form.medical_expenses = 0
+
 
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""

src/xt_pages/outpatientCharges/costComparison.vue

@@ -158,7 +158,7 @@
                 <el-form :model="form" label-width="100px">
                     <el-form-item label="时间" label-width="100px">
                         <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
-                                        @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                        :editable="false" :clearable="false"
                                         style="width: 200px;" type="date" placeholder="选择开始日期"
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
@@ -166,7 +166,7 @@
                         -
 
                         <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
-                                        @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                       :editable="false" :clearable="false"
                                         style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
@@ -212,7 +212,8 @@
     getDoctorList,
     getExportConsumeDetailList,
     getHisOrderList,
-    getList
+    getList,
+    getInitData
   } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
@@ -230,6 +231,7 @@
           { path: false, name: '医保费用对照' }
         ],
         tableData: [],
+        diagnoses:[],
         limit: 10,
         page: 1,
         dialogFormVisible: false,
@@ -458,7 +460,7 @@
                   that.$alert(result_desc, '对账结果', {
                     confirmButtonText: '确定',
                     callback: action => {
-                      this.dialogFormVisible = false
+                      that.dialogFormVisible = false
                     }
                   })
 
@@ -572,53 +574,202 @@
             return false
           } else {
             this.fromData = response.data.data.list
-            var list = []
-
-            for (let i = 0; i < this.fromData.length; i++) {
-              let obj = {
-                '结算金额': this.fromData[i].medfee_sumamt,
-                '姓名': this.fromData[i].psn_name,
-                '身份证': this.fromData[i].id_card_no,
-                '个人编号': this.fromData[i].psn_no,
-                '门诊流水号': this.fromData[i].mdtrt_id,
-                '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
-                '起付线': this.fromData[i].act_pay_dedc,
-                '统筹基金': this.fromData[i].fund_pay_sumamt,
-                '个人支付': this.fromData[i].psn_cash_pay,
-                '个账支付': this.fromData[i].acct_pay,
-                '现金支付': this.fromData[i].cash_pay,
-                '总费用': this.fromData[i].sumamt,
-                '冲销标志': '已结算'
+
+            if(this.selection[0].insutype == "310"){
+
+              var list = []
+              for (let i = 0; i < this.fromData.length; i++) {
+                // var hifmi_pay = 0.00;
+                //
+                // if(this.fromData[i].setl_detail.length > 0){
+                //   var jsonObj = JSON.parse(this.fromData[i].setl_detail);
+                //   for (let i = 0; i < jsonObj.length; i++) {
+                //     if (order.fund_pay_type == '310300') {
+                //       hifmi_pay = jsonObj[i].fund_payamt
+                //     }
+                //   }
+                // }
+
+                var hifes_pays = [];
+
+                if(this.fromData[i].setl_detail.length > 0){
+                  var jsonObj = JSON.parse(this.fromData[i].setl_detail);
+                  console.log(jsonObj)
+                  for (let i = 0; i < jsonObj.length; i++) {
+                    if (jsonObj[i].fund_pay_type == '310100') {
+                      hifes_pays.push(jsonObj[i].fund_payamt)
+                    }
+                  }
+                }
+
+                let hifes_pay = 0.00
+                if(hifes_pays.length == 2){
+                  hifes_pay = hifes_pays[1]
+                }
+
+                let obj = {
+                  '序号': i+1,
+                  '姓名': this.fromData[i].psn_name,
+                  '单位名称': this.fromData[i].psn_name,
+                  '个人编号': this.fromData[i].psn_no,
+                  '门诊号': this.fromData[i].mdtrt_id,
+                  '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                  '挂号科室':  "血透室",
+                  '门诊费用': this.fromData[i].medfee_sumamt,
+                  '自费': this.fromData[i].psn_cash_pay,
+                  '起付线I': this.fromData[i].act_pay_dedc,
+                  '按比例自付II': this.fromData[i].psn_cash_pay,
+                  '小计I+II': this.fromData[i].act_pay_dedc + this.fromData[i].psn_cash_pay,
+                  '统筹基金': this.fromData[i].fund_pay_sumamt,
+                  '公务员补助': this.fromData[i].cvlserv_pay,
+                  '单位补充保险': hifes_pay,
+                  '煤矿补充保险': "0.00",
+                  "超封顶线费用": "0.00",
+                  '大额医疗保险应付': this.fromData[i].hifob_pay,
+                  '透析补助': "0.00",
+                  '大额合计':  "0.00",
+                  '实账支付额': "0.00",
+                  '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
+                  "血透次数":this.fromData[i].DialysisCount,
+                  "置留管数量":0,
+                  "备注":"",
+
+                }
+                list.push(obj)
+              }
+              var insutype_name = ''
+              if (this.query_insutype == '310') {
+                insutype_name = '职工基本医疗保险'
+              } else if (this.query_insutype == '390') {
+                insutype_name = '城乡居民基本医疗保险'
               }
-              list.push(obj)
-            }
-            var insutype_name = ''
-            if (this.query_insutype == '310') {
-              insutype_name = '职工基本医疗保险'
-            } else if (this.query_insutype == '390') {
-              insutype_name = '城乡居民基本医疗保险'
-            }
 
-            import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
-              const filterVal = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
-              const data = this.formatJson(filterVal, list)
-              excel.export_json_to_excel({
-                header: tHeader,
-                data,
-                filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+                // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+                const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+
+                const data = this.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+                })
               })
-            })
+
+
+            }else{
+
+              var list = []
+              for (let i = 0; i < this.fromData.length; i++) {
+
+                var hifmi_pay = 0.00;
+
+                if(this.fromData[i].setl_detail.length > 0){
+                  var jsonObj = JSON.parse(this.fromData[i].setl_detail);
+                  console.log(jsonObj)
+                  for (let i = 0; i < jsonObj.length; i++) {
+                      if (jsonObj[i].fund_pay_type == '390200') {
+                        hifmi_pay = jsonObj[i].fund_payamt
+                      }
+                  }
+                }
+
+
+
+
+                let obj = {
+                  '序号': i+1,
+                  '姓名': this.fromData[i].psn_name,
+                  '个人编号': this.fromData[i].psn_no,
+                  '门诊号': this.fromData[i].mdtrt_id,
+                  '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                  '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
+                  '挂号科室': "血透室",
+                  '门诊费用': this.fromData[i].medfee_sumamt,
+                  '自费': this.fromData[i].psn_cash_pay,
+                  '起付线': this.fromData[i].act_pay_dedc,
+                  '按比例自付': this.fromData[i].psn_cash_pay,
+                  "超封顶线费用": "0.00",
+                  "合计": parseFloat(this.fromData[i].act_pay_dedc) + parseFloat(this.fromData[i].psn_cash_pay),
+                  '统筹基金': this.fromData[i].fund_pay_sumamt,
+                  '大病保险': hifmi_pay,
+                  '医疗救助': this.fromData[i].maf_pay,
+                  '实账支付额': "0.00",
+                  "血透次数":this.fromData[i].DialysisCount,
+                  "置留管数量":0,
+                  "备注":"",
+
+                }
+
+
+
+
+
+                list.push(obj)
+              }
+              var insutype_name = ''
+              if (this.query_insutype == '310') {
+                insutype_name = '职工基本医疗保险'
+              } else if (this.query_insutype == '390') {
+                insutype_name = '城乡居民基本医疗保险'
+              }
+
+              import('@/vendor/Export2Excel').then(excel => {
+                const tHeader = ['序号', '姓名','个人编号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','自费', '起付线','按比例自付','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','自费', '起付线','按比例自付','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+                const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+
+                const data = this.formatJson(filterVal, list)
+                excel.export_json_to_excel({
+                  header: tHeader,
+                  data,
+                  filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+                })
+              })
+
+
+
+
+
+
+            }
+
+
           }
         })
 
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
-      }
+      },GetDiagnosisName(id){
+        for(let i = 0;i < this.diagnoses.length; i++){
+          if(this.diagnoses[i].id == id){
+            return this.diagnoses[i].class_name
+          }
+        }
+        return ""
+
+      },  getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.diagnoses = response.data.data.diagnose
+
+
+          }
+        })
+
+      },
+
     },
     created() {
       this.getList()
       this.fetchAllAdminUsers()
+      this.getInitData()
 
     }
   }

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -11,18 +11,7 @@
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
-          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
-            <el-option
-              label="全部"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="(item,index) in type"
-              :key="index"
-              :label="item.user_name"
-              :value="item.admin_user_id">
-            </el-option>
-          </el-select>
+
           <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="选择开始日期"
@@ -36,13 +25,13 @@
                           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>-->
+          <el-radio v-model="radio" label="1" @change="changeType">汇总</el-radio>
+          <el-radio v-model="radio" label="2"  @change="changeType">明细</el-radio>
         </div>
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
       <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row  v-if="radio == '1'">
         <el-table-column
           prop="date"
           label="序号"
@@ -52,51 +41,167 @@
         >
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">{{ scope.row.selt_time }}</template>
+          <template slot-scope="scope" >{{ scope.row.settle_accounts_date }}</template>
+        </el-table-column>
+        <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.fund_pay_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="大额基金金额">
+          <template slot-scope="scope">{{scope.row.hifob_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="大病基金金额">
+          <template slot-scope="scope">{{scope.row.hifmi_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="补充保险基金金额">
+          <template slot-scope="scope">{{scope.row.hifes_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医疗救助基金金额">
+          <template slot-scope="scope">{{scope.row.maf_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="公务员基金">
+          <template slot-scope="scope">{{scope.row.cvlserv_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付基金">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
         </el-table-column>
+        <el-table-column align="center" prop="name" label="折扣金额">
+          <template slot-scope="scope">{{scope.row.discount_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="优惠金额">
+          <template slot-scope="scope">{{scope.row.preferential_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人账户支付金额">
+          <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+        </el-table-column>
+        <!--<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}}</template>-->
+        <!--</el-table-column>-->
 
-        <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.psn_name }}</template>
-        </el-table-column>
-        <!--<el-table-column align="center" prop="name" label="患者类型">-->
-          <!--<template slot-scope="scope"></template>-->
+        <!--<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}}</template>
+
+        <!--<el-table-column align="center" prop="name" label="操作">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      </el-table>
+
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"  v-if="radio == '2'"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+                prop="date"
+                label="序号"
+                width="60"
+                align="center"
+                type="index"
+        >
         </el-table-column>
 
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope" >{{ scope.row.setl_time }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="姓名">
+          <template slot-scope="scope" >{{ scope.row.psn_name }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="姓名">
+          <template slot-scope="scope" >{{ scope.row.psn_name }}</template>
+        </el-table-column>
         <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.fund_pay_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付基金">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
 
+        <el-table-column align="center" prop="name" label="床位费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'01')}}</template>
+        </el-table-column>
 
+        <el-table-column align="center" prop="name" label="诊察费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'02')}}</template>
+        </el-table-column>
 
-        <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope">{{scope.row.reality_price}}</template>
+
+        <el-table-column align="center" prop="name" label="检查费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'03')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="科室">
-          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
+
+        <el-table-column align="center" prop="name" label="化验费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'04')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
+
+        <el-table-column align="center" prop="name" label="治疗费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'05')}}</template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="name" label="手术费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'06')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="护理费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'07')}}</template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="name" label="卫生材料费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'08')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="西药费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'09')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="中药饮片费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'10')}}</template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="name" label="中成药费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'11')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="一般诊疗费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'12')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费员">
-          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+
+        <el-table-column align="center" prop="name" label="挂号费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'13')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.order_status == 1">待结算</div>
-            <div v-if="scope.row.order_status == 2">已结算</div>
-            <div v-if="scope.row.order_status == 3">已退费</div>
-          </template>
+
+        <el-table-column align="center" prop="name" label="其他费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'14')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="操作">
-          <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-          </template>
+        <el-table-column align="center" prop="name" label="医保支付">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
         </el-table-column>
+        <el-table-column align="center" prop="name" label="现金">
+        <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="微信">
+        <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="支付宝">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="银行卡">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+
       </el-table>
+
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -118,7 +223,7 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { getIncomeStatisticsDataList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
 
   export default {
@@ -132,6 +237,7 @@
           { path: false, name: '项目消费明细汇总' }
         ],
         tableData: [],
+        radio:'1',
         limit:10,
         page:1,
         keywords:"",
@@ -144,6 +250,35 @@
       }
     },
     methods: {
+      getPrice(order_info, number){
+
+
+
+
+
+      },
+      changeType(val){
+
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          statistics_type: this.radio
+        }
+        getIncomeStatisticsDataList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+
+      },
       export_detail(){
         let params= {
           start_time:this.start_time,
@@ -248,33 +383,29 @@
       },  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()
+        this.getIncomeStatisticsDataList()
 
       },handleCurrentChange(page){
         this.page = page;
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
 
       },
       handleStartTimeChange(){
         this.page = 1
         this.keywords=""
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
       },handleEndTimeChange(){
         this.page = 1
         this.keywords=""
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
       },
       searchAction(){
         this.page = 1
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
 
       },
@@ -288,21 +419,21 @@
           return uParseTime(value, temp)
         }
         return ''
-      },getHisOrderList(){
+      },getIncomeStatisticsDataList(){
         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
+          statistics_type: this.radio
         }
-        getHisOrderList(params).then(response => {
+        getIncomeStatisticsDataList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.tableData = response.data.data.order
+            this.tableData = response.data.data.list
             this.total = response.data.data.total
           }
         })
@@ -321,7 +452,7 @@
       }
     }, created() {
      this.getDoctorList()
-     this.getHisOrderList()
+     this.getIncomeStatisticsDataList()
 
 
     }

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -15,6 +15,7 @@
         <div class='dialysisPage'>
             <printOne v-if="org_id != 10106" :paramsObj="invoiceParams"></printOne>
             <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
+            <!-- <printThree :paramsObj="invoiceParams"></printThree> -->
         </div>
     </div>
   </div>
@@ -23,11 +24,13 @@
 <script>
 import printOne from './invoiceTemplate/printOne'
 import printTwo from './invoiceTemplate/printTwo'
+import printThree from './invoiceTemplate/printThree'
 export default {
-  name: "invoicePrint",
+   name: "invoicePrint",
   components: {
     printOne,
-    printTwo
+    printTwo,
+    printThree
   },
   props:{
     invoiceParams:Object
@@ -37,7 +40,7 @@ export default {
       childResponse: {},
     //   invoiceParams:{},
      org_id:''
-      
+
 
     };
   },
@@ -73,7 +76,7 @@ export default {
             style: style,
             scanStyles: false
         });
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -93,7 +96,7 @@ export default {
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
         this.invoiceParams = val
-        
+
       },
       deep:true
     }
@@ -147,7 +150,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientCharges/invoiceTemplate/printOne.vue

@@ -141,6 +141,7 @@ export default {
         let params = {
             order_id: this.paramsObj.order_id,
             patient_id: this.paramsObj.patient_id,
+            number: this.paramsObj.number,
         }
         this.getInvoice(params)
         // var data = new Date();
@@ -192,7 +193,7 @@ export default {
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";  
+            n += "00";
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 
@@ -217,6 +218,7 @@ export default {
                 let params = {
                     order_id: val.order_id,
                     patient_id: val.patient_id,
+                    number: val.number,
                 }
                 this.getInvoice(params)