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

src/api/advice.js

@@ -42,13 +42,15 @@ export function EditDoctorAdvice(patient, id, advice, mode) {
   })
 }
 
-export function ExecDoctorAdvice(patient, id, time, mode, origin) {
+export function ExecDoctorAdvice(patient, id, time, mode, origin, hisAdviceIds, adviceIds) {
   var params = {
     id: id,
     patient: patient,
     execution_time: time,
     mode: mode,
-    origin: origin
+    origin: origin,
+    hisAdviceIds: hisAdviceIds,
+    adviceIds: adviceIds
   }
 
   return request({
@@ -60,13 +62,14 @@ export function ExecDoctorAdvice(patient, id, time, mode, origin) {
     }
   })
 }
-export function CheckDoctorAdvice(patient, id, mode, origin) {
+export function CheckDoctorAdvice(patient, id, mode, origin, hisAdviceIds, adviceIds) {
   var params = {
     id: id,
     patient: patient,
     mode: mode,
-    origin: origin
-    // execution_time: time,
+    origin: origin,
+    hisAdviceIds: hisAdviceIds,
+    adviceIds: adviceIds
   }
   return request({
     url: '/api/patients/advice/check',
@@ -509,3 +512,10 @@ export function getDoctorAdviceCount(params) {
   })
 }
 
+export function GetOrderDoctorAdvice(params) {
+  return request({
+    url: '/api/schedule/getorderdoctoradvice',
+    method: 'get',
+    params: params
+  })
+}

src/api/dialysis_record.js

@@ -113,6 +113,22 @@ export function getLongAdvice(params) {
   })
 }
 
+export function getLongAdviceOne(params) {
+  return request({
+    url: '/api/dialysis/advice_remind/one',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getLongAdviceTwo(params) {
+  return request({
+    url: '/api/dialysis/advice_remind/two',
+    method: 'Get',
+    params: params
+  })
+}
+
 export function GetSchedualNumber(params) {
   return request({
     url: '/api/schedule/get',

src/api/drug/drug.js

@@ -491,3 +491,75 @@ export function getInventoryModeList(params) {
     params: params
   })
 }
+
+export function getStorehouseList(params) {
+  return request({
+    url: '/api/drug/getstorehouselist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodNewQuery(params) {
+  return request({
+    url: '/api/drug/getgoodnewquery',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodWarehouseOutInfoById(params) {
+  return request({
+    url: '/api/drug/getgoodwarehouseoutinfobyid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodPatientList(params) {
+  return request({
+    url: '/api/good/getgoodpatientlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getWarehouseOutDetailByPatientId(params) {
+  return request({
+    url: '/api/good/getwarehouseoutdetailbypatientid',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getGoodExpiryDateQuery(params) {
+  return request({
+    url: '/api/good/getgoodexpirydatequery',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPurchaseStockQuery(params) {
+  return request({
+    url: '/api/good/getpurchasestockquery',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseOutDetailByPatientId(params) {
+  return request({
+    url: '/api/good/getdrugwarehouseoutdetailbypatientid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugExpiryDateQuery(params) {
+  return request({
+    url: '/api/drug/getdrugexpirydatequery',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -170,6 +170,7 @@ export default {
     drugsExpiryDate: '药品有效期预警',
     drugsSurplus: '药品剩余预警',
     drugsQuery: '库存查询',
+    drugsNewQuery: '库存查询',
     drugsReportLoss: '药品报损',
     drugsAdjustPrice: '药品调价',
     drugsStockCancel: '退库单',

src/router/modules/drugs.js

@@ -18,6 +18,12 @@ export default {
       name: 'drugsQuery',
       meta: { title: 'drugsQuery', noCache: true }
     },
+    {
+      path: '/stock/drugs/drugNewQuery',
+      component: () => import('@/xt_pages/stock/drugs/drugNewQuery'),
+      name: 'drugsNewQuery',
+      meta: { title: 'drugsNewQuery', noCache: true }
+    },
     {
       path: '/stock/drugs/stock/in',
       component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),

src/router/modules/hisTool.js

@@ -18,6 +18,14 @@ export default {
       name: 'modeTemplate',
       meta: { title: 'modeTemplate', noCache: true }
     },
+    {
+      path: '/hisTool/batchTemplate',
+      component: () => import('@/xt_pages/outpatientDoctorStation/batch_mode_template'),
+      name: 'batchModeTemplate',
+      meta: { title: 'batchModeTemplate', noCache: true },
+      hidden: true,
+      is_menu: false
+    },
     {
       path: '/hisTool/modeTemplateDetail',
       component: () => import('@/xt_pages/outpatientDoctorStation/modeTemplateDetail'),

src/views/layout/Layout.vue

@@ -12,10 +12,10 @@
           <i class="iconfont icon-s_bingli navIcon"></i>
           <p>电子病历</p>
         </div>
-        <!-- <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
+        <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
           <p>药房管理</p>
-        </div> -->
+        </div>
         <div v-if="touxiShow" :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -1,4 +1,5 @@
-<template><!--药品发药页面-->
+<template>
+  <!--药品发药页面-->
   <div class="main-contain new-main-contain">
     <div class="position">
       <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
@@ -18,13 +19,13 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               placeholder="选择日期"
-              :change="testsss()"
+              @change="changeTimes()"
             >
             </el-date-picker>
           </div>
 
           <div class="list">
-            <el-radio-group v-model="state">
+            <el-radio-group v-model="state" @change="lala()">
               <el-radio :label="1">待发药</el-radio>
               <el-radio :label="2">已发药</el-radio>
             </el-radio-group>
@@ -49,26 +50,31 @@
           <el-table
             v-if="state == 1"
             :height="tableHeight"
-            :data="tableData"
+            :data="waiting_drug"
             border
             style="width: 100%"
             highlight-current-row
-            ref="singleTable"
+            ref="table01"
             @current-change="handleCurrentChange"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
           >
             <el-table-column prop="name" label="名称" width="100">
-               <template slot-scope="scope">
-                {{scope.row.drug_name}}
+              <template slot-scope="scope">
+                {{ scope.row.name }}
               </template>
             </el-table-column>
             <el-table-column prop="specifications" label="规格" width="100">
               <template slot-scope="scope">
-                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                {{ scope.row.specifications }}
               </template>
             </el-table-column>
             <el-table-column prop="stock" label="库存" width="100">
-               <template slot-scope="scope">
-                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              <template slot-scope="scope">
+                {{ scope.row.stock }}
               </template>
             </el-table-column>
           </el-table>
@@ -76,26 +82,31 @@
           <el-table
             v-if="state == 2"
             :height="tableHeight"
-            :data="tableData"
+            :data="issued_drug"
             border
             style="width: 100%"
             highlight-current-row
-            @current-change="handleSelectionChangeOne"
-            ref="singleTable"
+            @current-change="handleCurrentChange"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            ref="table02"
           >
             <el-table-column prop="name" label="名称" width="100">
-               <template slot-scope="scope">
-                {{scope.row.drug_name}}
+              <template slot-scope="scope">
+                {{ scope.row.name }}
               </template>
             </el-table-column>
             <el-table-column prop="specifications" label="规格" width="100">
               <template slot-scope="scope">
-                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                {{ scope.row.specifications }}
               </template>
             </el-table-column>
             <el-table-column prop="stock" label="库存" width="100">
-               <template slot-scope="scope">
-                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              <template slot-scope="scope">
+                {{ scope.row.stock }}
               </template>
             </el-table-column>
           </el-table>
@@ -103,129 +114,220 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <el-button type="primary" @click="dispense" v-if="state == 1">发药</el-button>
+          <!--          <el-button type="primary" @click="tt">调试</el-button>-->
+          <el-button type="primary" @click="dispense" v-if="state == 1"
+            >发药</el-button
+          >
           <el-button type="primary" @click="toPrint">打印</el-button>
-          <el-button type="primary" @click="toSetting">设置</el-button>
+          <!--          <el-button @click="tt">调试</el-button>-->
+          <!--          <el-button type="primary" @click="toSetting">设置</el-button>-->
         </div>
         <el-divider></el-divider>
         <div>
           <el-table
             :height="tableHeight"
-            :data="tableData_list"
+            :data="tableData"
             border
+            highlight-current-row
             style="width: 1328px"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
             @selection-change="handleSelectionChange"
-             v-if="state == 1"
+            v-if="state == 1"
           >
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
+            <el-table-column
+              type="index"
+              label="序号"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="患者名称"
+              width="180"
+              align="center"
             >
-            <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column type="index" label="序号" width="120" align="center">
               <template slot-scope="scope">
-                {{scope.$index + 1}}
+                {{ scope.row.name }}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="患者名称" width="180" align="center">
-                <template slot-scope="scope">
-                 {{getPatientName(scope.row.patient_id)}}
+            <el-table-column
+              prop="name"
+              label="单次用量"
+              width="170"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.single_dosage }}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="单次用量" width="170" align="center">
-               <template  slot-scope="scope">
-                 {{scope.row.single_dose}}
-               </template>
-            </el-table-column>
-            <el-table-column prop="name" label="用法" width="160" align="center">
-               <template  slot-scope="scope">
-                 {{scope.row.delivery_way}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="用法"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.usage }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="频率" width="160" align="center">
-                <template  slot-scope="scope">
-                 {{scope.row.execution_frequency}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="频率"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.frequency }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="天数" width="160" align="center">
-               <template  slot-scope="scope">
-                 {{scope.row.day}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="天数"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.days }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="总量" width="160" align="center">
-                <template  slot-scope="scope">
-                 {{scope.row.prescribing_number}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="总量"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.total }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="数据来源" width="162" align="center">
-                <template  slot-scope="scope">
-                 <span v-if="scope.row.type == 1">血透</span>
-                 <span v-if="scope.row.type == 2">HIS</span>
-               </template>
+            <el-table-column
+              prop="name"
+              label="数据来源"
+              width="162"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.data_sources }}
+              </template>
             </el-table-column>
           </el-table>
-
-
-            <el-table
+        </div>
+        <div>
+          <el-table
             :height="tableHeight"
-            :data="tableList"
+            :data="tableData"
             border
             style="width: 1328px"
             v-if="state == 2"
           >
+            <!--            <el-table-column type="selection" width="55"> </el-table-column>-->
+            <el-table-column
+              type="index"
+              label="序号"
+              width="120"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="患者名称"
+              width="180"
+              align="center"
             >
-            <el-table-column type="selection" width="55"> </el-table-column>
-            <el-table-column type="index" label="序号" width="120" align="center">
               <template slot-scope="scope">
-                {{scope.$index + 1}}
+                {{ scope.row.name }}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="患者名称" width="180" align="center">
-                <template slot-scope="scope">
-                 {{getPatientName(scope.row.patient_id)}}
+            <el-table-column
+              prop="name"
+              label="单次用量"
+              width="170"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.single_dosage }}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="单次用量" width="170" align="center">
-               <template  slot-scope="scope">
-                 {{scope.row.single_dose}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="用法"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.usage }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="用法" width="160" align="center">
-               <template  slot-scope="scope">
-                 {{scope.row.delivery_way}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="频率"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.frequency }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="频率" width="160" align="center">
-                <template  slot-scope="scope">
-                 {{scope.row.execution_frequency}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="天数"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.days }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="天数" width="160" align="center">
-               <template  slot-scope="scope">
-                 {{scope.row.day}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="总量"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.total }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="总量" width="160" align="center">
-                <template  slot-scope="scope">
-                 {{scope.row.prescribing_number}}
-               </template>
+            <el-table-column
+              prop="name"
+              label="数据来源"
+              width="162"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.data_sources }}
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="数据来源" width="162" align="center">
-                <template  slot-scope="scope">
-                 <span v-if="scope.row.type == 1">血透</span>
-                 <span v-if="scope.row.type == 2">HIS</span>
-               </template>
+            <el-table-column
+              prop="name"
+              label="领药人"
+              width="160"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.people }}
+              </template>
             </el-table-column>
           </el-table>
-
-
         </div>
-        <div style="margin-top:12px;" v-if="state == 1">领药人：
+        <div style="margin-top: 25px" v-if="state == 1">
+          领药人：
           <el-select v-model="admin_user_id" placeholder="请选择">
             <el-option
               v-for="item in doctorList"
               :key="item.admin_user_id"
               :label="item.user_name"
-              :value="item.admin_user_id">
+              :value="item.admin_user_id"
+            >
             </el-option>
-           </el-select>
+          </el-select>
         </div>
       </div>
 
@@ -235,8 +337,15 @@
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
-        <div style="height: 50px; background: #c7ebfc; border-radius: 5px;padding: 7px;">
-          <i class="el-icon-info" style="color: #3399ff;font-size: 17px;"></i>
+        <div
+          style="
+            height: 50px;
+            background: #c7ebfc;
+            border-radius: 5px;
+            padding: 7px;
+          "
+        >
+          <i class="el-icon-info" style="color: #3399ff; font-size: 17px"></i>
           若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
         </div>
         <span slot="footer" class="dialog-footer">
@@ -259,13 +368,22 @@
 <script>
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
-// import {
-//   waitingdrug,
-//   issueddrugs,
-//   getpharmacycontent
-// } from "@/api/pharmacy"
-const moment = require('moment')
+import {
+  getTodayAdviceList,
+  getPharmacyBaseDrug,
+  updatePharmacyBaseDrug,
+  SaveSetting,
+  getPharmacyConfig,
+  getUserdDrugList,
+} from "@/api/his/advice";
+import {
+  dispensemedicine,
+  waitingmedicine,
+  getpatientswithdrugs,
+  medicinedeparture,
+  getcurrentname,
+} from "@/api/pharmacy";
+const moment = require("moment");
 export default {
   components: {
     BreadCrumb,
@@ -274,7 +392,7 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: "药品发药" },
+        { path: false, name: "药房管理" },
         { path: "/Pharmacy/DrugDispensing", name: "药品发药" },
       ],
       tableHeight: 400,
@@ -284,221 +402,310 @@ export default {
       alreadmount: 0,
       tableData: [],
       tableData_list: [],
-      tableList:[],
+      tableList: [],
       multipleSelection: [],
-      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-      patientList:[],
-      keywords:"",
-      dialogVisible:false,
-      is_open:"2",
-      isVisibility:"",
-      propsTable:"",
-      doctorList:[],
-      admin_user_id:this.$store.getters.xt_user.user.id,
+      start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      patientList: [],
+      keywords: "",
+      dialogVisible: false,
+      is_open: "2",
+      isVisibility: "",
+      propsTable: "",
+      doctorList: [],
+      admin_user_id: 0,
+      waiting_drug: [], //待发药列表
+      issued_drug: [], //已发药列表
+      currentRow: null,
+      tmp: 0,
     };
   },
 
   methods: {
-    testsss(){
-      console.log("time",this.start_time);
+    tt() {
+      console.log("this.currentRow", this.currentRow);
+      this.$router.go(0);
+    },
+    async fun3() {
+      console.log("fun3");
+      this.fun1().then((val) => {
+        this.fun2();
+      });
+    },
+    async fun4(tps) {
+      console.log("fun3", tps);
+      this.fun1().then((val) => {
+        console.log("this.issued_drug", this.issued_drug);
+        for (let i = 0; i < this.issued_drug.length; i++) {
+          if (tps == this.issued_drug[i].id) {
+            this.$refs.table02.setCurrentRow(this.issued_drug[i]);
+            this.handleCurrentChange(this.issued_drug[i]);
+          }
+        }
+      });
+    },
+    async fun5(tps) {
+      console.log("fun3", tps);
+      this.fun1().then((val) => {
+        console.log("this.issued_drug", this.waiting_drug);
+        for (let i = 0; i < this.waiting_drug.length; i++) {
+          if (tps == this.waiting_drug[i].id) {
+            this.$refs.table01.setCurrentRow(this.waiting_drug[i]);
+            this.handleCurrentChange(this.waiting_drug[i]);
+          }
+        }
+      });
+    },
+    changeTimes() {
+      // alert("aa")
+      // this.getdruglist();
+      this.fun3();
     },
     //初始化
-    init(){
-
+    init() {
+      this.state = 1;
+      this.tableData = null;
+      this.currentRow = null;
+    },
+    lala() {
+      this.currentRow = null;
+      this.tableData = null;
+      this.selectedbydefault();
     },
-     searchAction() {
-      this.getlist();
+    searchAction() {
+      // this.getlist();
+      this.tableData = null;
+      this.currentRow = null;
+      this.getdruglist();
     },
     // 跳转打印页面
     toPrint() {
-      // this.$router.push({ path: "/Pharmacy/print/patientPrint" });
-      this.$refs.drugprint.show();
+      if (this.state == 1 && this.multipleSelection.length == 0) {
+        this.$message.error("未选择任何数据");
+        return;
+      }
+      if (this.state == 2 && this.tableData == null) {
+        this.$message.error("未选择任何数据");
+        return;
+      }
+      this.$refs.drugprint.show(
+        this.tableData,
+        this.currentRow,
+        this.state,
+        this.multipleSelection,
+        this.start_time
+      );
     },
+    //列表选择
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    handleSelectionChangeOne(val){
-      this.tableList = []
-      this.getUserlist(val.id)
+    //默认选中
+    selectedbydefault() {
+      if (this.state == 1 && this.waiting_drug.length > 0) {
+        this.$refs.table01.setCurrentRow(this.waiting_drug[0]);
+        this.handleCurrentChange(this.waiting_drug[0]);
+      }
+      if (this.state == 2 && this.issued_drug.length > 0) {
+        this.$refs.table02.setCurrentRow(this.issued_drug[0]);
+        this.handleCurrentChange(this.issued_drug[0]);
+      }
+    },
+    //包装selectedbydefault
+    fun2() {
+      console.log("3333333this.waitmount_data", this.waiting_drug);
+      // return new Promise((resolve, reject) => {
+      if (this.state == 1 && this.waiting_drug.length > 0) {
+        this.$refs.table01.setCurrentRow(this.waiting_drug[0]);
+        this.handleCurrentChange(this.waiting_drug[0]);
+      }
+      if (this.state == 2 && this.issued_drug.length > 0) {
+        this.$refs.table02.setCurrentRow(this.issued_drug[0]);
+        this.handleCurrentChange(this.issued_drug[0]);
+      }
+      // });
     },
     // 药品发药
     dispense() {
-      var blood_ids = []
-      var his_ids = []
-      var bloodStr = ""
-      var hisStr = ""
-      for(let i=0;i<this.tableData.length;i++){
-        if(this.tableData[i].type == 1){
-          blood_ids.push(this.tableData[i].id)
-        }
-        if(this.tableData[i].type == 2){
-          his_ids.push(this.tableData[i].id)
-        }
+      var tps = this.currentRow.id;
+      if (this.multipleSelection.length < 1) {
+        this.$message.error("未选择任何信息");
+        return;
       }
-      bloodStr = blood_ids.join(",")
-      hisStr =  his_ids.join(",")
-      var params = {
-        bloodStr:bloodStr,
-        hisStr:hisStr,
-        admin_user_id:this.admin_user_id,
+      var tmp = "";
+      for (var i = 0; i < this.multipleSelection.length; i++) {
+        tmp = tmp + this.multipleSelection[i].id + ",";
       }
+      var params = {
+        creater: this.admin_user_id,
+        ids: tmp,
+      };
       this.$confirm("确定是否对该药品进行发药?", "患者发药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
       }).then(() => {
-        updatePharmacyBaseDrug(params).then(response=>{
-           if(response.data.state == 1){
-           var msg = response.data.data.msg
-           var medical =  response.data.data.medical
-           if(msg === 1){
-             this.$message.success("发药成功!")
-           }
-           if(msg == 2 || msg ===3){
-             this.$message.error("库存不足")
-           }
-         }
-        })
-      }).catch(() => {});
-    },
-
-    // 药品退药
-    endispense() {
-      var params = {};
-      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
-      })
-        .then(() => {})
-        .catch(() => {});
+        medicinedeparture(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success("操作成功");
+            this.getdruglist();
+            //刷新列表
+            this.handleCurrentChange(this.currentRow);
+            this.fun4(tps);
+            this.state = 2;
+            this.multipleSelection = [];
+          } else {
+            this.$message.error("操作失败：" + res.data.msg);
+            //刷新列表
+            this.handleCurrentChange(this.currentRow);
+            this.fun5(tps);
+            this.state = 1;
+          }
+        });
+      });
     },
-
-    getlist(){
+    //获取药品列表
+    getdruglist() {
       var params = {
-        start_time:this.start_time,
-        keywords:this.keywords,
-      }
-      getTodayAdviceList(params).then(response=>{
-         if(response.data.state == 1){
-           var list =  response.data.data.list
-           this.$refs.singleTable.setCurrentRow(list[0])
-           this.tableData = list
-           var doctorlist = response.data.data.doctorlist
-           this.doctorList = doctorlist
-         }
-      })
-    },
-   getWarehoseInfo(arr, max_unit, min_unit, min_number) {
-      var total = 0;
-      var max_str = "";
-      var min_str = "";
-      if (arr.length > 0) {
-        for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        keyword: this.keywords,
+        time: this.start_time,
+      };
+      waitingmedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.waiting_drug = res.data.data.list;
         }
-      }
-      if (total < min_number) {
-        min_str = total + min_unit;
-      }
-      if (total == 0) {
-        min_str = "";
-        max_str = "";
-      }
-      if (total >= min_number) {
-        if (parseInt(total / min_number) != 0) {
-          max_str = parseInt(total / min_number) + max_unit;
+      });
+      dispensemedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.issued_drug = res.data.data.list;
         }
-        if (total % min_number != 0) {
-          min_str = (total % min_number) + min_unit;
+      });
+    },
+    async fun1() {
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+      };
+      await waitingmedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.waiting_drug = res.data.data.list;
         }
-      }
-      return max_str + min_str;
+        console.log("fun1lil1111i");
+      });
+      await dispensemedicine(params).then((res) => {
+        if (res.data.state == 1) {
+          this.issued_drug = res.data.data.list;
+        }
+        console.log("fun122222222");
+      });
+      console.log("fun1");
     },
 
-    handleCurrentChange(row) {
-      this.getPharmacyBaseDrug(row.id)
+    morencreatename() {
+      var param = {};
+      getcurrentname(param).then((res) => {
+        console.log("res(药)", res);
+        if (res.data.state == 1) {
+          this.admin_user_id = res.data.data.list;
+          console.log("this.admin_user_id(药)", this.admin_user_id);
+        }
+      });
     },
-    getPharmacyBaseDrug(drug_id){
+    //获取领药人选项
+    getlist() {
       var params = {
-        start_time:this.start_time,
-        drug_id:drug_id,
-      }
-      getPharmacyBaseDrug(params).then(response=>{
-        if(response.data.state == 1){
-           var advicelist = response.data.data.advicelist
-           for(let i=0;i<advicelist.length;i++){
-             advicelist[i].type = 1
-             advicelist[i].day = " "
-             this.tableData_list.push(advicelist[i])
-           }
-           var hisAdviceList = response.data.data.hisAdviceList
-           for(let i=0;i<hisAdviceList.length;i++){
-             hisAdviceList[i].type = 2
-             this.tableData_list.push(hisAdviceList[i])
-           }
-           var patient = response.data.data.patient
-           this.patientList = patient
+        start_time: this.start_time,
+        keywords: this.keywords,
+      };
+      getTodayAdviceList(params).then((response) => {
+        if (response.data.state == 1) {
+          this.doctorList = response.data.data.doctorlist;
+          console.log("this.admin_user_id(药2)", this.admin_user_id);
+          // this.admin_user_id = this.doctorList[0].admin_user_id
+          // this.admin_user_id = this.tmp
         }
-      })
+      });
     },
-    getPatientName(id){
-       var name = ""
-       for(let i=0;i<this.patientList.length;i++){
-          if(id == this.patientList[i].id){
-             name = this.patientList[i].name
-          }
-       }
-       return name
+    //  //获取药品的患者信息
+    informationofdrugs(val) {
+      var params = {
+        // patient_id: this.currentRow.
+      };
+    },
+    handleCurrentChange(val) {
+      this.currentRow = val;
+      if (this.state == 1) {
+        this.getdrugsdetails(0);
+      }
+      if (this.state == 2) {
+        this.getdrugsdetails(1);
+      }
+    },
+    getdrugsdetails(val) {
+      var params = {
+        drug_id: this.currentRow.id,
+        is_medicine: val,
+        time: this.start_time,
+      };
+      getpatientswithdrugs(params).then((res) => {
+        if (res.data.state == 1) {
+          this.tableData = res.data.data.list; //列表数据
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      });
     },
-    toSetting(){
-      getPharmacyConfig().then(response=>{
-        if(response.data.state == 1){
-           this.dialogVisible = true
-           var config = response.data.data.config
-           this.is_open = config.is_open.toString()
+
+    toSetting() {
+      getPharmacyConfig().then((response) => {
+        if (response.data.state == 1) {
+          this.dialogVisible = true;
+          var config = response.data.data.config;
+          this.is_open = config.is_open.toString();
         }
-      })
+      });
     },
-    SaveSetting(){
+    SaveSetting() {
       var params = {
-        is_open:parseInt(this.is_open),
-      }
-     SaveSetting(params).then(response=>{
-       if(response.data.state == 1){
-         var config = response.data.data.config
-         this.$message.success("保存成功!")
-         this.dialogVisible = false
-       }
-     })
+        is_open: parseInt(this.is_open),
+      };
+      SaveSetting(params).then((response) => {
+        if (response.data.state == 1) {
+          var config = response.data.data.config;
+          this.$message.success("保存成功!");
+          this.dialogVisible = false;
+        }
+      });
     },
-    getUserlist(drug_id){
-       var params = {
-        start_time:this.start_time,
-        drug_id:drug_id,
-      }
-      getUserdDrugList(params).then(response=>{
-       if(response.data.state == 1){
-           var advicelist = response.data.data.advicelist
-           for(let i=0;i<advicelist.length;i++){
-             advicelist[i].type = 1
-             advicelist[i].day = " "
-             this.tableList.push(advicelist[i])
-           }
-           var hisAdviceList = response.data.data.hisAdviceList
-           for(let i=0;i<hisAdviceList.length;i++){
-             hisAdviceList[i].type = 2
-             this.tableList.push(hisAdviceList[i])
-           }
-           var patient = response.data.data.patient
-           this.patientList = patient
+    getUserlist(drug_id) {
+      var params = {
+        start_time: this.start_time,
+        drug_id: drug_id,
+      };
+      getUserdDrugList(params).then((response) => {
+        if (response.data.state == 1) {
+          var advicelist = response.data.data.advicelist;
+          for (let i = 0; i < advicelist.length; i++) {
+            advicelist[i].type = 1;
+            advicelist[i].day = " ";
+            this.tableList.push(advicelist[i]);
+          }
+          var hisAdviceList = response.data.data.hisAdviceList;
+          for (let i = 0; i < hisAdviceList.length; i++) {
+            hisAdviceList[i].type = 2;
+            this.tableList.push(hisAdviceList[i]);
+          }
+          var patient = response.data.data.patient;
+          this.patientList = patient;
         }
-      })
-    }
+      });
+    },
   },
   created() {
     this.init();
-    this.getlist()
+    this.morencreatename();
+    this.getlist();
+    // this.getdruglist();
+    this.fun3();
   },
 };
 </script>
@@ -538,6 +745,17 @@ export default {
     display: flex;
     justify-content: flex-end;
   }
+  .el-button {
+    height: 34px;
+    width: 65px;
+  }
+  .el-table {
+    margin-top: -13px;
+  }
+  /deep/ .el-divider {
+    height: 2px;
+    margin-top: 10px;
+  }
 }
 
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -14,9 +14,12 @@
           <div class="list">
             <el-date-picker
               style="width: 200px"
-              v-model="datepick"
+              v-model="start_time"
               type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期"
+              @change="changeTimes()"
             >
             </el-date-picker>
           </div>
@@ -38,6 +41,7 @@
               v-model="keywords"
               class="filter-item"
               placeholder="请输入患者名称"
+              clearable
             />
             <el-button
               size="small"
@@ -57,6 +61,11 @@
             border
             style="width: 100%"
             v-if="state == 1"
+             :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
           >
             <el-table-column prop="date" label="患者姓名" width="100">
               <template slot-scope="scope">
@@ -78,6 +87,11 @@
             highlight-current-row
             @current-change="handleCurrentChange"
             border
+             :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
             style="width: 100%"
             v-if="state == 2"
           >
@@ -110,13 +124,18 @@
             >设置</el-button
           >
         </div>
-        <el-divider></el-divider>
+        <el-divider style="margin-top: 10px"></el-divider>
         <div>
           <el-table
             :height="tableHeight"
-            :data="tableData_list"
+            :data="tableData"
             border
             style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
           >
             <el-table-column
               type="index"
@@ -186,8 +205,15 @@
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
-        <div style="height: 50px; background: #c7ebfc; border-radius: 5px;padding: 7px;">
-          <i class="el-icon-info" style="color: #3399ff;font-size: 17px;"></i>
+        <div
+          style="
+            height: 50px;
+            background: #c7ebfc;
+            border-radius: 5px;
+            padding: 7px;
+          "
+        >
+          <i class="el-icon-info" style="color: #3399ff; font-size: 17px"></i>
           若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
         </div>
         <span slot="footer" class="dialog-footer">
@@ -228,7 +254,7 @@ export default {
     return {
       patient_id: 0,
       crumbs: [
-        { path: false, name: "患者发药" },
+        { path: false, name: "药房管理" },
         { path: "/Pharmacy/patiantDispensing", name: "患者发药" },
       ],
       tableHeight: 400,
@@ -281,14 +307,14 @@ export default {
       });
     },
     async fun5(tmp) {
-      console.log("fun3");
+      console.log("fun5555");
       this.fun1().then((val) => {
         console.log("this.alreadmount_data", this.waitmount_data);
         for (let i = 0; i < this.waitmount_data.length; i++) {
           console.log("tmp = ", tmp);
           if (this.waitmount_data[i].PatientID == tmp) {
             console.log("i = ", i);
-            this.$refs.table02.setCurrentRow(this.waitmount_data[i]);
+            this.$refs.table01.setCurrentRow(this.waitmount_data[i]);
             this.handleCurrentChange(this.waitmount_data[i]);
           }
         }
@@ -427,11 +453,19 @@ export default {
         this.$message.error("未选择任何数据");
         return;
       }
-      this.$refs.patientprint.show(this.tableData, this.currentRow, this.state);
+      this.$refs.patientprint.show(
+        this.tableData,
+        this.currentRow,
+        this.state,
+        this.start_time
+      );
     },
 
     // 搜索患者
-    searchAction() {},
+    searchAction() {
+      this.tableData = null;
+      this.getwaitmount();
+    },
 
     // 药品发药
     dispense() {
@@ -440,7 +474,7 @@ export default {
         patient_id: this.currentRow.PatientID,
         time: this.start_time,
       };
-      this.$confirm("确定是否对该药品进行发药?", "患者发药", {
+      this.$confirm("确定是否对该患者进行发药?", "患者发药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
@@ -492,7 +526,6 @@ export default {
         }
       });
     },
-
     // 药品退药
     endispense() {
       var tmp = this.currentRow.PatientID;
@@ -500,7 +533,7 @@ export default {
         patient_id: this.currentRow.PatientID,
         time: this.start_time,
       };
-      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
+      this.$confirm("确定是否对该患者进行退药?", "患者退药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
@@ -512,7 +545,7 @@ export default {
               this.gettodaynumber();
               this.searchAction();
               this.tableData = null;
-              this.fun4(tmp);
+              this.fun5(tmp);
               this.state = 1;
             } else {
               this.$message.error(res.data.msg);
@@ -560,9 +593,20 @@ export default {
     display: flex;
     justify-content: flex-end;
   }
+  .el-table {
+    margin-top: -13px;
+  }
+  .el-button {
+    height: 34px;
+    width: 65px;
+  }
+  /deep/ .el-divider {
+    height: 2px;
+    margin-top: 10px;
+  }
 }
 
-.el-input__inner{
+/deep/ .el-input__inner {
   padding-right: 15px;
 }
 
@@ -586,4 +630,4 @@ export default {
   width: 15px !important;
   height: 15px !important;
 }
-</style>
+</style>

src/xt_pages/Pharmacy/print/drugPrint.vue

@@ -9,13 +9,13 @@
       >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
-      <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} 领药单</div></div>
+      <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} <span v-if="state_name=='待发药'">发药单</span> <span v-if="state_name=='已发药'">领药单</span></div></div>
       <div class="list_title">
         <div>药品名称：{{name}}</div>
         <div>规格：{{specifications}}</div>
         <div>发药状态：{{state_name}}</div>
-        <div>日期：</div>
-<!--        <div v-if="state==2">领药人：</div>-->
+        <div>日期：{{times}}</div>
+<!--  <div v-if="state==2">领药人：</div>-->
       </div>
 
       <el-table
@@ -25,44 +25,44 @@
         max-height="450"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
       >
-        <el-table-column type="index" prop="index" label="序号" width="60">
+        <el-table-column type="index" prop="index" label="序号" width="60" align="center">
         </el-table-column>
-        <el-table-column prop="name" label="患者姓名" width="160">
+        <el-table-column prop="name" label="患者姓名" width="160" align="center">
           <template  slot-scope="scope">
             {{scope.row.name}}
           </template>
         </el-table-column>
-        <el-table-column prop="single_dosage" label="单次用量" width="120">
+        <el-table-column prop="single_dosage" label="单次用量" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.single_dosage}}
           </template>
         </el-table-column>
-        <el-table-column prop="usage" label="用法" width="120">
+        <el-table-column prop="usage" label="用法" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.usage}}
           </template>
         </el-table-column>
-        <el-table-column prop="frequency" label="频率" width="120">
+        <el-table-column prop="frequency" label="频率" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.frequency}}
           </template>
         </el-table-column>
-        <el-table-column prop="days" label="天数" width="120">
+        <el-table-column prop="days" label="天数" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.days}}
           </template>
         </el-table-column>
-        <el-table-column prop="total" label="总量" width="120">
+        <el-table-column prop="total" label="总量" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.total}}
           </template>
         </el-table-column>
-        <el-table-column prop="data_sources" label="数据来源" width="120">
+        <el-table-column prop="data_sources" label="数据来源" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.data_sources}}
           </template>
         </el-table-column>
-        <el-table-column prop="people" label="领药人" width="120">
+        <el-table-column prop="people" label="领药人" width="120" align="center">
           <template  slot-scope="scope">
             {{scope.row.people}}
           </template>
@@ -83,6 +83,7 @@ export default {
       tableData: [],
       isClose:false,
       name:"",
+      times:"",
       specifications:"",
       state_name:"",
       org_name: this.$store.getters.xt_user.org.org_name,
@@ -97,8 +98,20 @@ export default {
         type:Number
     }
   },
-
+  created(){
+    this.init();
+  },
   methods: {
+    init(){
+      // let year = new Date().getFullYear();
+      // let month = new Date().getMonth() +1;
+      // let day = new Date().getDate();
+      // let hour = new Date().getHours();
+      // let minute = new Date().getMinutes();
+      // this.times = year + "年" + month + "月" + day + "日" + hour + "时" + minute + "分"
+      // console.log("times:",this.times)
+    },
+
     // isClose() {
     //   this.visibility = false;
     // },
@@ -113,7 +126,8 @@ export default {
         }
       }
     },
-    show: function (val,data,state,ids) {
+    show: function (val,data,state,ids,times) {
+      this.times = times
       this.visibility = true;
       this.name = data.name
       this.specifications = data.specifications
@@ -140,15 +154,8 @@ export default {
 
     // 打印
     print() {
+      console.log(this.org_name,'this.org_name')
       Vue.prototype.printJson = printutils.printJson;
-      //   const style =
-      //     '@media print {.list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto}}';
-      //   printJS({
-      //     printable: "dialysis-print-box-1",
-      //     type: "html",
-      //     style: style,
-      //     scanStyles: false,
-      //   });
       this.printJson({
         title: `
         <div>
@@ -157,8 +164,8 @@ export default {
         <div style="width: 230px;padding: 10px 0;">药品名称：${this.name}</div>
         <div style="width: 230px;padding: 10px 0;">规格：${this.specifications}</div>
         <div style="width: 230px;padding: 10px 0;">发药状态：${this.state_name}</div>
-        <div style="width: 230px;padding: 10px 0;">日期：</div>
-        </div>`, // 打印出来的标题
+        <div style="width: 230px;padding: 10px 0;">日期：${this.times}</div>
+        </div></div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
         fields: [
@@ -221,8 +228,8 @@ export default {
 }
 .print_style {
   position: absolute;
-  right: 10px;
-  top: 42px;
+  right: 65px;
+  top: 50px;
 }
 
 .list_title {

src/xt_pages/Pharmacy/print/patientPrint.vue

@@ -9,11 +9,11 @@
       >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
-       <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} 发药单</div></div>
+       <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} <span v-if="state=='待发药'">发药单</span> <span v-if="state=='已发药'">领药单</span></div></div>
       <div class="list_title">
         <div>患者名称：{{name}}</div>
         <div>发药状态：{{state}}</div>
-        <div>日期：</div>
+        <div>日期：{{times}}</div>
       </div>
 
       <el-table
@@ -26,16 +26,44 @@
         <el-table-column type="index" prop="index" label="序号" width="60" align="center">
         </el-table-column>
         <el-table-column prop="name" label="名称" width="160" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Name ? scope.row.Name : ""}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="SingleDosage" label="单次用量" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.SingleDosage ? scope.row.SingleDosage : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="use" label="用法" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Usage ? scope.row.Usage : ""}}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="use" label="用法" width="120" align="center"> </el-table-column>
         <el-table-column prop="frequency" label="频率" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Frequency ? scope.row.Frequency : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="day" label="天数" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Days ? scope.row.Days : ""}}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="day" label="天数" width="120" align="center"> </el-table-column>
         <el-table-column prop="amount" label="总量" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Total ? scope.row.Total : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="tips" label="数据来源" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.DataSources ? scope.row.DataSources : ""}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="tips" label="备注" width="120" align="center">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Remarks ? scope.row.Remarks : ""}}</span>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -50,10 +78,11 @@ export default {
   data() {
     return {
       visibility: false,
-      tableData: [{}],
+      tableData: [],
       isClose:false,
       name:"",
       state:null,
+      times:"",
       org_name: this.$store.getters.xt_user.org.org_name,
     };
   },
@@ -62,11 +91,22 @@ export default {
       type: Object,
     },
   },
-
+  created(){
+    this.init();
+  },
   methods: {
     // isClose() {
     //   this.visibility = false;
     // },
+    init(){
+      // let year = new Date().getFullYear();
+      // let month = new Date().getMonth() +1;
+      // let day = new Date().getDate();
+      // let hour = new Date().getHours();
+      // let minute = new Date().getMinutes();
+      // this.times = year + "年" + month + "月" + day + "日" + hour + "时" + minute + "分"
+      // console.log("times:",this.times)
+    },
 
     hide: function () {
       this.visibility = false;
@@ -78,8 +118,19 @@ export default {
         }
       }
     },
-    show: function () {
+    show: function (val,data,state,times) {
+      this.times = times
       this.visibility = true;
+      console.log("val",val)
+      this.tableData = val
+      this.name = data.Name
+      if (state == 1){
+        this.state = "待发药"
+      }
+      if (state == 2){
+        this.state = "已发药"
+      }
+
     },
 
     comfirm: function (formName) {
@@ -93,6 +144,7 @@ export default {
 
     // 打印
     print() {
+      console.log(this.org_name,'this.org_name')
       Vue.prototype.printJson = printutils.printJson;
       //   const style =
       //     '@media print {.list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto}}';
@@ -109,55 +161,55 @@ export default {
         <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
         <div style="width: 310px;padding: 10px 0;">患者名称：${this.name}</div>
         <div style="width: 320px;padding: 10px 0;">发药状态：${this.state}</div>
-        <div style="width: 310px;padding: 10px 0;">日期：</div>
-        </div>`, // 打印出来的标题
+        <div style="width: 310px;padding: 10px 0;">日期：${this.times}</div>
+        </div></div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
         fields: [
           // 需要打印的字段
-          // "index",
+
           "Name",
           "SingleDosage",
-          "use",
-          "frequency",
-          "day",
-          "amount",
-          "from",
-          "tips",
+          "Usage",
+          "Frequency",
+          "Days",
+          "Total",
+          "DataSources",
+          "Remarks",
         ],
         properties: [
           // 需要打印的字段对应的表头名
-         
+
           {
-            field: "name",
+            field: "Name",
             displayName: "名称",
           },
           {
             field: "SingleDosage",
-            displayName: "单词用量",
+            displayName: "单次用量",
           },
           {
-            field: "use",
+            field: "Usage",
             displayName: "用法",
           },
           {
-            field: "frequency",
+            field: "Frequency",
             displayName: "频率",
           },
           {
-            field: "day",
+            field: "Days",
             displayName: "天数",
           },
           {
-            field: "amount",
+            field: "Total",
             displayName: "总量",
           },
           {
-            field: "from",
+            field: "DataSources",
             displayName: "数据来源",
           },
           {
-            field: "tips",
+            field: "Remarks",
             displayName: "备注",
           },
         ],
@@ -167,11 +219,10 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/css" lang="scss" scoped>
+<style lang="scss" scoped>
 /deep/ .el-dialog{
   width: 60%;
 }
-
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
   width: 10px;
   height: 10px;
@@ -219,4 +270,4 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-</style>
+</style>

src/xt_pages/data/components/addDrugs.vue

@@ -621,7 +621,7 @@
           is_user:"2",
           sum_count:"",
           sum_in_count:"",
-          is_pharmacy:0,//是否通过药房发药
+          is_pharmacy:1,//是否通过药房发药
         },
 
         rules: {
@@ -737,6 +737,7 @@
         this.form.intro = ''
       },
       show(id, obj) {
+        console.log("obj3223323232332",obj)
         this.unitList = []
         this.packingUnit = []
         var arr =  getDataConfig('hemodialysis','units')

src/xt_pages/dialysis/PatientBox.vue

@@ -240,7 +240,7 @@ import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPresc
 import treatmentSummaryDialog from "../dialysis/details/dialog/treatmentSummaryDialog";
 import {
   getDialysisScheduleDetail,
-  getLongAdvice,
+  getLongAdviceOne,
 } from "@/api/dialysis_record";
 
 export default {
@@ -340,6 +340,7 @@ export default {
       type: Array,
     },
     patientStateVal: Number,
+    selected_date:String,
   },
 
   methods: {
@@ -661,10 +662,12 @@ export default {
       });
     },
     getLongAdvice() {
+    
       let params = {
         patient_id: this.patient_id,
+        schedule_date:parseTime(this.selected_date, '{y}-{m}-{d}'),
       };
-      getLongAdvice(params).then((rs) => {
+      getLongAdviceOne(params).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
           var status = parseInt(resp.data.status);
@@ -698,7 +701,9 @@ export default {
               }
 
               this.is_open = resp.data.is_open_remind;
+              
               this.longAdvices = totalAdvice;
+              console.log("长期医嘱22332323232232323",this.longAdvices)
               this.waitUploadAdvices = waitUploadAdvices;
               break;
           }

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

@@ -165,7 +165,6 @@
           :disabled="!is_has_exce"
           @click="execAdvice"
           :loading="deleLoading"
-
         >执行医嘱
         </el-button>
         <el-button v-else disabled round @click="execAdvice" :loading="deleLoading">执行医嘱</el-button>
@@ -209,6 +208,7 @@
       <!-- 医嘱列表 -->
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
+      <!-- :span-method="objectSpanMethod" -->
       <el-table
         v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -219,14 +219,13 @@
         ref="advices_list"
         @row-click="cellMouseEnter"
         :row-class-name="tableRowClassName"
-        :span-method="objectSpanMethod"
+        
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
+        @selection-change="handleSelectionChange"
         highlight-current-row
-
       >
-      <!-- @selection-change="handleSelectionChange" -->
-        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
+       <el-table-column type="selection"  width="55" ></el-table-column>
        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -300,8 +299,6 @@
             <span>
               {{getXuserName(scope.row.checker)}}
             </span>
-
-
           </template>
         </el-table-column>
       </el-table>
@@ -321,8 +318,9 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
+        @selection-change="handleSelectionChange"
       >
-        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
+        <el-table-column type="selection"  width="55"></el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -330,13 +328,6 @@
         </el-table-column>
 
 
-        <!--===================================-->
-<!--        <el-table-column prop="date" label="调试" align="center" min-width="26px">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span @click="lili(scope.$index,scope.row)">{{ scope.row.parent_id }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -623,7 +614,8 @@
     EditDoctorAdvice,
     ExecDoctorAdvice,
     getAdviceConfig,
-    GetLastOrNextDoctorAdvice
+    GetLastOrNextDoctorAdvice,
+    GetOrderDoctorAdvice
   } from '@/api/advice'
   import { getDataConfig } from '@/utils/data'
 
@@ -780,6 +772,8 @@
         drug_id: 0,
         src_type:"",
         org_id:0,
+        hisAdviceIds:"",
+        adviceIds:"",
       }
     },
     watch: {
@@ -796,16 +790,50 @@
 
     },
     methods: {
-      handleSelectionChange(){
-
-      },
-
-      //调试
-      lili(index,row){
-        // console.log("==index==",index)
-        // console.log("==row==",row)
-        console.log("==doctor_advices==",this.doctor_advices)
-        console.log("==this.form==",this.form)
+      handleSelectionChange(row){
+        console.log("row3233223232332322323",row)
+       if(row.length >0){
+         this.currentRow = row[0]
+       }
+       var bloodIds= []
+       var hisIds=[]
+       console.log("this.his_is_open ",this.his_is_open )
+       console.log("is_advice_open",this.is_advice_open)
+       for(let i=0;i<row.length;i++){
+        //血透
+         if(this.his_is_open  != 1 && this.is_advice_open!=1){
+            bloodIds.push(row[i].id)
+         }
+         //his
+         if(this.his_is_open == 1 && this.is_advice_open!=1){
+             hisIds.push(row[i].id)
+         }
+         
+         if(this.his_is_open == 1 && this.is_advice_open == 1){
+            if(row[i].origin == 1){
+              bloodIds.push(row[i].id)
+            }
+            if(row[i].origin == 2){
+              hisIds.push(row[i].id)
+            }
+           this.currentRow.origin = 3
+         }
+       }
+      
+       if(this.his_is_open  == 1 || this.is_advice_open == 1){
+         this.is_has_exce = true
+         this.is_has_check = true
+       }
+     
+       if(this.his_is_open!=1 && this.is_advice_open!=1){
+        
+          this.is_has_exce = true
+          this.is_has_check = true
+       }
+        console.log("bloodIds",bloodIds,"hisIds",hisIds)
+       this.adviceIds = bloodIds.join(",")
+       this.hisAdviceIds = hisIds.join(",")
+      
       },
       getContent: function() {
         if (this.sch != null) {
@@ -1242,7 +1270,7 @@
         let mode = '6'
 
 
-        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
+        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin,this.hisAdviceIds,this.adviceIds).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.exceLoading = false
@@ -1254,46 +1282,71 @@
                 type: 'success',
                 duration: 2000
               })
+              
               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.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 =
-                        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
+                  let params = {
+                  patient_id: this.patientid,
+                  record_time: this.request_record_date,
+                  type: 1,
+                  advice_date:this.$route.query.date,
+                }
+                this.GetOrderDoctorAdvice(params)
+                this.execTimeDialogVisible = false
               }
+            
+              // 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.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 =
+              //           response.data.data.advice.execution_staff
+              //         this.doctor_advices[index].execution_time =
+              //           response.data.data.advice.execution_time
+              //         break
+              //       }
+              //     }
+              //     this.execTimeDialogVisible = false
+
+              //     return false
+              // }
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
+               let params = {
+                patient_id: this.patientid,
+                record_time: this.request_record_date,
+                type: 1,
+                advice_date:this.$route.query.date,
+              }
+              this.GetOrderDoctorAdvice(params)
                 this.execTimeDialogVisible = false
                 return false
               }
               if(msg == 3){
                 this.$message.error("无库存,请入库")
+               let params = {
+                patient_id: this.patientid,
+                record_time: this.request_record_date,
+                type: 1,
+                advice_date:this.$route.query.date,
+              }
+              this.GetOrderDoctorAdvice(params)
                 this.execTimeDialogVisible = false
                 return false
               }
@@ -1602,7 +1655,7 @@
             this.deleLoading = true
             let mode = '7'
 
-            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin).then(
+            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin,this.hisAdviceIds,this.adviceIds).then(
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1616,33 +1669,37 @@
                     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
+                   let params = {
+                    patient_id: this.patientid,
+                    record_time: this.request_record_date,
+                    type: 1,
+                    advice_date:this.$route.query.date,
                   }
-                  // if (this.currentRow.parent_id > 0) {
-                  //     exid = this.currentRow.parent_id;
+                console.log("param233223223233232",params)
+                 this.GetOrderDoctorAdvice(params)
+                  // var exid = response.data.data.advice.id
+                  // if (response.data.data.advice.parent_id > 0) {
+                  //   exid = response.data.data.advice.parent_id
+                  // }
+                  // this.currentRow.check_state = 1
+                  // this.currentRow.check_time =
+                  //   response.data.data.advice.check_time
+                  // this.currentRow.checker = response.data.data.advice.checker
+                  // 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].check_state = 1
+                  //     this.doctor_advices[index].check_time =
+                  //       response.data.data.advice.check_time
+                  //     this.doctor_advices[index].checker =
+                  //       response.data.data.advice.checker
+                  //     // break;
+                  //   }
                   // }
-                  this.currentRow.check_state = 1
-                  this.currentRow.check_time =
-                    response.data.data.advice.check_time
-                  this.currentRow.checker = response.data.data.advice.checker
-                  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].check_state = 1
-                      this.doctor_advices[index].check_time =
-                        response.data.data.advice.check_time
-                      this.doctor_advices[index].checker =
-                        response.data.data.advice.checker
-                      // break;
-                    }
-                  }
 
                   this.deleLoading = false
                 }
@@ -1736,29 +1793,6 @@
           this.nowExecTime = new Date(group_top_advice.start_time * 1000)
         }
         this.$refs.exec_time.open()
-        // if (this.currentRow == null) {
-        //   this.$message.error("请先选择要执行的医嘱！");
-        //   return false;
-        // }
-        //
-        // if (
-        //   this.currentRow.stop_state == 1 ||
-        //   this.currentRow.execution_state == 1
-        // ) {
-        //   this.$message.error("所选医嘱已停止或执行");
-        //   return false;
-        // }
-        //
-        // if (
-        //   this.currentRow.checker > 0 &&
-        //   this.currentRow.checker == this.$store.getters.xt_user.user.id
-        // ) {
-        //   this.$message.error("核对与执行不能是同一人");
-        //   return false;
-        // }
-        //
-        // this.execTimeDialogVisible = true;
-        // this.deleLoading = true;
       }
       ,
 
@@ -2009,8 +2043,6 @@
       }
       ,
       show(his_is_open,is_advice_open) {
-        console.log("his_is_open233232323232323322323",his_is_open)
-        console.log("is_advice_open233232323232323322323",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
@@ -2116,7 +2148,7 @@
         }
       },
       cellMouseEnter: function(row, column, event) {
-        console.log("row323323322323233232",row)
+       
         this.currentRow = row
         this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {
@@ -2286,11 +2318,11 @@
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
+       
         GetLastOrNextDoctorAdvice(params).then(response => {
           if (response.data.state == 1) {
 
             var doctor_advices = response.data.data.advices
-
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule
@@ -2301,6 +2333,40 @@
         })
 
       },
+      GetOrderDoctorAdvice(params){
+        GetOrderDoctorAdvice(params).then(response=>{
+           if(response.data.state == 1){
+            var doctorAdvice =  response.data.data.doctorAdvice
+            for(let i=0;i<doctorAdvice.lenght;i++){
+               doctorAdvice[i].origin = 1 
+            }
+            
+            var hisDoctorAdvice = response.data.data.hisDoctorAdvice
+            for(let i=0;i<hisDoctorAdvice.length;i++){
+               hisDoctorAdvice[i].origin = 2
+            }
+            this.doctor_advices = []
+            if(this.his_is_open!=1 && this.is_advice_open !=1){
+              
+               this.doctor_advices = doctorAdvice
+            }
+            if(this.his_is_open ==1 && this.is_advice_open!=1){
+              this.doctor_advices = hisDoctorAdvice
+            }
+
+            if(this.his_is_open == 1 &&  this.is_advice_open == 1){
+               for(let i=0;i<doctorAdvice.length;i++){
+                  this.doctor_advices.push(doctorAdvice[i])
+               }
+               for(let i=0;i<hisDoctorAdvice.length;i++){
+                 this.doctor_advices.push(hisDoctorAdvice[i])
+               }
+            }
+           
+           
+           }
+        })
+      },
       getDialysisScheduleDetail() {
         if(this.$route.query.showView && this.$route.query.showView == true){
           return
@@ -2341,7 +2407,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            advice_date:this.$route.query.date,
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2350,7 +2417,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            advice_date:this.$route.query.date,
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2366,7 +2434,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            advice_date:this.$route.query.date,
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2374,7 +2443,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            advice_date:this.$route.query.date,
           }
           this.GetLastOrNextDoctorAdvice(params)
 
@@ -2562,6 +2632,7 @@
      }
     },
     created() {
+      console.log("doctor_advices32323233323322332",this.doctor_advices)
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date
@@ -2571,9 +2642,6 @@
       this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
-
-
-      // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
     },

src/xt_pages/dialysis/details/index.vue

@@ -17,12 +17,12 @@
           @click="next"
           >下一位</el-button
         >
-        <!-- <el-button
+        <el-button
           size="small"
           type="primary"
           @click="printOrderOne"
           icon="el-icon-printer"
-          >打印上机单</el-button> -->
+          >打印上机单</el-button>
 
         <el-button
           size="small"
@@ -235,28 +235,30 @@
         <div class="print_main_content">
           <div class="table_panel">
              <div v-for="(main_collection,index) in printList" :key="index">
-              <div class="signPrint" style="font-size:16px;">
+              <div class="signPrint" style="width: 360px;font-size:16px;">
                 <div style="margin-left:50px;">姓名:
                   <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
                 </div>
-                <div class="printCell">
-                  <span>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">
                     床号：{{ main_collection.number.number }}
                     <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
                     <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
                     <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
                   </span>
-                  <span>{{ printDate }}</span>
+                  <span style="display: block;width: 50%;">{{ printDate }}</span>
                 </div>
-                <div class="printCell">
-                   <span>干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
-                    <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                   <span style="display: block;width: 50%;">干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                    <span style="display: block;width: 50%;">抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
 
                 </div>
-                <div class="printCell">
-                  <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
-                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  
+                  <span style="display: block;width: 50%;">
+                    首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
                   </span>
@@ -287,10 +289,13 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
+                    </span> 
+                 
                 </div>
-                <div class="printCell">
-                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
-                 维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
+                 <span style="display: block;width: 50%;">
+                     维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
                   </span>
@@ -324,10 +329,13 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     iu/h
                    </span>
+                  </span>
+                
                 </div>
-                <div class="printCell">
-                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
-                 总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  <span style="display: block;width: 50%;">
+                    总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg
                   </span>
@@ -361,6 +369,7 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                    iu
                    </span>
+                  </span>
                 </div>
               </div>
             </div>
@@ -716,7 +725,7 @@ import TreatmentOf from './treatmentOf'
 import OperationStaff from './operationStaff'
 import {
   getDialysisScheduleDetail,
-  getLongAdvice,
+  getLongAdviceTwo,
   getDialysisRecordInitData,
   getDialysisSchedules,
   getInitPrintData
@@ -1077,9 +1086,10 @@ export default {
     },
     getLongAdvice() {
       const params = {
-        patient_id: this.patient_id
+        patient_id: this.patient_id,
+        schedule_date:this.$route.query.date,
       }
-      getLongAdvice(params).then(rs => {
+      getLongAdviceTwo(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var status = parseInt(resp.data.status)
@@ -1120,6 +1130,7 @@ export default {
                 this.is_open = 1
               }
               this.longAdvices = totalAdvice
+              console.log("长期医嘱汇总 u 公告让你😯23232322332",this.longAdvices)
               this.waitUploadAdvices = waitUploadAdvices
               break
           }
@@ -1401,6 +1412,7 @@ export default {
       )
     },
     printOrderOne(){
+
       this.getInitPrintData()
 
     },
@@ -2145,16 +2157,23 @@ export default {
     },
     printAction: function() {
         const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
-        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
+        const style1 = '@page {margin-top:10px;} @media print{}'
         printJS({
           printable: 'print_content',
           type: 'html',
-          documentTitle: '  ',
+          documentTitle: '',
           style: style1,
           scanStyles: false
         })
       },
     getInitPrintData(){
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+       })
+      
        var params = {
          patient_id:this.$route.query.patient_id,
          record_date:this.$route.query.date,
@@ -2167,6 +2186,7 @@ export default {
           this.printList = list
           this.assessmentAfterDislysis = assessmentAfterDislysis
           this.startVisibility = true
+          loading.close()
         }
       })
     }

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1421,7 +1421,7 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr inside_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
@@ -1445,7 +1445,7 @@ export default {
       const style11 =
         '@media print {.dialysis-print-order{width:960px;margin:100px auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:30px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:15px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       // 雷州惠爱样式
-      const style12 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:50px;} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;} ';
+      const style12 ='@page {margin-top:10px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:30px;} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}  .dialysis-print-order tbody .print-table tr{page-break-inside:avoid;} .dialysis-print-order tbody .print-table tr td{border: 1px solid #000;} ';
       // 金乡宏大样式
       const style13 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
 
@@ -1735,14 +1735,16 @@ export default {
           style: style,
           scanStyles: false,
         });
-      } else if (this.org_template_info.template_id == 43) {
+      } else if (
+        this.org_template_info.template_id == 43
+      ) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
           style: style2,
           scanStyles: false,
         });
-      } else if (this.org_template_info.template_id == 44) {
+      }else if (this.org_template_info.template_id == 44) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -1890,7 +1892,7 @@ export default {
       const style =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({

src/xt_pages/dialysis/schedualPatient.vue

@@ -85,7 +85,7 @@
         <div v-for="zone_schedule in allPatient" :key="zone_schedule.zone_id" class="list clearfix">
           <!-- <h3 style="width:40px;" class="title">{{zone_schedule.zone_name}}</h3> -->
           <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;line-height:30px;">{{zone_schedule.zone_name}}</div>
-          <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' style="flex:1"></patient-box>
+          <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' :selected_date="selected_date" style="flex:1"></patient-box>
         </div>
         
         <div class="NoData" v-show="filtedSchedules.length == 0">
@@ -299,6 +299,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       var patient_state_selected = this.$store.getters.patient_state_selected
       var treat_state_selected = this.$store.getters.treat_state_selected
       var selected_date = this.$store.getters.selected_date
+
       if (schedule_type_selected) {
         this.schedule_type_selected = schedule_type_selected.schedule_type_selected
       }

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySix.vue

@@ -1115,7 +1115,6 @@
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </div>
-                    
                   </div>
                 </td>
               </tr>
@@ -3268,7 +3267,7 @@ export default {
               monitor.operate_time == this.dialysisOrder.end_time
             ) {
               this.monitors[index].end = "【结束透析】";
-              
+
               tempmonitorflag = false;
             }
             if (tempmonitorflag == false && index == this.monitors.length - 1) {
@@ -3433,8 +3432,17 @@ export default {
             }
           }
         }
+
         if (this.org_id == 10330 || this.org_id == 0 || this.org_id == 9675) {
-          this.doctor_advices = this.doctor_advices.filter(o => o.delivery_way.indexOf("注射") > -1)
+          let newArr = [];
+          this.doctor_advices.forEach((o) => {
+            if (o.delivery_way && o.delivery_way != "") {
+              if (o.delivery_way.indexOf("注射") > -1) {
+                newArr.push(o);
+              }
+            }
+          });
+          this.doctor_advices = newArr;
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -1395,6 +1395,7 @@ export default {
             this.tableAdvice.push([]);
           }
         }
+         
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -749,26 +749,14 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        {{
-                          prescription.dialyzer_perfusion_apparatus
-                            ? prescription.dialyzer_perfusion_apparatus
-                            : ""
-                        }}
-                        <span
-                          v-if="
-                            !prescription.dialysis_dialyszers &&
-                            !prescription.dialyzer_perfusion_apparatus
-                          "
-                          >/</span
-                        >
-                        <span v-if="prescription.dialysis_dialyszers">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
-                            : ""
+                            : "/"
                         }}
                       </div>
                     </div>
+
                     <div class="inline_block" style="padding-right: 15px">
                       灌流器：
                       <div
@@ -782,6 +770,19 @@
                         }}
                       </div>
                     </div>
+                    <!-- <div class="inline_block" style="flex: 1">
+                      透析器/灌流器:
+                      <div
+                        class="under_line"
+                        style="width: 130px; text-align: center"
+                      >
+                        {{
+                          prescription.dialyzer_perfusion_apparatus
+                            ? prescription.dialyzer_perfusion_apparatus
+                            : "/"
+                        }}
+                      </div>
+                    </div> -->
 
                     <div class="inline_block" style="flex: 1">
                       穿刺方式：

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -774,7 +774,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290&&org_id!=9675">
                       透析(滤)器：
                       <div
                         class="under_line"
@@ -785,14 +785,15 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
+                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
-                            : "/"
+                            : ""
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290&&org_id!=9675">
                       灌流器：
                       <div
                         class="under_line"
@@ -805,6 +806,25 @@
                         }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex: 1" v-if="org_id==10290||org_id==9675">
+                      透析器/灌流器：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          prescription.dialyzer_perfusion_apparatus
+                            ? prescription.dialyzer_perfusion_apparatus
+                            : ""
+                        }}
+                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
+                        {{
+                          prescription.dialysis_dialyszers
+                            ? prescription.dialysis_dialyszers
+                            : ""
+                        }}
+                      </div>
+                    </div>
                     <div
                       class="inline_block"
                       style="flex: 1"
@@ -1319,23 +1339,6 @@
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
 
-                        <td
-                          v-if="
-                            org_id != 9538 &&
-                            org_id != 10121 &&
-                            org_id != 9675 &&
-                            org_id != 0
-                          "
-                        >
-                          {{ monitor.conductivity ? monitor.conductivity : "" }}
-                        </td>
-                        <td v-if="org_id == 9538">
-                          {{
-                            monitor.sodium_concentration
-                              ? monitor.sodium_concentration
-                              : ""
-                          }}
-                        </td>
                         <td
                           v-if="
                             org_id == 10121 || org_id == 9675 || org_id == 0
@@ -1347,32 +1350,33 @@
                               : ""
                           }}
                         </td>
+
+
                         <td
                           v-if="
-                            (dialysisOrder &&
-                              monitor.operate_time > dialysisOrder.end_time) ||
-                            (dialysisOrder &&
-                              monitor.operate_time < dialysisOrder.start_time)
+                            org_id != 9538 &&
+                            org_id != 10121 &&
+                            org_id != 9675 &&
+                            org_id != 0
                           "
                         >
+                          {{ monitor.conductivity ? monitor.conductivity : "" }}
+                        </td>
+
+                        <td v-if="org_id == 9538">
                           {{
-                            monitor.ultrafiltration_volume
-                              ? monitor.ultrafiltration_volume
+                            monitor.sodium_concentration
+                              ? monitor.sodium_concentration
                               : ""
                           }}
                         </td>
+                        
                         <td
-                          v-if="
-                            dialysisOrder &&
-                            monitor.operate_time <= dialysisOrder.end_time &&
-                            dialysisOrder &&
-                            monitor.operate_time >= dialysisOrder.start_time
-                          "
                         >
                           {{
                             monitor.ultrafiltration_volume
                               ? monitor.ultrafiltration_volume
-                              : "0"
+                              : ""
                           }}
                         </td>
                         <!-- <td style="width:50px">

src/xt_pages/hospitalStation/components/callPrescription.vue

@@ -165,7 +165,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import { getDictionaryDataConfig} from "@/utils/data";
-
+  const moment = require('moment')
   import {
     getCallHisPrescription
   } from '@/api/his/his'
@@ -353,6 +353,7 @@
         this.srcPrescriptions = srcPrescriptions;
         this.start_time  = start_time;
         this.end_time = end_time;
+       
         this.patient_id = id;
         this.name = '处方调用' + '（'+name +'）';
         this.allPrescription = prescriptions;

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -237,6 +237,7 @@
           <span    :class="!is_medicine_status ? 'statusRed' : ''">{{is_medicine_status?'已发药':'未发药'}}</span>
 
           <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
+
         </div>
       </div>
       <div class='centerRight'>
@@ -1862,7 +1863,7 @@ export default {
         this.order_status = ''
       }
 
-     this.is_medicine_status = this.curPrescriptions.is_medicine_status
+      this.is_medicine_status = this.curPrescriptions.is_medicine_status
       if (this.curPrescriptions.order_status == 1) {
         this.order_status = '未收费'
       }
@@ -2190,7 +2191,7 @@ export default {
         }
         let params = {
           end_time: this.record_date,
-          start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+          start_time:  moment().add(-7, 'd').format("YYYY-MM-DD"),
           patient_id: this.patientInfo.id,
           p_type: 1
         }
@@ -3129,6 +3130,9 @@ export default {
 
           if (temp.length > 0) {
             for (let b = 0; b < temp.length; b++) {
+              if(temp[b].max_unit == temp[b].min_unit){
+                temp[b].retail_price = temp[b].min_price
+              }
               let temp_index = b + 1
               let obj = {
                 advice_id: 0,

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -58,13 +58,9 @@
       </div>
       <div style="display: flex; justify-content: space-between">
         <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-        <div
-          v-if="gend == 1"
-          style="position: absolute; top: 110px; left: 100px"
-        >
-          √
-        </div>
-        <div v-else style="position: absolute; top: 110px; left: 140px">√</div>
+        <div v-if="gend == 1" style="position: absolute; top: 110px; left: 100px">√</div>
+        <div v-else-if="gend == ''" style="position: absolute; top: 110px; left: 100px">√</div>
+         <div v-else style="position: absolute; top: 110px; left: 140px">√</div>
 
         <div style="position: absolute; top: 110px; left: 260px">
           {{ balance_accounts_type != 2 ? list.order.fund_pay_sumamt : "0.00" }}
@@ -234,7 +230,10 @@
                   .substring(0, 1) != '拾' &&
                 zhongwen
                   .substring(this.zhongwen.indexOf('元') - 1)
-                  .substring(0, 1) != '佰'
+                  .substring(0, 1) != '佰' &&
+                  zhongwen
+                  .substring(this.zhongwen.indexOf('元') - 1)
+                  .substring(0, 1) != '仟'
               "
             >
               {{

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -33,7 +33,8 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
+            <div v-if="paramsObj.gend == 1 || paramsObj.gend == ''" style="position: absolute;top:110px;left:100px;">√</div>
+            <div v-if="paramsObj.gend == ''" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
             <div style="position: absolute;top:110px;left:260px;">{{ list.number.length <= 13 ? (totalPrice - list.psn_cash_money).toFixed(2) : '0.00' }}</div>
             <div style="position: absolute;top:110px;left:420px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>

src/xt_pages/outpatientDoctorStation/batch_mode_template.vue

@@ -0,0 +1,326 @@
+<template>
+    <div class="main-contain">
+        <div class="app-container">
+          <div style="margin-bottom:10px">
+                透析模式:
+                <el-select v-model="value" placeholder="请选择">
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+                </el-select>
+               新增类型:
+                <el-select v-model="value" placeholder="请选择">
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+                </el-select>
+              是否选择所有患者:
+                <el-select v-model="value" placeholder="请选择">
+                <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+                </el-select>
+            </div>
+         <el-container>
+               
+               <div style="width:27%">
+               
+                  <el-row>
+                    <el-table
+                        ref="singleTable"
+                        :data="patientList"
+                        highlight-current-row
+                        border
+                        @current-change="handleCurrentChange"
+                        height="440"
+                        :row-style="{ color: '#303133' }"
+                        :header-cell-style="{
+                        backgroundColor: 'rgb(245, 247, 250)',
+                        color: '#606266'
+                        }"
+                    >
+                     <el-table-column align="center" type="selection" width="55">
+                       <template slot-scope="scope">
+                      
+                      </template>
+                     </el-table-column>
+                     <el-table-column prop="date" label="患者姓名" align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.name}}
+                      </template>
+                    </el-table-column>
+                   
+
+                     </el-table>
+                  </el-row>
+               </div>
+              <el-main>
+            <el-tabs v-model="editableTabsValue" type="border-card" editable @edit="handleTabsEdit">
+                <el-tab-pane
+                    :key="item.name"
+                    v-for="(item, index) in editableTabs"
+                    :label="item.title"
+                    :name="item.name"
+                >
+                    {{item.content}}
+                </el-tab-pane>
+            </el-tabs>
+             </el-main>
+                
+          </el-container>
+        </el-container>
+      </el-container>
+      </div>
+    </div>
+
+</template>
+<script>
+
+export default {
+  data(){
+    return{
+     patientList:[
+      {id:1,name:"张三"}
+     ],
+     tableList:[],
+     editableTabsValue: '2',
+     editableTabs: [{
+        title: 'Tab 1',
+        name: '1',
+        content: 'Tab 1 content'
+    }, {
+        title: 'Tab 2',
+        name: '2',
+        content: 'Tab 2 content'
+    }],
+    tabIndex: 2,
+     options: [{
+          value: '选项1',
+          label: '黄金糕'
+        }, {
+          value: '选项2',
+          label: '双皮奶'
+        }, {
+          value: '选项3',
+          label: '蚵仔煎'
+        }, {
+          value: '选项4',
+          label: '龙须面'
+        }, {
+          value: '选项5',
+          label: '北京烤鸭'
+        }],
+     value: ''
+    }
+  },
+  methods:{
+    handleTabsEdit(targetName, action) {
+        if (action === 'add') {
+          let newTabName = ++this.tabIndex + '';
+          this.editableTabs.push({
+            title: 'New Tab',
+            name: newTabName,
+            content: 'New Tab content'
+          });
+          this.editableTabsValue = newTabName;
+        }
+        if (action === 'remove') {
+          let tabs = this.editableTabs;
+          let activeName = this.editableTabsValue;
+          if (activeName === targetName) {
+            tabs.forEach((tab, index) => {
+              if (tab.name === targetName) {
+                let nextTab = tabs[index + 1] || tabs[index - 1];
+                if (nextTab) {
+                  activeName = nextTab.name;
+                }
+              }
+            });
+          }
+          
+          this.editableTabsValue = activeName;
+          this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+        }
+    },
+    handleCurrentChange(){
+
+    }
+  },
+  created(){
+
+  },
+  
+}
+</script>
+
+
+   
+<style lang="scss" scoped> 
+
+    .zone{
+      //  margin-left: 30px;
+      //  text-align: left;
+       width: 70px;
+       display: inline-block;
+       color:#606266;
+    }
+    .disinfect{
+      position: relative;
+      .newButton{
+        // position: absolute;
+        // right: 2%;
+        // top:4px;
+        // z-index: 9;
+        margin-bottom: 10px;
+    margin-left: 90%;
+      }
+    }
+    .disinfectOne{
+      position: relative;
+      .newButtonOne{
+        position: absolute;
+         right: 0;
+         top: -10;
+         z-index: 18;
+      }
+    }
+    .but{
+      width: 200px;
+      height: 50px;
+      // border: solid 1px red;
+      margin-left: 77%;
+    }
+    .clearn{
+      width: 460px;
+      height: 50px;
+      // border:solid 1px red;
+      margin-left:650px;
+    }
+
+  .zClass{
+    width: 200px;
+    height: 200px;
+    // border:solid 1px red;
+    margin-left: 450px;
+    margin-top: 200px;
+  }
+  .warn{
+    color: red;
+    font-size: 14px;
+    width: 100%;
+    display: inline-block;
+    margin-left: 96px;
+  }
+
+  .userbutton{
+       margin-bottom: 10px;
+    margin-left: 82%
+  }
+
+</style>
+<style lang="scss" >
+
+   .a{
+     margin-bottom: 10px;
+      margin-top: 6px;
+
+   }
+
+   .b{
+    .el-button{
+      margin-left: 90%;
+      margin-bottom: 10px;
+    }
+   }
+
+   .stoppage{
+     .el-form-item__label{
+       width:190px;
+     }
+   }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
+   .main{
+     position: relative;
+     .newButtonOne{
+       position:absolute;
+       right: 0;
+       z-index: 2;
+     }
+   }
+
+    .elbutton{
+      // border: solid 1px red;
+      height: 50px;
+      width: 400px;
+      margin-left: 650px;
+    }
+  // .el-form-item__label {
+  //   width: 130px;
+  //   font-size: 14px;
+  // }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
+
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
+.el-main{
+  padding-top: 0px;
+}
+.newMain{
+  .el-form-item__label{
+    width: 104px;
+  }
+}
+.newDisinfectOne{
+  .el-input--prefix .el-input__inner{
+    padding-left: 15px
+  }
+}
+.stoppage{
+  .el-form-item__label{
+    width: 18%;
+  }
+}
+.newItem{
+  .el-form-item__label{
+    width: 130px;
+  }
+}
+.formItem{
+  .el-form-item__label{
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname{
+  .el-form-item__label{
+    width: 60px;
+  }
+}
+::-webkit-scrollbar{
+  height: 20px;
+}
+
+</style>

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -165,7 +165,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import { getDictionaryDataConfig} from "@/utils/data";
-
+  const moment = require('moment')
   import {
     getCallHisPrescription
   } from '@/api/his/his'
@@ -192,7 +192,8 @@
           p_type:2,
         };
         this.GetCallHisPrescription(params)
-      },changeEndTime(){
+      },
+      changeEndTime(){
         let params={
           patient_id:this.patient_id,
           start_time: this.start_time,
@@ -203,6 +204,7 @@
         this.GetCallHisPrescription(params)
       },
       GetCallHisPrescription(params){
+        console.log("param222222222",params)
         getCallHisPrescription(params).then(response => {
           if (response.data.state == 1) {
             this.allPrescription = response.data.data.prescriptions;
@@ -371,10 +373,13 @@
           this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
           this.$emit('call', this.srcPrescriptions)
         }
-      },show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
+      },
+      show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
+
         this.srcPrescriptions = srcPrescriptions;
-        this.start_time  = start_time;
+        this.start_time  = start_time
         this.end_time = end_time;
+      
         this.patient_id = id;
         this.name = '处方调用' + '（'+name +'）';
         this.allPrescription = prescriptions;
@@ -382,6 +387,7 @@
           this.allPrescription[i].check_group = []
         }
         this.isLastOrNextVisible = true
+
       },close(){
         this.isLastOrNextVisible = false
       },hide(){

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1918,7 +1918,6 @@
           this.curPrescriptions = {}
         }
         this.is_medicine_status =  this.curPrescriptions.is_medicine_status
-
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -2184,7 +2183,7 @@
           }
           let params = {
             end_time: this.record_date,
-            start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+            start_time:  moment().add(-7, 'd').format("YYYY-MM-DD"),
             patient_id: this.patientInfo.id,
             p_type: 2
           }
@@ -2655,6 +2654,7 @@
       },
       addTab(targetName) {
 
+        console.log("this.prescriptions",this.prescriptions)
         for(let i = 0; i < this.prescriptions.length; i++){
           if (this.prescriptions[i].is_medicine_status) {
             this.$message.error('处方中包含已发药处方,无法新增')
@@ -2663,12 +2663,12 @@
         }
 
 
-        for(let i = 0; i < this.prescriptions.length; i++){
-          if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
-            this.$message.error('处方中包含已收费处方或者包含已经上传的处方,无法新增')
-            return
-          }
-        }
+        // for(let i = 0; i < this.prescriptions.length; i++){
+        //   if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
+        //     this.$message.error('处方中包含已收费处方或者包含已经上传的处方,无法新增')
+        //     return
+        //   }
+        // }
 
 
 
@@ -2752,6 +2752,7 @@
           type: 'warning'
         }).then(() => {
           let id = 0
+          console.log("this.prescriptions???",this.prescriptions)
           for (let i = 0; i < this.prescriptions.length; i++) {
             if (this.prescriptions[i].name == targetName) {
               id = this.prescriptions[i].id
@@ -2786,10 +2787,12 @@
                 }
               }
             }
-            console.log("oo233232233232323",this.prescriptions)
+            console.log("oo233ooooosdada",this.prescriptions)
             if (this.prescriptions.length == 0) {
+              console.log("this.curPrescrip的tions前",this.curPrescriptions)
               this.curPrescriptions = []
               this.curStatus = 0
+              console.log("this.curPrescrip的tions后",this.curPrescriptions)
             }
             this.$parent.getInitDataOne(this.prescriptions)
           } else {
@@ -3086,7 +3089,7 @@
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-
+           console.log("我的23323232232323232323哈哈哈哈哈哈",temp)
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {
@@ -3122,6 +3125,9 @@
 
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
+                if(temp[b].max_unit == temp[b].min_unit){
+                  temp[b].retail_price = temp[b].min_price
+                }
                 let temp_index = b + 1
                 let obj = {
                   advice_id: 0,

src/xt_pages/outpatientDoctorStation/modeTemplate.vue

@@ -2,8 +2,10 @@
     <div class="main-contain new-main-contain">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
-            <el-button type="primary" @click="add">新增</el-button>
-
+            <div style="float:right">
+              <el-button type="primary" @click="add">新增</el-button>
+              <!-- <el-button type="primary" @click="batchAdd">批量新增</el-button> -->
+            </div>
         </div>
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
             <div class="mainLeft">
@@ -150,6 +152,9 @@
        jumpDetail(row) {
         this.$router.push('/hisTool/modeTemplateDetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name +"&modes="+this.mode_str)
       },
+      batchAdd(){
+        this.$router.push("/hisTool/batchTemplate")
+      }
     },
     created() {
       this.tablelist =  Object.values(this.$store.getters.treatment_mode)

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -14,7 +14,7 @@
                         <el-form-item label="模版名称:" prop="name" label-position="right">
                             <el-input v-model="tempForm.name" placeholder=""></el-input>
                         </el-form-item>
-
+<!--                      <el-button  @click="lili">调试</el-button>-->
                         <el-form-item label="透析模式: " prop="mode_id" label-position="right">
                             <el-select v-model="tempForm.mode_id" style="width:100%;" placeholder="请选择"
                                        :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id == 0"
@@ -397,6 +397,9 @@
       }
     },
     methods: {
+      lili(){
+        console.log("this.$store.getters.treatment_mode",this.$store.getters.treatment_mode)
+      },
       save() {
         if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
           this.$message.error('请先开处方')

src/xt_pages/stock/detail/print.vue

@@ -54,7 +54,7 @@
                   <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>

src/xt_pages/stock/drugs/components/drugPatientQuery.vue

@@ -0,0 +1,440 @@
+<template>
+    <div class="main-contain">
+        <div class="app-container">
+         <el-container>
+               <div style="width:27%">
+                <el-row>
+                   时间:
+                    <el-date-picker
+                      size="small"
+                      v-model="start_time"
+                      prefix-icon="el-icon-date"
+                      :editable="false"
+                      style="width:160px;"
+                      type="date"
+                      placeholder="选择日期时间"
+                      align="right"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      @change="startTimeChange"
+                    ></el-date-picker> 
+                      <span>-</span> 
+                      <el-date-picker
+                        size="small"
+                        v-model="end_time"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width:160px;"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        @change="endTimeChange"
+                    ></el-date-picker>
+                </el-row>
+                <el-row></el-row>
+                 <el-row>
+                   <el-col :span="24">
+                      <el-input style="width:200px;margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;<el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   </el-col>
+                  </el-row>
+
+                  <el-row>
+                      <el-table
+                          ref="singleTable"
+                          :data="patientList"
+                          highlight-current-row
+                           border
+                          @current-change="handleCurrentChange"
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="序号"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="姓名"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.name}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                  </el-row>
+               </div>
+
+                 <el-main>
+                  <div class="main newMain">
+                      
+                        
+                  <el-tabs>
+
+                   <el-tab-pane label="患者使用列表">
+                   
+                     <el-table
+                          :data="tableList"
+                          highlight-current-row
+                           border
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="名称"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.row.drug.drug_name}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="生产厂家"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{getManufacturName(scope.row.manufacturer)}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="规格&单位"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.drug.dose}}{{scope.row.drug.dose_unit}} * {{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="数量"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.count}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                      <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :page-sizes="[10, 50, 100,200,500,1000]"
+                        :page-size="10"
+                        background
+                        align="right"
+                        style="margin-top:20px;"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="total"
+                        >
+                      </el-pagination>
+                    </el-tab-pane>
+                   </el-tabs>
+                </div>
+             </el-main>
+          </el-container>
+        </el-container>
+      </el-container>
+      </div>
+    </div>
+
+</template>
+<script>
+import { getGoodPatientList,getDrugWarehouseOutDetailByPatientId } from "@/api/drug/drug"
+export default {
+  data(){
+    return{
+      zoneList:[],
+      zone_id:0,
+      tableData:[],
+      DeviceTypeType:[],
+      device_type:"",
+      forms:{},
+      start_time:"",
+      end_time:"",
+      patientList:[],
+      tableList:[],
+      keyword:"",
+      manufacturerList:[],
+      patient_id:0,
+      patient:{},
+      limit:10,
+      page:1,
+      total:0,
+    }
+  },
+  methods:{
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getDrugWarehouseOutDetailByPatientId()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getDrugWarehouseOutDetailByPatientId()
+    },
+    startTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    endTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    getlist(){
+        var params = {
+          keyword:this.keyword,
+        }
+      getGoodPatientList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.patientList = list
+          this.$refs.singleTable.setCurrentRow(this.patientList[0]);
+          this.handleCurrentChange(this.patientList[0])
+        }
+      })
+    },
+   onSearch(){
+     this.getlist()
+   },
+   handleCurrentChange(val){
+       this.patient = val
+       var params = {
+         patient_id:val.id,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page,
+       }
+     getDrugWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.tableList = list
+          this.total = response.data.data.total
+        }
+     })
+   },
+   getDrugWarehouseOutDetailByPatientId(){
+      var params = {
+         patient_id:this.patient,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page,
+       }
+     getDrugWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.tableList = list
+        }
+     })
+   },
+   getManufacturName(id){
+     var manufacturer_name = ""
+     for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+          manufacturer_name = this.manufacturerList[i].manufacturer_name
+        } 
+     }
+     return manufacturer_name
+   }
+  },
+  created(){
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+     this.getlist()
+  },
+  
+}
+</script>
+
+
+   
+<style lang="scss" scoped>
+    .zone{
+      //  margin-left: 30px;
+      //  text-align: left;
+       width: 70px;
+       display: inline-block;
+       color:#606266;
+    }
+    .disinfect{
+      position: relative;
+      .newButton{
+        // position: absolute;
+        // right: 2%;
+        // top:4px;
+        // z-index: 9;
+        margin-bottom: 10px;
+    margin-left: 90%;
+      }
+    }
+    .disinfectOne{
+      position: relative;
+      .newButtonOne{
+        position: absolute;
+         right: 0;
+         top: -10;
+         z-index: 18;
+      }
+    }
+    .but{
+      width: 200px;
+      height: 50px;
+      // border: solid 1px red;
+      margin-left: 77%;
+    }
+    .clearn{
+      width: 460px;
+      height: 50px;
+      // border:solid 1px red;
+      margin-left:650px;
+    }
+
+  .zClass{
+    width: 200px;
+    height: 200px;
+    // border:solid 1px red;
+    margin-left: 450px;
+    margin-top: 200px;
+  }
+  .warn{
+    color: red;
+    font-size: 14px;
+    width: 100%;
+    display: inline-block;
+    margin-left: 96px;
+  }
+
+  .userbutton{
+       margin-bottom: 10px;
+    margin-left: 82%
+  }
+
+</style>
+<style lang="scss">
+   .a{
+     margin-bottom: 10px;
+      margin-top: 6px;
+
+   }
+
+   .b{
+    .el-button{
+      margin-left: 90%;
+      margin-bottom: 10px;
+    }
+   }
+
+   .stoppage{
+     .el-form-item__label{
+       width:190px;
+     }
+   }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
+   .main{
+     position: relative;
+     .newButtonOne{
+       position:absolute;
+       right: 0;
+       z-index: 2;
+     }
+   }
+
+    .elbutton{
+      // border: solid 1px red;
+      height: 50px;
+      width: 400px;
+      margin-left: 650px;
+    }
+  // .el-form-item__label {
+  //   width: 130px;
+  //   font-size: 14px;
+  // }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
+
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
+.el-main{
+  padding-top: 0px;
+}
+.newMain{
+  .el-form-item__label{
+    width: 104px;
+  }
+}
+.newDisinfectOne{
+  .el-input--prefix .el-input__inner{
+    padding-left: 15px
+  }
+}
+.stoppage{
+  .el-form-item__label{
+    width: 18%;
+  }
+}
+.newItem{
+  .el-form-item__label{
+    width: 130px;
+  }
+}
+.formItem{
+  .el-form-item__label{
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname{
+  .el-form-item__label{
+    width: 60px;
+  }
+}
+::-webkit-scrollbar{
+  height: 20px;
+}
+</style>

src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue

@@ -0,0 +1,532 @@
+<template>
+  <div class="main-contain">
+     <div class="app-container ">
+        <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+         <div>
+          <span>有效期:</span>
+          <el-select v-model="expiry_type" style="width:200px;margin-right:10px;" placeholder="请选择"
+            filterable
+            @change="changeExpriyList">
+              <el-option
+                v-for="item in expriyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+          </el-select>
+          <span>仓库名称:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称或生产厂商" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
+         </div>
+        </div>
+           <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+          >
+            <el-table-column label="药品类型" align="center">
+              <template slot-scope="scope">
+                 {{getDrugTypeName(scope.row.XtBaseDrug.drug_type)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="药品名称" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.XtBaseDrug.drug_name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.XtBaseDrug.dose}}{{scope.row.XtBaseDrug.dose_unit}}*{{scope.row.XtBaseDrug.min_number}}{{scope.row.XtBaseDrug.min_unit}}/{{scope.row.XtBaseDrug.max_unit}}
+                </template>
+            </el-table-column>
+            <el-table-column label="生产厂商" align="center">
+              <template slot-scope="scope">
+                 {{getManufacturName(scope.row.manufacturer)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="进货价" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.price}}
+              </template>
+            </el-table-column>
+            <el-table-column label="库存" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.stock_max_number}}{{scope.row.XtBaseDrug.max_unit}}{{scope.row.stock_min_number}}{{scope.row.XtBaseDrug.min_unit}}
+              </template>
+            </el-table-column>
+        
+            <el-table-column label="批号" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.batch_number}}
+               </template>
+            </el-table-column>
+          
+            <el-table-column label="有效期" align="center">
+              <template slot-scope="scope">
+                {{getTime(scope.row.expiry_date)}}
+             </template>
+            </el-table-column>
+
+            <el-table-column label="剩余天数" align="center">
+              <template slot-scope="scope">
+                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+              </template>
+            </el-table-column>
+          </el-table>
+           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+            </el-pagination>
+     </div>
+
+
+
+   
+
+  </div>
+</template>
+<script>
+import { getStorehouseList,getDrugExpiryDateQuery } from "@/api/drug/drug"
+import {
+  getStockDrugCount
+} from "@/api/stock";
+import { uParseTime } from '@/utils/tools'
+import moment from 'moment';
+export default {
+
+  data(){
+    return{
+     tableList:[],
+     goodList:[
+      {id:1,name:"全部耗材"},
+      {id:2,name:"库存预警"},
+     ],
+     houseList:[],
+     storehouse_id:0,
+     good_type:1,
+     multipleSelection: [],
+     signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+     manufacturerList:[],
+     limit:10,
+     page:1,
+     total:0,
+     limitone:10,
+     pageone:1,
+     totalone:0,
+     keyword:"",
+     goodTypeList:[],
+     start_time:"",
+     end_time:"",
+     countList:[],
+     outCountList:[],
+     autoCountList:[],
+     cancelCountList:[],
+     org_id:this.$store.getters.xt_user.org_id,
+     dialogVisible:false,
+     start_first_time:"",
+     end_first_time:"",
+     tableData:[],
+     good_id:0,
+     patientList:[],
+     good_name:"",
+     specification_name:"",
+     expiry_type:0,
+     expriyList:[
+      {id:0,name:"全部"},
+      {id:1,name:"已过期"},
+      {id:2,name:"30天内过期"},
+      {id:3,name:"90天内过期"},
+      {id:4,name:"180天内过期"},
+      {id:5,name:"1年内过期"},
+     ],
+     nowtime:0,
+     start_time:"",
+     drugTypeList:[],
+    }
+  
+  },
+  methods:{
+    changeStorehouseName(){
+      this.getlist()
+    },
+    changeGoodName(){
+
+    },
+    getStorehouseList(){
+      getStorehouseList().then(response=>{
+         if(response.data.state == 1){
+           var houseList = response.data.data.list
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList.push(obj)
+           for(let i=0;i<houseList.length;i++){
+             this.houseList.push(houseList[i])
+           }
+           this.manufacturerList = response.data.data.manufacturerList
+           this.goodTypeList = response.data.data.goodTypeList
+           this.patientList = response.data.data.patientList
+         }
+      })
+    },
+    getlist(){
+        var params = {
+          storehouse_id:this.storehouse_id,
+          expiry_type:this.expiry_type,
+          keyword:this.keyword,
+          page:this.page,
+          limit:this.limit,
+          start_time:this.start_time,
+        }
+      getDrugExpiryDateQuery(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            this.tableList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            this.total = response.data.data.total
+            this.nowtime = response.data.data.nowtime
+            this.drugTypeList =  response.data.data.drugTypeList
+         }
+      })
+    },
+    getManufacturName(id){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+        }
+      }
+      return manufacturer_name
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    handleSizeChangeOne(val) {
+      this.limitone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+    handleCurrentChangeOne(val) {
+      this.pageone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+   seach(){
+    this.getlist()
+   },
+   getDrugTypeName(id){
+     var name = ""
+     for(let i=0;i<this.drugTypeList.length;i++){
+       if(id == this.drugTypeList[i].value){
+         name = this.drugTypeList[i].name
+       }
+     }
+     return name
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.houseList.length;i++){
+       if(id == this.houseList[i].id){
+         storehouse_name = this.houseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+    getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCountInfo(cancel_stock_info,storehouse_id){
+     var count = 0 
+     if(cancel_stock_info.length >0){
+        for(let i=0;i<cancel_stock_info.length;i++){
+          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+              count += cancel_stock_info[i].count
+          }
+        }
+     }
+     return count
+   },
+   getWareOutInfoCount(warehouse_out_info,storehouse_id){
+     var count = 0
+     if(warehouse_out_info.length > 0){
+       for(let i=0;i<warehouse_out_info.length;i++){
+         if(storehouse_id == warehouse_out_info[i].storehouse_id){
+            count +=warehouse_out_info[i].count
+         }
+       }
+     }
+     return count
+   },
+   getInCount(id){
+      var count= 0
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   startFirstTimeChange(){
+    
+   },
+   endEndTimeChange(){
+
+   },
+  getTime(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d}')
+   }
+   },
+  getName(id){
+    var name = ""
+    for(let i=0;i<this.patientList.length;i++){
+      if(id == this.patientList[i].id){
+        name = this.patientList[i].name
+      }
+    }
+    return name
+  },
+  getDaysBetween(dateString1, dateString2) {
+    let startDate = Date.parse(dateString1);
+    let endDate = Date.parse(dateString2);
+    return (startDate - endDate ) / (1 * 24 * 60 * 60 * 1000);
+  },
+  changeExpriyList(val){
+   
+    if(val ==0){
+     this.start_time = ""
+     this.getlist()
+    }
+    //已过期
+    if(val == 1){
+      this.getlist()
+    }
+    //30天内过期
+    if(val == 2){
+      var time = this.addDate(this.getTime(this.nowtime),30)
+      this.start_time = time
+      this.getlist()
+    }
+    //90天内过期
+    if(val == 3){
+       var time = this.addDate(this.getTime(this.nowtime),90)
+      this.start_time = time
+      this.getlist()
+    }
+    //180天内过期
+    if(val == 4){
+       var time = this.addDate(this.getTime(this.nowtime),180)
+       this.start_time = time
+    }
+    //1年以后
+    if(val == 5){
+       var time = this.addDate(this.getTime(this.nowtime),365)
+       this.start_time = time
+       this.getlist()
+    }
+  
+  },
+  addDate(date, days) {
+    var date = new Date(date);
+    date.setDate(date.getDate() + days);
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var mm = "'" + month + "'";
+    var dd = "'" + day + "'";
+    if(mm.length == 3) {
+      month = "0" + month;
+    }
+    if(dd.length == 3) {
+      day = "0" + day;
+    }
+    var time = year + "-" + month + "-" + day
+    return time;
+  },
+  },
+  created(){
+    this.getStorehouseList()
+    this.getlist()
+  }
+}
+</script>
+

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -163,8 +163,9 @@
                   <span v-if="scope.row.type == 1">到期退货</span>
                   <span v-if="scope.row.type == 2">异常退货</span>
                   <span v-if="scope.row.type == 3">退货</span>
-                  <span v-if="scope.row.type == 4">人为损坏</span>
+                  <span v-if="scope.row.type == 4">损坏</span>
                   <span v-if="scope.row.type == 5">不计入报损分析</span>
+                  <span v-if="scope.row.type == 7">有效期到期</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -261,8 +262,9 @@ export default {
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
-              {id:4,name:"人为损坏"},
+              {id:4,name:"损坏"},
               {id:5,name:"不计入报损分析"},
+              {id:7,name:"有效期到期"}
             ],
             goodList:[],
             drug_name:"",

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+     
+    </div>
+     <div class="app-container ">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="库存查询" name="first">
+              <DrugQuery></DrugQuery>
+            </el-tab-pane>
+            <el-tab-pane label="进销存查询" name="second">
+               <PurchaseDrugQuery></PurchaseDrugQuery>
+           </el-tab-pane>
+            <el-tab-pane label="有效期查询" name="third">
+                <ExpiryDateDrugQuery></ExpiryDateDrugQuery>
+            </el-tab-pane>
+            <el-tab-pane label="患者查询" name="fourth">
+                <DrugPatientQuery></DrugPatientQuery>
+            </el-tab-pane>
+        </el-tabs>
+     </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import DrugQuery from "@/xt_pages/stock/drugs/components/drugQuery"
+import ExpiryDateDrugQuery from "@/xt_pages/stock/drugs/components/expiryDateDrugQuery"
+import PurchaseDrugQuery from "@/xt_pages/stock/drugs/components/purchaseDrugQuery"
+import DrugPatientQuery from "@/xt_pages/stock/drugs/components/drugPatientQuery"
+export default {
+  name: "stockNewQuery",
+  
+  components: {
+    BreadCrumb,
+    DrugQuery,
+    ExpiryDateDrugQuery,
+    PurchaseDrugQuery,
+    DrugPatientQuery
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/query", name: "库存查询" }
+      ],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      activeName: 'first'
+    };
+  },
+  methods:{
+    handleClick(){
+        
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+/* 合并表格线样式 */
+
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+  /* height: 44px; */
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+  min-height: 44px;
+}
+.spanClass .cell tr:last-of-type td{
+  border-bottom: none;
+}
+
+</style>

src/xt_pages/stock/drugs/inventory.vue

@@ -214,8 +214,9 @@ export default {
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
-              {id:4,name:"人为损坏"},
+              {id:4,name:"损坏"},
               {id:5,name:"不计入报损分析"},
+              {id:7,name:"有效期到期"},
             ],
             activeNames: [0,1,2,3,4,5,6,7,8,9,10],
             showTable:false,

src/xt_pages/stock/drugs/query.vue

@@ -1262,7 +1262,7 @@ export default {
       var min_str = "";
       var total = 0;
       var newarr = arr;
-      console.log("这是什sfsdfsf么！！！！！",storehouse_id)
+      
       if (newarr.length > 0) {
         for (let i = 0; i < newarr.length; i++) {
           if (newarr[i].storehouse_id == storehouse_id) {
@@ -1285,7 +1285,7 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
-      console.log("这是什么！！！！！",max_str + min_str)
+      
       return max_str + min_str;
     },
     getOutFlushNight(

src/xt_pages/stock/inventory.vue

@@ -210,8 +210,9 @@ export default {
           {id:1,name:"到期退货"},
           {id:2,name:"异常退货"},
           {id:3,name:"退货"},
-          {id:4,name:"人为损坏"},
+          {id:4,name:"损坏"},
           {id:5,name:"不计入报损分析"},
+          {id:7,name:"有效期到期"},
          ],
          activeNames: [0,1,2,3,4,5,6,7,8,9,10],
          showTable:false,

src/xt_pages/stock/inventoryDetails.vue

@@ -83,8 +83,9 @@
                 <span v-if="scope.row.inventory_type ==1">到期退货</span>
                 <span v-if="scope.row.inventory_type ==2">异常退货</span>
                 <span v-if="scope.row.inventory_type ==3">退货</span>
-                <span v-if="scope.row.inventory_type ==4">人为损坏</span>
+                <span v-if="scope.row.inventory_type ==4">损坏</span>
                 <span v-if="scope.row.inventory_type ==5">不计入报损分析</span>
+                <span v-if="scope.row.inventory_type ==7">有效期到期</span>
                </template>
             </el-table-column>
           

src/xt_pages/stock/query/expiryDateQuery.vue

@@ -1,7 +1,553 @@
 <template>
   <div class="main-contain">
      <div class="app-container ">
-       有效期 库存查询喔喔喔
+        <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+         <div>
+          <span>有效期:</span>
+          <el-select v-model="expiry_type" style="width:200px;margin-right:10px;" placeholder="请选择"
+            filterable
+            @change="changeExpriyList">
+              <el-option
+                v-for="item in expriyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+          </el-select>
+          <span>仓库名称:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
+         </div>
+        </div>
+           <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+          >
+            <el-table-column label="耗材类型" align="center">
+              <template slot-scope="scope">
+                 {{getGoodTypeName(scope.row.GoodInfo.good_type_id)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="耗材名称" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.GoodInfo.good_name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.GoodInfo.specification_name}}
+                </template>
+            </el-table-column>
+            <el-table-column label="生产厂商" align="center">
+              <template slot-scope="scope">
+                 {{getManufacturName(scope.row.manufacturer)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="进货价" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.price}}
+              </template>
+            </el-table-column>
+            <el-table-column label="库存" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.stock_count}}
+              </template>
+            </el-table-column>
+        
+            <el-table-column label="批号" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.number}}
+               </template>
+            </el-table-column>
+          
+            <el-table-column label="有效期" align="center">
+              <template slot-scope="scope">
+                {{getTime(scope.row.expiry_date)}}
+             </template>
+            </el-table-column>
+
+            <el-table-column label="剩余天数" align="center">
+              <template slot-scope="scope">
+                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+              </template>
+            </el-table-column>
+          </el-table>
+           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+            </el-pagination>
      </div>
+
+
+
+   
+
   </div>
-</template>
+</template>
+<script>
+import { getStorehouseList,getGoodExpiryDateQuery,getGoodWarehouseOutInfoById } from "@/api/drug/drug"
+import {
+  getStockDrugCount
+} from "@/api/stock";
+import { uParseTime } from '@/utils/tools'
+import moment from 'moment';
+export default {
+
+  data(){
+    return{
+     tableList:[],
+     goodList:[
+      {id:1,name:"全部耗材"},
+      {id:2,name:"库存预警"},
+     ],
+     houseList:[],
+     storehouse_id:0,
+     good_type:1,
+     multipleSelection: [],
+     signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+     manufacturerList:[],
+     limit:10,
+     page:1,
+     total:0,
+     limitone:10,
+     pageone:1,
+     totalone:0,
+     keyword:"",
+     goodTypeList:[],
+     start_time:"",
+     end_time:"",
+     countList:[],
+     outCountList:[],
+     autoCountList:[],
+     cancelCountList:[],
+     org_id:this.$store.getters.xt_user.org_id,
+     dialogVisible:false,
+     start_first_time:"",
+     end_first_time:"",
+     tableData:[],
+     good_id:0,
+     patientList:[],
+     good_name:"",
+     specification_name:"",
+     expiry_type:0,
+     expriyList:[
+      {id:0,name:"全部"},
+      {id:1,name:"已过期"},
+      {id:2,name:"30天内过期"},
+      {id:3,name:"90天内过期"},
+      {id:4,name:"180天内过期"},
+      {id:5,name:"1年内过期"},
+     ],
+     nowtime:0,
+     start_time:"",
+    }
+  
+  },
+  methods:{
+    changeStorehouseName(){
+      this.getlist()
+    },
+    changeGoodName(){
+
+    },
+    getStorehouseList(){
+      getStorehouseList().then(response=>{
+         if(response.data.state == 1){
+           var houseList = response.data.data.list
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList.push(obj)
+           for(let i=0;i<houseList.length;i++){
+             this.houseList.push(houseList[i])
+           }
+           this.manufacturerList = response.data.data.manufacturerList
+           this.goodTypeList = response.data.data.goodTypeList
+           this.patientList = response.data.data.patientList
+         }
+      })
+    },
+    getlist(){
+        var params = {
+          storehouse_id:this.storehouse_id,
+          expiry_type:this.expiry_type,
+          keyword:this.keyword,
+          page:this.page,
+          limit:this.limit,
+          start_time:this.start_time,
+        }
+      getGoodExpiryDateQuery(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            this.tableList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            this.total = response.data.data.total
+            this.nowtime = response.data.data.nowtime
+         }
+      })
+    },
+    getManufacturName(id){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+        }
+      }
+      return manufacturer_name
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    handleSizeChangeOne(val) {
+      this.limitone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+    handleCurrentChangeOne(val) {
+      this.pageone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+   seach(){
+    this.getlist()
+   },
+   getGoodTypeName(id){
+     var type_name = ""
+     for(let i=0;i<this.goodTypeList.length;i++){
+       if(id == this.goodTypeList[i].id){
+         type_name = this.goodTypeList[i].type_name
+       }
+     }
+     return type_name
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.houseList.length;i++){
+       if(id == this.houseList[i].id){
+         storehouse_name = this.houseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+    getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCountInfo(cancel_stock_info,storehouse_id){
+     var count = 0 
+     if(cancel_stock_info.length >0){
+        for(let i=0;i<cancel_stock_info.length;i++){
+          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+              count += cancel_stock_info[i].count
+          }
+        }
+     }
+     return count
+   },
+   getWareOutInfoCount(warehouse_out_info,storehouse_id){
+     var count = 0
+     if(warehouse_out_info.length > 0){
+       for(let i=0;i<warehouse_out_info.length;i++){
+         if(storehouse_id == warehouse_out_info[i].storehouse_id){
+            count +=warehouse_out_info[i].count
+         }
+       }
+     }
+     return count
+   },
+   getInCount(id){
+      var count= 0
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   toDialogClick(id,good_name,specification_name){
+    this.good_id = id
+    this.good_name = good_name
+    this.specification_name = specification_name
+     var params = {
+       good_id:id,
+       limit:this.limitone,
+       page:this.pageone,
+       start_first_time:this.start_first_time,
+       end_first_time:this.end_first_time,
+     }
+     getGoodWarehouseOutInfoById(params).then(response=>{
+       if(response.data.state == 1){
+         var list = response.data.data.list
+         console.log("list23233233232w",list)
+         this.tableList = list
+         this.tableData = list
+         this.totalone = response.data.data.total
+         this.dialogVisible = true
+       }
+     })
+   
+   },
+   startFirstTimeChange(){
+    
+   },
+   endEndTimeChange(){
+
+   },
+  getTime(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d}')
+   }
+   },
+  getName(id){
+    var name = ""
+    for(let i=0;i<this.patientList.length;i++){
+      if(id == this.patientList[i].id){
+        name = this.patientList[i].name
+      }
+    }
+    return name
+  },
+  getDaysBetween(dateString1, dateString2) {
+    let startDate = Date.parse(dateString1);
+    let endDate = Date.parse(dateString2);
+    return (startDate - endDate ) / (1 * 24 * 60 * 60 * 1000);
+  },
+  changeExpriyList(val){
+   
+    if(val ==0){
+     this.start_time = ""
+     this.getlist()
+    }
+    //已过期
+    if(val == 1){
+      this.getlist()
+    }
+    //30天内过期
+    if(val == 2){
+      var time = this.addDate(this.getTime(this.nowtime),30)
+      this.start_time = time
+      this.getlist()
+    }
+    //90天内过期
+    if(val == 3){
+       var time = this.addDate(this.getTime(this.nowtime),90)
+      this.start_time = time
+      this.getlist()
+    }
+    //180天内过期
+    if(val == 4){
+       var time = this.addDate(this.getTime(this.nowtime),180)
+       this.start_time = time
+    }
+    //1年以后
+    if(val == 5){
+       var time = this.addDate(this.getTime(this.nowtime),365)
+       this.start_time = time
+       this.getlist()
+    }
+  
+  },
+  addDate(date, days) {
+    var date = new Date(date);
+    date.setDate(date.getDate() + days);
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var mm = "'" + month + "'";
+    var dd = "'" + day + "'";
+    if(mm.length == 3) {
+      month = "0" + month;
+    }
+    if(dd.length == 3) {
+      day = "0" + day;
+    }
+    var time = year + "-" + month + "-" + day
+    return time;
+  },
+  },
+  created(){
+    this.getStorehouseList()
+    this.getlist()
+  }
+}
+</script>
+

src/xt_pages/stock/query/goodNewQuery.vue

@@ -15,16 +15,18 @@
             </el-option>
           </el-select>
           <span>库存预警:</span>
-          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择"
+          <el-select v-model="good_type" style="width:250px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodName">
             <el-option
               v-for="item in goodList"
               :key="item.id"
-              :label="item.good_name"
+              :label="item.name"
               :value="item.id">
             </el-option>
           </el-select>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
         </div>
 
@@ -40,73 +42,123 @@
           >
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
-                
-            </template>
+                {{getGoodTypeName(scope.row.good_type_id)}}
+              </template>
             </el-table-column>
             <el-table-column label="耗材名称" align="center">
               <template slot-scope="scope">
-               
+                 {{scope.row.good_name}}
               </template>
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                  
+                  {{scope.row.specification_name}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
-                <template slot-scope="scope">
-                 
-                </template>
+              <template slot-scope="scope">
+                  {{getManufacturName(scope.row.manufacturer)}}
+              </template>
             </el-table-column>
             <el-table-column label="国家编码" align="center">
               <template slot-scope="scope">
-               
+                {{scope.row.social_security_directory_code}}
               </template>
             </el-table-column>
             <el-table-column label="仓库名称" align="center">
               <template slot-scope="scope">
-             
+                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center" >
+                    {{getHouseName(item.storehouse_id)}}
+                  </td>
+                </tr>
               </template>
             </el-table-column>
         
-    
             <el-table-column label="入库量" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                  {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
+                  </td>
+                </tr>
+               </template>
             </el-table-column>
-
+          
             <el-table-column label="出库量" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+                <span v-if="org_id!=3907 && org_id!=9583">
+                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_out_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                      <span style="color:#0099FF" @click="toDialogClick(scope.row.id,scope.row.good_name,scope.row.specification_name)"> {{getWareOutInfoCount(scope.row.warehouse_out_info,item.storehouse_id)}}</span>&nbsp;
+                    </td>
+                  </tr>
+              </span>
+             </template>
             </el-table-column>
 
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
-                
+                  <tr style="background: none" v-for="(item,index) in scope.row.cancel_stock_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{getCancelCountInfo(scope.row.cancel_stock_info,item.storehouse_id)}}&nbsp; 
+                    </td>
+                  </tr>
+
               </template>
             </el-table-column>
 
              <el-table-column label="实际出库" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+                <span v-if="org_id!=3907 && org_id!=9583">
+                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
+                    </td>
+                  </tr>
+               </span>
+             </template>
             </el-table-column>
 
             <el-table-column label="剩余库存" align="center">
               <template slot-scope="scope">
-                
+                <span v-if="org_id == 3907 || org_id == 9583">
+                  {{
+                    getWareInfo(scope.row.xt_warehouse_info) -
+                    getAutoCount(scope.row.id) -
+                    getOutCount(scope.row.id) +
+                    getCancelCount(scope.row.id)
+                    }}
+                </span>
+                <span v-if="org_id!=3907 && org_id!=9583">
+                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;
+                    </td>
+                  </tr>
+                </span>
               </template>
             </el-table-column>
 
             <el-table-column label="总库存量" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <span v-if="org_id == 3907 || org_id == 9583">
+                    {{
+                    getWareInfo(scope.row.xt_warehouse_info) -
+                    getAutoCount(scope.row.id) -
+                    getOutCount(scope.row.id) +
+                    getCancelCount(scope.row.id)
+                    }}
+                </span>
+                <span v-if="org_id != 3907 && org_id != 9583">
+                    {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+                </span>
+               </template>
             </el-table-column>
            
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="200px">
              
               <template slot-scope="scope">
                 <el-button
@@ -123,25 +175,165 @@
                 </el-button>
                </template>
             </el-table-column>
-
           </el-table>
+           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+            </el-pagination>
      </div>
 
+
+
+    <el-dialog
+      title="出库详情"
+      :visible.sync="dialogVisible"
+      width="70%">
+      <span>
+        耗材名称:{{good_name}}
+        规格&单位:{{specification_name}}
+        查询日期:
+          <el-date-picker
+            size="small"
+            v-model="start_first_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startFirstTimeChange"
+           ></el-date-picker> 
+            <span>-</span> 
+            <el-date-picker
+              size="small"
+              v-model="end_first_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 150px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endEndTimeChange"
+          ></el-date-picker>
+      </span>
+      <el-divider></el-divider>
+       <el-table
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+          :data="tableData"
+          :class="signAndWeighBoxPatients"
+          border
+          >
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehouse_out_order_number}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.ctime)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="出库数量" align="center">
+              <template slot-scope="scope">
+                {{scope.row.count}}
+              </template>
+          </el-table-column>
+          <el-table-column label="库存数量" align="center">
+            <template slot-scope="scope">
+               
+            </template>
+          </el-table-column>
+          <el-table-column label="使用人" align="center">
+            <template slot-scope="scope">
+              {{getName(scope.row.patient_id)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{scope.row.remark}}
+            </template>
+          </el-table-column>
+       </el-table>
+       <el-pagination
+            @size-change="handleSizeChangeOne"
+            @current-change="handleCurrentChangeOne"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totalone"
+          >
+            </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 <script>
+import { getStorehouseList,getGoodNewQuery,getGoodWarehouseOutInfoById } from "@/api/drug/drug"
+import {
+  getStockDrugCount
+} from "@/api/stock";
+import { uParseTime } from '@/utils/tools'
 export default {
 
   data(){
     return{
      tableList:[],
-     goodList:[],
+     goodList:[
+      {id:1,name:"全部耗材"},
+      {id:2,name:"库存预警"},
+     ],
      houseList:[],
      storehouse_id:0,
-     good_id:0,
+     good_type:1,
      multipleSelection: [],
      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
      manufacturerList:[],
+     limit:10,
+     page:1,
+     total:0,
+     limitone:10,
+     pageone:1,
+     totalone:0,
+     keyword:"",
+     goodTypeList:[],
+     start_time:"",
+     end_time:"",
+     countList:[],
+     outCountList:[],
+     autoCountList:[],
+     cancelCountList:[],
+     org_id:this.$store.getters.xt_user.org_id,
+     dialogVisible:false,
+     start_first_time:"",
+     end_first_time:"",
+     tableData:[],
+     good_id:0,
+     patientList:[],
+     good_name:"",
+     specification_name:""
     }
   
   },
@@ -167,7 +359,9 @@ export default {
       this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     toClickOne(val){
+    
       var manufacturer_name = ""
+      var specification_name = ""
       for(let i=0;i<this.manufacturerList.length;i++){
           if(val.manufacturer == this.manufacturerList[i].id){
             manufacturer_name = this.manufacturerList[i].manufacturer_name
@@ -179,6 +373,332 @@ export default {
       // window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
+
+    getStorehouseList(){
+      getStorehouseList().then(response=>{
+         if(response.data.state == 1){
+           var houseList = response.data.data.list
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList.push(obj)
+           for(let i=0;i<houseList.length;i++){
+             this.houseList.push(houseList[i])
+           }
+           this.manufacturerList = response.data.data.manufacturerList
+           this.goodTypeList = response.data.data.goodTypeList
+           this.patientList = response.data.data.patientList
+         }
+      })
+    },
+    getlist(){
+        var params = {
+          storehouse_id:this.storehouse_id,
+          good_type:this.good_type,
+          keyword:this.keyword,
+          page:this.page,
+          limit:this.limit,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getGoodNewQuery(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list2332233232323232w",list)
+            
+            if(list.length > 0){
+              var arr = []
+              for(let i=0;i<list.length;i++){
+                if(list[i].xt_warehouse_info.length > 0){
+                  arr.push(list[i])
+                }
+              }
+              this.tableList = arr
+            }
+            this.total = response.data.data.total
+           
+         }
+      })
+    },
+    getManufacturName(id){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+        }
+      }
+      return manufacturer_name
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    handleSizeChangeOne(val) {
+      this.limitone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+    handleCurrentChangeOne(val) {
+      this.pageone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+   seach(){
+    this.getlist()
+   },
+   getGoodTypeName(id){
+     var type_name = ""
+     for(let i=0;i<this.goodTypeList.length;i++){
+       if(id == this.goodTypeList[i].id){
+         type_name = this.goodTypeList[i].type_name
+       }
+     }
+     return type_name
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.houseList.length;i++){
+       if(id == this.houseList[i].id){
+         storehouse_name = this.houseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+    getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCountInfo(cancel_stock_info,storehouse_id){
+     var count = 0 
+     if(cancel_stock_info.length >0){
+        for(let i=0;i<cancel_stock_info.length;i++){
+          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+              count += cancel_stock_info[i].count
+          }
+        }
+     }
+     return count
+   },
+   getWareOutInfoCount(warehouse_out_info,storehouse_id){
+     var count = 0
+     if(warehouse_out_info.length > 0){
+       for(let i=0;i<warehouse_out_info.length;i++){
+         if(storehouse_id == warehouse_out_info[i].storehouse_id){
+            count +=warehouse_out_info[i].count
+         }
+       }
+     }
+     return count
+   },
+   getInCount(id){
+      var count= 0
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   toDialogClick(id,good_name,specification_name){
+    this.good_id = id
+    this.good_name = good_name
+    this.specification_name = specification_name
+     var params = {
+       good_id:id,
+       limit:this.limitone,
+       page:this.pageone,
+       start_first_time:this.start_first_time,
+       end_first_time:this.end_first_time,
+     }
+     getGoodWarehouseOutInfoById(params).then(response=>{
+       if(response.data.state == 1){
+         var list = response.data.data.list
+         console.log("list23233233232w",list)
+         this.tableData = list
+         this.totalone = response.data.data.total
+         this.dialogVisible = true
+       }
+     })
+   
+   },
+   startFirstTimeChange(){
+    
+   },
+   endEndTimeChange(){
+
+   },
+  getTime(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d}')
+   }
+   },
+  getName(id){
+    var name = ""
+    for(let i=0;i<this.patientList.length;i++){
+      if(id == this.patientList[i].id){
+        name = this.patientList[i].name
+      }
+    }
+    return name
+  }
+  },
+  created(){
+    this.getStorehouseList()
+    this.getlist()
+    this.getStockDrugCount()
   }
 }
 </script>

src/xt_pages/stock/query/patientQuery.vue

@@ -1,7 +1,439 @@
 <template>
-  <div class="main-contain">
-     <div class="app-container ">
-       患者查询 库存查询喔喔喔
-     </div>
-  </div>
-</template>
+    <div class="main-contain">
+        <div class="app-container">
+         <el-container>
+               <div style="width:27%">
+                <el-row>
+                   时间:
+                    <el-date-picker
+                      size="small"
+                      v-model="start_time"
+                      prefix-icon="el-icon-date"
+                      :editable="false"
+                      style="width:160px;"
+                      type="date"
+                      placeholder="选择日期时间"
+                      align="right"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      @change="startTimeChange"
+                    ></el-date-picker> 
+                      <span>-</span> 
+                      <el-date-picker
+                        size="small"
+                        v-model="end_time"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width:160px;"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        @change="endTimeChange"
+                    ></el-date-picker>
+                </el-row>
+                <el-row></el-row>
+                 <el-row>
+                   <el-col :span="24">
+                      <el-input style="width:200px;margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;<el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   </el-col>
+                  </el-row>
+
+                  <el-row>
+                      <el-table
+                          ref="singleTable"
+                          :data="patientList"
+                          highlight-current-row
+                           border
+                          @current-change="handleCurrentChange"
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="序号"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="姓名"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.name}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                  </el-row>
+               </div>
+
+                 <el-main>
+                  <div class="main newMain">
+                      
+                        
+                  <el-tabs>
+
+                   <el-tab-pane label="患者使用列表">
+                   
+                     <el-table
+                          :data="tableList"
+                          highlight-current-row
+                           border
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="名称"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.row.GoodInfo.good_name}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="生产厂家"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{getManufacturName(scope.row.manufacturer)}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="规格&单位"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.GoodInfo.specification_name}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="数量"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.count}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                      <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :page-sizes="[10, 50, 100,200,500,1000]"
+                        :page-size="10"
+                        background
+                        align="right"
+                        style="margin-top:20px;"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="total"
+                        >
+                      </el-pagination>
+                    </el-tab-pane>
+                   </el-tabs>
+                </div>
+             </el-main>
+          </el-container>
+        </el-container>
+      </el-container>
+      </div>
+    </div>
+
+</template>
+<script>
+import { getGoodPatientList,getWarehouseOutDetailByPatientId } from "@/api/drug/drug"
+export default {
+  data(){
+    return{
+      zoneList:[],
+      zone_id:0,
+      tableData:[],
+      DeviceTypeType:[],
+      device_type:"",
+      forms:{},
+      start_time:"",
+      end_time:"",
+      patientList:[],
+      tableList:[],
+      keyword:"",
+      manufacturerList:[],
+      patient_id:0,
+      patient:{},
+      limit:10,
+      page:1,
+      total:0,
+    }
+  },
+  methods:{
+   handleSizeChange(val) {
+      this.limit = val;
+      this.getWarehouseOutDetailByPatientId()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getWarehouseOutDetailByPatientId()
+    },
+    startTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    endTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    getlist(){
+        var params = {
+          keyword:this.keyword,
+        }
+      getGoodPatientList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.patientList = list
+          this.$refs.singleTable.setCurrentRow(this.patientList[0]);
+          this.handleCurrentChange(this.patientList[0])
+        }
+      })
+    },
+   onSearch(){
+     this.getlist()
+   },
+   handleCurrentChange(val){
+       this.patient = val
+       var params = {
+         patient_id:val.id,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page
+       }
+     getWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.total = response.data.data.total
+          this.manufacturerList = response.data.data.manufacturerList
+          this.tableList = list
+        }
+     })
+   },
+   getWarehouseOutDetailByPatientId(){
+     var params = {
+        patient_id:this.patient,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+    getWarehouseOutDetailByPatientId().then(response=>{
+       if(response.data.state == 1){
+        var list = response.data.data.list
+        this.total = response.data.data.total
+        this.manufacturerList = response.data.data.manufacturerList
+        this.tableList = list
+       }
+    })
+   },
+   getManufacturName(id){
+     var manufacturer_name = ""
+     for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+          manufacturer_name = this.manufacturerList[i].manufacturer_name
+        } 
+     }
+     return manufacturer_name
+   }
+  },
+  created(){
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+     this.getlist()
+  },
+  
+}
+</script>
+
+
+   
+<style lang="scss" scoped>
+    .zone{
+      //  margin-left: 30px;
+      //  text-align: left;
+       width: 70px;
+       display: inline-block;
+       color:#606266;
+    }
+    .disinfect{
+      position: relative;
+      .newButton{
+        // position: absolute;
+        // right: 2%;
+        // top:4px;
+        // z-index: 9;
+        margin-bottom: 10px;
+    margin-left: 90%;
+      }
+    }
+    .disinfectOne{
+      position: relative;
+      .newButtonOne{
+        position: absolute;
+         right: 0;
+         top: -10;
+         z-index: 18;
+      }
+    }
+    .but{
+      width: 200px;
+      height: 50px;
+      // border: solid 1px red;
+      margin-left: 77%;
+    }
+    .clearn{
+      width: 460px;
+      height: 50px;
+      // border:solid 1px red;
+      margin-left:650px;
+    }
+
+  .zClass{
+    width: 200px;
+    height: 200px;
+    // border:solid 1px red;
+    margin-left: 450px;
+    margin-top: 200px;
+  }
+  .warn{
+    color: red;
+    font-size: 14px;
+    width: 100%;
+    display: inline-block;
+    margin-left: 96px;
+  }
+
+  .userbutton{
+       margin-bottom: 10px;
+    margin-left: 82%
+  }
+
+</style>
+<style lang="scss">
+   .a{
+     margin-bottom: 10px;
+      margin-top: 6px;
+
+   }
+
+   .b{
+    .el-button{
+      margin-left: 90%;
+      margin-bottom: 10px;
+    }
+   }
+
+   .stoppage{
+     .el-form-item__label{
+       width:190px;
+     }
+   }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
+   .main{
+     position: relative;
+     .newButtonOne{
+       position:absolute;
+       right: 0;
+       z-index: 2;
+     }
+   }
+
+    .elbutton{
+      // border: solid 1px red;
+      height: 50px;
+      width: 400px;
+      margin-left: 650px;
+    }
+  // .el-form-item__label {
+  //   width: 130px;
+  //   font-size: 14px;
+  // }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
+
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
+.el-main{
+  padding-top: 0px;
+}
+.newMain{
+  .el-form-item__label{
+    width: 104px;
+  }
+}
+.newDisinfectOne{
+  .el-input--prefix .el-input__inner{
+    padding-left: 15px
+  }
+}
+.stoppage{
+  .el-form-item__label{
+    width: 18%;
+  }
+}
+.newItem{
+  .el-form-item__label{
+    width: 130px;
+  }
+}
+.formItem{
+  .el-form-item__label{
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname{
+  .el-form-item__label{
+    width: 60px;
+  }
+}
+::-webkit-scrollbar{
+  height: 20px;
+}
+</style>

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -1,7 +1,553 @@
 <template>
   <div class="main-contain">
      <div class="app-container ">
-        进销存 库存查询喔喔喔
+        <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+         <div>
+          <span>操作时间:</span>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker> 
+            <span>-</span> 
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 150px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>  
+          <span>耗材类型:</span>
+          <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodTypeName">
+            <el-option
+              v-for="item in goodTypeList"
+              :key="item.id"
+              :label="item.type_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
+         </div>
+        </div>
+
+           <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+          >
+            <el-table-column label="耗材类型" align="center">
+              <template slot-scope="scope">
+                 {{getGoodTypeName(scope.row.good_type_id)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="耗材名称" align="center">
+              <template slot-scope="scope">
+                {{scope.row.good_name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.specification_name}}
+                </template>
+            </el-table-column>
+            <el-table-column label="生产厂商" align="center">
+              <template slot-scope="scope">
+                 {{getManufacturName(scope.row.manufacturer)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="期初结余" align="center">
+               
+                 <el-table-column prop="stockIn" label="数量" width="100">
+                   
+                 </el-table-column>
+              
+                <el-table-column prop="buy_price" label="进货金额" width="100">
+                   
+                </el-table-column>
+                <el-table-column prop="stockMoney" label="销售金额" width="100">
+                 
+                </el-table-column>
+             
+            </el-table-column>
+            <el-table-column label="本期增加" align="center">
+             
+                <el-table-column prop="stockAdd" label="数量" width="100">
+                
+                </el-table-column>
+             
+                <el-table-column prop="buy_price" label="进货金额" width="100">
+                  
+                </el-table-column>
+                <el-table-column  prop="addStockMoney" label="销售金额"  width="100">
+                </el-table-column>
+              
+            </el-table-column>
+         
+            <el-table-column label="本期减少" align="center">
+               <el-table-column prop="outStock" label="数量" width="100">
+                </el-table-column>
+                <el-table-column  prop="buy_price"  label="进货金额" width="100">
+                </el-table-column>
+                <el-table-column prop="stockOutMoney" label="销售金额" width="100">
+                </el-table-column>
+            </el-table-column>
+          
+            <el-table-column label="期末结余" align="center">
+              <el-table-column prop="overStock" label="数量" width="100">
+              </el-table-column>
+              <el-table-column prop="buy_price" label="进货金额" width="100">
+              </el-table-column>
+              <el-table-column prop="oveMoney" label="销售金额" width="100">
+              </el-table-column>
+            </el-table-column>
+
+          
+          </el-table>
+           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+            </el-pagination>
      </div>
+
+
+
+  
+
   </div>
-</template>
+</template>
+<script>
+import { getStorehouseList,getPurchaseStockQuery } from "@/api/drug/drug"
+import {
+  getStockDrugCount
+} from "@/api/stock";
+import { uParseTime } from '@/utils/tools'
+export default {
+
+  data(){
+    return{
+     tableList:[],
+     goodList:[
+      {id:1,name:"全部耗材"},
+      {id:2,name:"库存预警"},
+     ],
+     houseList:[],
+     storehouse_id:0,
+     good_type:0,
+     multipleSelection: [],
+     signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+     manufacturerList:[],
+     limit:10,
+     page:1,
+     total:0,
+     keyword:"",
+     goodTypeList:[],
+     start_time:"",
+     end_time:"",
+     countList:[],
+     outCountList:[],
+     autoCountList:[],
+     cancelCountList:[],
+     org_id:this.$store.getters.xt_user.org_id,
+     dialogVisible:false,
+     start_first_time:"",
+     end_first_time:"",
+     tableData:[],
+     good_id:0,
+     patientList:[],
+     good_name:"",
+     specification_name:""
+    }
+  
+  },
+  methods:{
+    changeStorehouseName(){
+
+    },
+    changeGoodTypeName(){
+      this.getlist()
+    },
+    getStorehouseList(){
+      getStorehouseList().then(response=>{
+         if(response.data.state == 1){
+           var houseList = response.data.data.list
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList.push(obj)
+           for(let i=0;i<houseList.length;i++){
+             this.houseList.push(houseList[i])
+           }
+           this.manufacturerList = response.data.data.manufacturerList
+           var obj = {id:0,type_name:"全部"}
+           this.goodTypeList.push(obj)
+           var goodTypeList = response.data.data.goodTypeList
+           for(let i=0;i<goodTypeList.length;i++){
+             this.goodTypeList.push(goodTypeList[i])
+            }
+           this.patientList = response.data.data.patientList
+         }
+      })
+    },
+    getlist(){
+        var params = {
+          good_type:this.good_type,
+          keyword:this.keyword,
+          page:this.page,
+          limit:this.limit,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getPurchaseStockQuery(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            for(let i=0;i<list.length;i++){
+               list[i].stockIn = this.getWarehouseInfo(list[i].warehouse_info)
+               list[i].stockMoney = (this.getWarehouseInfo(list[i].warehouse_info) * list[i].buy_price).toFixed(2)
+               list[i].stockAdd = this.getWarehouseInfoOne(list[i].warehouse_info)
+               list[i].addStockMoney = (this.getWarehouseInfoOne(list[i].warehouse_info) *list[i].buy_price).toFixed(2)
+
+               list[i].outStock = this.getWarehouseOut(list[i].warehouse_out_info)
+               list[i].stockOutMoney = (this.getWarehouseOut(list[i].warehouse_out_info)*list[i].buy_price).toFixed(2)
+
+               list[i].overStock = this.getWarehouseInfo(list[i].warehouse_info)
+               list[i].oveMoney = (this.getWarehouseInfo(list[i].warehouse_info)*list[i].buy_price).toFixed(2)
+            }
+            this.tableList = list
+            this.total = response.data.data.total
+
+           this.manufacturerList = response.data.data.manufacturerList
+           
+         }
+      })
+    },
+    getManufacturName(id){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+        }
+      }
+      return manufacturer_name
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    handleSizeChangeOne(val) {
+      this.limitone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+    handleCurrentChangeOne(val) {
+      this.pageone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+   seach(){
+    this.getlist()
+   },
+   getGoodTypeName(id){
+     var type_name = ""
+     for(let i=0;i<this.goodTypeList.length;i++){
+       if(id == this.goodTypeList[i].id){
+         type_name = this.goodTypeList[i].type_name
+       }
+     }
+     return type_name
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.houseList.length;i++){
+       if(id == this.houseList[i].id){
+         storehouse_name = this.houseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+    getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCountInfo(cancel_stock_info,storehouse_id){
+     var count = 0 
+     if(cancel_stock_info.length >0){
+        for(let i=0;i<cancel_stock_info.length;i++){
+          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+              count += cancel_stock_info[i].count
+          }
+        }
+     }
+     return count
+   },
+   getWareOutInfoCount(warehouse_out_info,storehouse_id){
+     var count = 0
+     if(warehouse_out_info.length > 0){
+       for(let i=0;i<warehouse_out_info.length;i++){
+         if(storehouse_id == warehouse_out_info[i].storehouse_id){
+            count +=warehouse_out_info[i].count
+         }
+       }
+     }
+     return count
+   },
+   getInCount(id){
+      var count= 0
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+  
+   startFirstTimeChange(){
+     this.getlist()
+   },
+   endEndTimeChange(){
+     this.getlist()
+   },
+  getTime(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d}')
+   }
+   },
+  getName(id){
+    var name = ""
+    for(let i=0;i<this.patientList.length;i++){
+      if(id == this.patientList[i].id){
+        name = this.patientList[i].name
+      }
+    }
+    return name
+  },
+  endTimeChange(){
+
+  },
+  startTimeChange(){
+
+  },
+  getWarehouseInfo(val){
+    var count =0 
+    for(let i=0;i<val.length;i++){
+      count +=val[i].stock_count
+    }
+    if(count > 0 ){
+      return count
+    }else{
+      return count
+    }
+  },
+  getWarehouseInfoOne(val){
+    var count =0 
+    for(let i=0;i<val.length;i++){
+      count +=val[i].warehousing_count
+    }
+    if(count > 0 ){
+      return count
+    }else{
+      return count
+    }
+  },
+  getWarehouseOut(val){
+    var count = 0
+    for(let i=0;i<val.length;i++){
+      count +=val[i].count
+    }
+    if(count >0){
+     return count
+    }else{
+      return count
+    }
+  }
+  },
+  created(){
+    this.getStorehouseList()
+    this.getlist()
+    this.getStockDrugCount()
+  }
+}
+</script>
+

src/xt_pages/stock/stockBatchNumber.vue

@@ -38,7 +38,8 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>
-  
+          
+          
       </div>
       
        <el-table
@@ -92,6 +93,11 @@
              <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
            </template>
         </el-table-column>
+        <!-- <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
+           <template slot-scope="scope">
+             <span> {{scope.row.stock_count}}</span>
+           </template>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="备注" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.remark}}</span>

src/xt_pages/stock/stockDamaged.vue

@@ -366,8 +366,9 @@
                   <span v-if="scope.row.inventory_type == 1">到期退货</span> 
                   <span v-if="scope.row.inventory_type == 2">异常退货</span> 
                   <span v-if="scope.row.inventory_type == 3">退货</span> 
-                  <span v-if="scope.row.inventory_type == 4">人为损坏</span> 
+                  <span v-if="scope.row.inventory_type == 4">损坏</span> 
                   <span v-if="scope.row.inventory_type == 5">不计入报损分析</span> 
+                  <span v-if="scope.row.inventory_type == 7">有效期到期</span> 
                 </template>
               </el-table-column>
             </el-table>
@@ -451,8 +452,9 @@ export default {
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
-              {id:4,name:"人为损坏"},
+              {id:4,name:"损坏"},
               {id:5,name:"不计入报损分析"},
+              {id:7,name:"有效期到期"},
             ],
             goodList:[],
             good_name:"",

src/xt_pages/stock/stockQuery.vue

@@ -141,7 +141,6 @@
         </el-table-column>
        <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-
             <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
                {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -196,6 +196,17 @@
                   >
                 </template>
               </el-table-column>
+
+              <el-table-column
+                label="推送截止日期"
+                min-width="80"
+                property="execution_frequency"
+                align="center"
+              >
+               <template slot-scope="scope">
+                 {{scope.row.push_start_time}}
+                </template>
+              </el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -559,6 +570,19 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+             <el-form-item label="推送截止日期:">
+                 <el-date-picker
+                   v-model="nameForm.push_start_time"
+                   type="date"
+                   format="yyyy-MM-dd"
+                   value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsOne"
+                  placeholder="推送截止日期">
+                 </el-date-picker>
+              </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -586,10 +610,17 @@ import {
   StopDoctorAdvice
 } from "@/api/advice";
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import { uParseTime } from "@/utils/tools";
 export default {
   name: "EditGroupAdvice",
   data() {
     return {
+      pickerOptionsOne: {
+      // 限制收货时间不让选择今天以前的
+      disabledDate(time) {
+        return time.getTime() < Date.now() - 8.64e7;
+      },
+      },
       weeks: [],
       editRowKey: 0,
       templateFormVisible: false,
@@ -632,7 +663,8 @@ export default {
         way:0,
         drug_id:0,
         src_type:"",
-        drug_name_id:0
+        drug_name_id:0,
+        push_start_time:"",
       },
 
       drugOptions: [],
@@ -898,11 +930,11 @@ export default {
                 groupno: _this.groupForm.groupno,
                 frequency_type: _this.nameForm.frequency_type,
                 day_count: _this.nameForm.day_count.toString(),
-                week_days: this.weeks
-                  .filter(function(s) {
+                week_days: this.weeks.filter(function(s) {
                     return s && s.trim();
-                  })
-                  .join(",")
+                  }).join(","),
+                push_start_time: _this.nameForm.push_start_time,
+                
               };
             } else {
               submitForm = {
@@ -931,6 +963,7 @@ export default {
                 frequency_type: 0,
                 day_count: "0",
                 week_days: "",
+                push_start_time:_this.nameForm.push_start_time
 
               };
             }
@@ -991,9 +1024,10 @@ export default {
                     _this.adviceTableData[index].frequency_type = advice.frequency_type;
                     _this.adviceTableData[index].day_count = advice.day_count;
                     _this.adviceTableData[index].week_day = advice.week_day;
-                    _this.adviceTableData[index].way = advice.way,
-                    _this.adviceTableData[index].drug_id = advice.drug_id,
+                    _this.adviceTableData[index].way = advice.way
+                    _this.adviceTableData[index].drug_id = advice.drug_id
                     _this.adviceTableData[index].drug_name_id = advice.drug_name_id
+                    _this.adviceTableData[index].push_start_time = advice.push_start_time
                     break;
                   }
                 }
@@ -1024,6 +1058,7 @@ export default {
                           _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way
                           _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id
                           _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id
+                          _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time
                           _this.$set(
                             _this.groupForm.adviceNames[index].children,
                             j,
@@ -1053,6 +1088,7 @@ export default {
                       _this.groupForm.adviceNames[index].way = _this.nameForm.way
                       _this.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
                       _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
+                       _this.groupForm.adviceNames[index].push_start_time = _this.nameForm.push_start_time;
                       console.log(_this.weeks);
                       _this.$set(
                         _this.groupForm.adviceNames,
@@ -1091,7 +1127,7 @@ export default {
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
                 groupno: _this.groupForm.groupno,
-
+                push_start_time:_this.groupForm.push_start_time
               };
 
               let mode = "";
@@ -1204,6 +1240,7 @@ export default {
                     drug_id:_this.nameForm.drug_id,
                     way:_this.nameForm.way,
                     drug_name_id:_this.nameForm.drug_name_id,
+                    push_start_time:_this.nameForm.push_start_time,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -1403,7 +1440,8 @@ export default {
         index: 0,
         children: [],
         parent_row: this.groupSelectRow.row_key,
-        id: 0
+        id: 0,
+        push_start_time:"",
       };
       this.isChild = true;
       this.nameFormVisible = true;
@@ -1445,6 +1483,7 @@ export default {
           frequency_type: this.groupSelectRow.frequency_type,
           drug_id:0,
           drug_name_id:0,
+          push_start_time:this.groupSelectRow.push_start_time,
           way:0,
         };
 
@@ -1476,7 +1515,8 @@ export default {
           parent_row: 0,
           day_count: "",
           week_days: "",
-          frequency_type: 0
+          frequency_type: 0,
+          push_start_time:"",
         };
         this.nameFormTitle = "新增医嘱内容";
       }
@@ -2485,6 +2525,16 @@ export default {
 
         cb(results);
       },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
   },
   watch: {
     rowKey: function() {

src/xt_pages/user/components/PatientDetail.vue

@@ -346,6 +346,19 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="24">
+                <el-form-item label="诊疗计划 : " prop="diagnose">
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="form.treatment_plan"
+                    resize="none"
+                    placeholder
+                    readonly
+                  ></el-input>
+                </el-form-item>
+             </el-col>
+
             <el-col :span="8">
               <el-form-item label="民族 : " prop="nation">
                 <el-input
@@ -867,7 +880,7 @@
                     </div>
                   </td>
                   <td valign="top">
-                    <div class="td_proj_title">备用电话</div>
+                    <div class="td_proj_title">家属电话</div>
                   </td>
                   <td valign="top">
                     <div class="td_proj_content td_align_left">
@@ -903,6 +916,7 @@
                     ></div>
                   </td>
                 </tr>
+                
                 <tr>
                   <td>
                     <div class="td_proj_title">既<br />往<br />史</div>
@@ -914,6 +928,17 @@
                     ></div>
                   </td>
                 </tr>
+                <tr>
+                  <td>
+                    <div class="td_proj_title">传<br />染<br />病</div>
+                  </td>
+                  <td colspan="7">
+                    <div class="td_proj_content td_align_left">
+                      {{ patientPrint.contagions }}
+                    </div>
+                  </td>
+                </tr>
+              
                 <tr>
                   <td colspan="8"><div class="td_proj_title">体格检查</div></td>
                 </tr>
@@ -942,24 +967,26 @@
                     ></div>
                   </td>
                 </tr>
+             
                 <tr>
                   <td>
-                    <div class="td_proj_title">传<br />染<br />病</div>
+                    <div class="td_proj_title">诊<br />断</div>
                   </td>
                   <td colspan="7">
-                    <div class="td_proj_content td_align_left">
-                      {{ patientPrint.contagions }}
-                    </div>
+                    <div
+                      class="td_proj_content td_align_left"
+                      v-html="patientPrint.diagnose"
+                    ></div>
                   </td>
                 </tr>
                 <tr>
                   <td>
-                    <div class="td_proj_title">诊<br />断</div>
+                    <div class="td_proj_title">诊<br />疗<br />计<br />划</div>
                   </td>
                   <td colspan="7">
                     <div
                       class="td_proj_content td_align_left"
-                      v-html="patientPrint.diagnose"
+                      v-html="patientPrint.treatment_plan"
                     ></div>
                   </td>
                 </tr>
@@ -1096,7 +1123,8 @@ const defaultForm = {
   sch_remark:"",
   org_id:0,
   troble_shoot:"",
-  zb_patient_id:""
+  zb_patient_id:"",
+  treatment_plan:"",
 };
 
 export default {
@@ -1288,6 +1316,7 @@ export default {
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
+            this.form.treatment_plan = patietInfo.treatment_plan
             if(patietInfo.is_infectious == 1){
                this.form.remind_cycle = 0
 

src/xt_pages/user/components/PatientForm.vue

@@ -413,6 +413,18 @@
                 </el-form-item>
               </el-col>
 
+              <el-col :span="24">
+                <el-form-item label="诊疗计划 : " prop="diagnose">
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="form.treatment_plan"
+                    resize="none"
+                    placeholder
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="民族 : " prop="nation">
                   <el-input v-model="form.nation" maxlength="30"></el-input>
@@ -1155,6 +1167,7 @@ const defaultForm = {
   sbp: "",
   dbp: "",
   showOne:true,
+  treatment_plan:"",
 };
 
 export default {
@@ -1665,7 +1678,7 @@ export default {
             this.form.work = patietInfo.work_unit;
             this.form.unit_address = patietInfo.unit_address;
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
-
+            this.form.treatment_plan = patietInfo.treatment_plan
             if (patietInfo.profession > 0) {
               this.form.profession = patietInfo.profession;
             }

src/xt_pages/user/doctorAdvice.vue

@@ -426,6 +426,16 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          label="推送截止日期"
+          width="180"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.push_start_time >0">{{scope.row.push_start_time | parseTime("{y}-{m}-{d}")}}</span>
+          </template>
+        </el-table-column>
+
         <!-- <template v-if="adviceType==3">
                     <el-table-column key="advice_doctor_3" label="开嘱医生" min-width="80"  property="advice_doctor" align="center">
                         <template slot-scope="scope">
@@ -760,6 +770,16 @@
                     >
                   </template>
                 </el-table-column>
+                <el-table-column 
+                 label="推送截止日期"
+                  min-width="80"
+                  align="center"
+                >
+                <template slot-scope="scope">
+                   {{scope.row.push_start_time}}
+                </template>
+                
+                </el-table-column>
               </el-table>
             </el-col>
           </el-row>
@@ -967,7 +987,7 @@
           ref="nameForm"
           :rules="nameRules"
           :model="nameForm"
-          label-width="90px"
+          label-width="120px"
         >
           <el-row>
             <el-col :span="10">
@@ -1130,6 +1150,8 @@
               </el-form-item>
             </el-col>
 
+           
+
             <el-col :span="12" v-if="nameForm.frequency_type == 2">
               <el-form-item prop="day_count">
                 <el-input
@@ -1153,6 +1175,19 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+               <el-form-item label="推送截止日期:">
+                 <el-date-picker
+                   v-model="nameForm.push_start_time"
+                   type="date"
+                   format="yyyy-MM-dd"
+                   value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsOne"
+                  placeholder="推送截止日期">
+                 </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -1196,7 +1231,7 @@
           ref="adviceForm"
           :rules="adviceRules"
           :model="adviceForm"
-          label-width="90px"
+          label-width="120px"
         >
           <el-row>
             <el-col :span="12">
@@ -1396,7 +1431,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+             <el-col :span="24">
+               <el-form-item label="推送截止日期:">
+                 <el-date-picker
+                   v-model="adviceForm.push_start_time"
+                   type="date"
+                   format="yyyy-MM-dd"
+                   value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsOne"
+                  placeholder="推送截止日期">
+                 </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
+
+          
           <el-form-item label="备注 :">
             <el-input type="textarea" v-model="adviceForm.remark"></el-input>
           </el-form-item>
@@ -1404,6 +1454,8 @@
           <el-form-item label="开嘱医生 :">
             <span>{{ adminusername }} </span>
           </el-form-item>
+
+        
         </el-form>
         <div slot="footer" class="dialog-footer">
           <template v-if="isEdit">
@@ -1983,6 +2035,12 @@ export default {
 
   data() {
     return {
+      pickerOptionsOne: {
+        // 限制收货时间不让选择今天以前的
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       weeks: [],
       is_open_remind: "",
       checkList: [],
@@ -2044,7 +2102,7 @@ export default {
       adviceTypeArr: [
         { value: 0, label: "全部" },
         { value: 1, label: "长期" },
-        { value: 3, label: "临时" },
+        { value: 2, label: "临时" },
         { value: 4, label: "普通医嘱" },
       ],
       adviceTypeOptions: [
@@ -2088,6 +2146,7 @@ export default {
         drug_id:0,
         way:0,
         drug_name_id:0,
+        push_start_time:"",
       },
       nameForm: {
         advice_name: "",
@@ -2104,7 +2163,8 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        push_start_time:"",
       },
       groupForm: {
         day_count: "",
@@ -2194,6 +2254,7 @@ export default {
       drug_id: 0,
       src_type:"",
       org_id:0,
+     
     };
   },
   methods: {
@@ -2266,6 +2327,7 @@ export default {
               this.dialogFormVisible = false;
               this.resetForm(formName);
               var advice = response.data.data.advice;
+              
               this.adviceTableData[this.currentIndex].drug_spec =
                 advice.drug_spec;
               this.adviceTableData[this.currentIndex].drug_spec_unit =
@@ -2291,6 +2353,7 @@ export default {
               this.adviceTableData[this.currentIndex].advice_doctor =
                 advice.advice_doctor;
               this.adviceTableData[this.currentIndex].remark = advice.remark;
+               this.adviceTableData[this.currentIndex].push_start_time = advice.push_start_time;
               this.currentIndex = -1;
               return false;
             }
@@ -3005,7 +3068,8 @@ export default {
         doctor: groups[0].advice_doctor,
 
         remark: groups[0].remark,
-        groupno: groupno
+        groupno: groupno,
+        
       };
       console.log("到了",groups[0]);
 
@@ -3049,7 +3113,8 @@ export default {
           children: [],
           parent_row: 0,
           row_key: this.rowKey,
-          table: []
+          table: [],
+          push_start_time:uParseTime(groups[index].push_start_time, "{y}-{m}-{d}")
         };
 
         if (item.id in childMap) {
@@ -3076,7 +3141,8 @@ export default {
               id: childMap[item.id][key].id,
               children: [],
               parent_row: item.row_key,
-              row_key: this.rowKey
+              row_key: this.rowKey,
+              push_start_time:uParseTime(childMap[item.id][key].push_start_time, "{y}-{m}-{d}")
             };
             item.children.push(child);
           }
@@ -3132,7 +3198,8 @@ export default {
         advice_doctor: row.advice_doctor,
         remark: "",
         parent_id: row.parent_id > 0 ? row.parent_id : row.id,
-        drug_id:""
+        drug_id:"",
+        push_start_time:"",
       };
       this.dialogFormVisible = true;
     },
@@ -3386,14 +3453,15 @@ export default {
         single_dose: row.single_dose != 0 ? row.single_dose : "",
         single_dose_unit: row.single_dose_unit,
         prescribing_number:
-          row.prescribing_number != 0 ? row.prescribing_number : "",
+        row.prescribing_number != 0 ? row.prescribing_number : "",
         prescribing_number_unit: row.prescribing_number_unit,
         delivery_way: row.delivery_way,
         execution_frequency: row.execution_frequency,
         advice_doctor: row.advice_doctor,
         remark: row.remark,
         id: row.id,
-        parent_id: row.parent_id
+        parent_id: row.parent_id,
+        push_start_time:uParseTime(row.push_start_time, "{y}-{m}-{d}"),
       };
     },
     getList() {
@@ -3473,7 +3541,7 @@ export default {
     },
 
     selectAdvice(selection, row) {
-      console.log("row322232322323",row)
+      console.log("row322232322323",this.adviceType)
       if (this.adviceType != 3) {
         this.lstableData = [];
       } else if (this.adviceType != 1) {
@@ -3531,6 +3599,7 @@ export default {
           });
         }, 1);
       } else if (this.adviceType == 3 || this.adviceType == 2 || this.adviceType == 4) {
+        console.log("lstableData",this.lstableData)
         if (this.lstableData.length == 0) {
           this.$message.error("请勾选需要打印的医嘱!");
           return false;
@@ -4099,6 +4168,7 @@ export default {
                       _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
                       _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
                       _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
+                       _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time;
 
                       _this.$set(
                         _this.groupForm.adviceNames[index].children,
@@ -4113,31 +4183,19 @@ export default {
               }
             } else {
               for (let index = 0; index < ale; index++) {
-                if (
-                  _this.groupSelectRow.row_key ==
-                  _this.groupForm.adviceNames[index].row_key
-                ) {
+                if (_this.groupSelectRow.row_key == _this.groupForm.adviceNames[index].row_key) {
                   _this.groupForm.adviceNames[index].advice_name =_this.nameForm.advice_name;
-                  _this.groupForm.adviceNames[index].advice_desc =
-                    _this.nameForm.advice_desc;
-
-                  _this.groupForm.adviceNames[index].single_dose =
-                    "" + _this.nameForm.single_dose;
-                  _this.groupForm.adviceNames[index].single_dose_unit =
-                    _this.nameForm.single_dose_unit;
-                  _this.groupForm.adviceNames[index].drug_spec =
-                    "" + _this.nameForm.drug_spec;
-                  _this.groupForm.adviceNames[index].drug_spec_unit =
-                    _this.nameForm.drug_spec_unit;
-                  _this.groupForm.adviceNames[index].prescribing_number =
-                    "" + _this.nameForm.prescribing_number;
-                  _this.groupForm.adviceNames[index].prescribing_number_unit =
-                    _this.nameForm.prescribing_number_unit;
-                  _this.groupForm.adviceNames[index].delivery_way =
-                    _this.nameForm.delivery_way;
-                  _this.groupForm.adviceNames[index].execution_frequency =
-                    _this.nameForm.execution_frequency;
-
+                  _this.groupForm.adviceNames[index].advice_desc =_this.nameForm.advice_desc;
+
+                  _this.groupForm.adviceNames[index].single_dose = "" + _this.nameForm.single_dose;
+                  _this.groupForm.adviceNames[index].single_dose_unit =_this.nameForm.single_dose_unit;
+                  _this.groupForm.adviceNames[index].drug_spec = "" + _this.nameForm.drug_spec;
+                  _this.groupForm.adviceNames[index].drug_spec_unit =_this.nameForm.drug_spec_unit;
+                  _this.groupForm.adviceNames[index].prescribing_number = "" + _this.nameForm.prescribing_number;
+                  _this.groupForm.adviceNames[index].prescribing_number_unit = _this.nameForm.prescribing_number_unit;
+                  _this.groupForm.adviceNames[index].delivery_way = _this.nameForm.delivery_way;
+                  _this.groupForm.adviceNames[index].execution_frequency = _this.nameForm.execution_frequency;
+                  _this.groupForm.adviceNames[index].push_start_time = _this.nameForm.push_start_time
                   if (_this.nameForm.frequency_type == 1) {
                     _this.groupForm.adviceNames[index].frequency_type =
                       _this.nameForm.frequency_type;
@@ -4377,6 +4435,7 @@ export default {
     },
     // 获取勾选中的行
     getPrintInfo(ids) {
+      console.log("ids",ids)
       console.log("23332332323232",this.adviceType,"33333333",this.stopType)
 
       getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
@@ -4655,7 +4714,17 @@ export default {
         this.nameForm.drug_id = tmp.id
         console.log("isiisisthis.adviceForm",this.adviceForm)
         this.adviceForm.drug_id = tmp.id
-      }
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
   },
   watch: {
     adviceTableData: function() {
@@ -4669,9 +4738,11 @@ export default {
       const group = [];
       const grouptwo = [];
       const ids = [];
+      console.log("multipleSelection",this.multipleSelection)
       for (const i in this.multipleSelection) {
         arr.push(this.multipleSelection[i]);
         group.push(this.multipleSelection[i].groupno);
+       
       }
       grouptwo.push(this.getdata(group));
       // console.log('组号', group)
@@ -4748,6 +4819,7 @@ export default {
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+
 .printForm {
   width: 960px;
 }