Merge branch '20201109_pc_vue_new_branch' of D:\lijianchao\project\z-html\Vue_New with conflicts.

config/dev.env.js

   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9529"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
   CDM_HOST: '"http://cdm.test.sgjyun.com"'
 }
-

package.json

     "babel-preset-stage-2": "6.24.1",
     "chalk": "2.3.0",
     "copy-webpack-plugin": "4.3.0",
-    "cross-env": "5.1.1",
+    "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
     "css-loader": "0.28.7",
     "eslint": "4.13.1",

src/App.vue

   },
   watch:{
   $route(to,from){
-    
+
     if(to.path.indexOf('/patients/patient')== -1){
       window.sessionStorage.removeItem('patientKey')
     }

src/api/pharmacy.js

     params: params
   })
 }
+//获取当天已发药的药品
+export function dispensemedicine(params) {
+  return request({
+    url: '/api/pharmacy/dispensemedicine',
+    method: 'get',
+    params: params
+  })
+}
+//获取当天待发药的药品
+export function waitingmedicine(params) {
+  return request({
+    url: '/api/pharmacy/waitingmedicine',
+    method: 'get',
+    params: params
+  })
+}
+//获取当天该药品的所有患者
+export function getpatientswithdrugs(params) {
+  return request({
+    url: '/api/pharmacy/getpatientswithdrugs',
+    method: 'get',
+    params: params
+  })
+}
+//药品发药按钮点击
+export function medicinedeparture(params) {
+  return request({
+    url: '/api/pharmacy/medicinedeparture',
+    method: 'get',
+    params: params
+  })
+}
+//获取当前登录账号
+export function getcurrentname(params) {
+  return request({
+    url: '/api/pharmacy/getcurrentname',
+    method: 'get',
+    params: params
+  })
+}

src/router/index.js

   PatientDispensing, // 患者发药模块
   DrugDispensing, // 药房管理模块
   DispensingDetails, // 药房管理模块
-  // ConsumablesManagement, // 药房管理模块
+  //ConsumablesManagement, // 药房管理模块
   MedicianManagement, // 药房管理模块
 
   otherManagement,

src/router/modules/DispensingDetails.js

   children: [{
     path: '/Pharmacy/DispensingDetails',
     component: () => import('@/xt_pages/Pharmacy/DispensingDetails.vue'),
-    name: '发药明细',
+    name: '药房管理',
     meta: {
       title: '发药明细',
       noCache: true
     }
   },]
-}
+}

src/router/modules/DrugDispensing.js

   children: [{
     path: '/Pharmacy/DrugDispensing',
     component: () => import('@/xt_pages/Pharmacy/DrugDispensing.vue'),
-    name: '药品发药',
+    name: '药房管理',
     meta: {
       title: '药品发药',
       noCache: true
     }
   },]
-}
+}

src/router/modules/PatientDispensing.js

   children: [{
     path: '/Pharmacy/PatientDispensing',
     component: () => import('@/xt_pages/Pharmacy/PatientDispensing.vue'),
-    name: '患者发药',
+    name: '药房管理',
     meta: {
       title: '患者发药',
       noCache: true
   //   meta: { title: 'outpatientChargesPrint', noCache: true }
   // }
 ]
-}
+}

src/views/layout/Layout.vue

           <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/DepositManagement/DepositRefund.vue

             <div style="width: 465px;white-space: nowrap;">
               <span>日期查询：</span>
               <el-date-picker
+                unlink-panels
                 v-model="tmp_value1"
                 type="daterange"
                 range-separator="至"

src/xt_pages/DepositManagement/Template/DeductionDetails.vue

           <div style="width: 465px">
             <span>日期查询：</span>
             <el-date-picker
+              unlink-panels
               v-model="value1"
               type="daterange"
               range-separator="至"

src/xt_pages/DepositManagement/Template/DeductionSummary.vue

           <div style="width: 465px">
             <span>日期查询：</span>
             <el-date-picker
+              unlink-panels
               v-model="value1"
               type="daterange"
               range-separator="至"

src/xt_pages/DepositManagement/Template/DepositDetails.vue

         <div style="width: 550px">
           <span>日期查询：</span>
           <el-date-picker
+            unlink-panels
             v-model="value1"
             type="daterange"
             range-separator="至"

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

           <div style="width: 465px">
             <span>日期查询：</span>
             <el-date-picker
+              unlink-panels
               v-model="value1"
               type="daterange"
               range-separator="至"
               审核
             </el-button>
             </span>
-           
+
             <span v-if="scope.row.trial_status == 1">
             <el-button
               size="small"

src/xt_pages/DepositManagement/Template/RechargeSummary.vue

           <div style="width: 465px">
             <span>日期查询：</span>
             <el-date-picker
+              unlink-panels
               v-model="value1"
               type="daterange"
               range-separator="至"

src/xt_pages/Pharmacy/DispensingDetails.vue

 <template><!--发药明细-->
-<!--  <div class="main-contain">-->
-<!--    <div class="position">-->
-<!--      <bread-crumb :crumbs="crumbs"></bread-crumb>-->
-<!--    </div>-->
-<!--    <div class="app-container">-->
-<!--      <div-->
-<!--        style="-->
-<!--          justify-content: space-between;-->
-<!--          margin: 0px 0 12px 0;-->
-<!--          display: flex;-->
-<!--          align-items: center;-->
-<!--        "-->
-<!--      >-->
-<!--        <div>-->
-<!--          <el-input-->
-<!--            size="small"-->
-<!--            style="width: 200px; margin-left: 10px"-->
-<!--            class="filter-item"-->
-<!--            v-model="keyword"-->
-<!--            placeholder="请输入患者姓名"-->
-<!--          ></el-input>-->
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div
+        style="
+          justify-content: space-between;
+          margin: 0px 0 12px 0;
+          display: flex;
+          align-items: center;
+        "
+      >
+        <div>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            v-model="keyword"
+            placeholder="请输入患者姓名"
+          ></el-input>
 
-<!--          <el-date-picker-->
-<!--            size="small"-->
-<!--            v-model="start_time"-->
-<!--            prefix-icon="el-icon-date"-->
-<!--            :editable="false"-->
-<!--            style="width: 196px"-->
-<!--            type="date"-->
-<!--            placeholder="选择日期时间"-->
-<!--            align="right"-->
-<!--            format="yyyy-MM-dd"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            @change="startTimeChange"-->
-<!--          ></el-date-picker-->
-<!--          >- -->
-<!--          <el-date-picker-->
-<!--            size="small"-->
-<!--            v-model="end_time"-->
-<!--            prefix-icon="el-icon-date"-->
-<!--            :editable="false"-->
-<!--            style="width: 196px"-->
-<!--            type="date"-->
-<!--            placeholder="选择日期时间"-->
-<!--            align="right"-->
-<!--            format="yyyy-MM-dd"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            @change="endTimeChange"-->
-<!--          ></el-date-picker>-->
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker
+          >-
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
 
-<!--          <el-button-->
-<!--            size="small"-->
-<!--            class="filter-item"-->
-<!--            type="primary"-->
-<!--            icon="el-icon-search"-->
-<!--            @click="query"-->
-<!--            >查询</el-button-->
-<!--          >-->
-<!--        </div>-->
-<!--      </div>-->
-<!--      <el-table-->
-<!--        :row-style="{ color: '#303133' }"-->
-<!--        :header-cell-style="{-->
-<!--          backgroundColor: 'rgb(245, 247, 250)',-->
-<!--          color: '#606266',-->
-<!--        }"-->
-<!--        style="width: 1651px"-->
-<!--        :data="tableList"-->
-<!--        :class="signAndWeighBoxPatients"-->
-<!--        border-->
-<!--      >-->
-<!--        <el-table-column type="index" label="序号" align="center" width="250">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="患者名称" align="center" width="300">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="query"
+            >查询</el-button
+          >
+        </div>
+      </div>
+      <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        style="width: 1651px"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column type="index" label="序号" align="center" width="250">
+        </el-table-column>
+        <el-table-column label="患者名称" align="center" width="300">
+          <template slot-scope="scope">
+            <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>
+          </template>
+        </el-table-column>
 
-<!--        <el-table-column label="开立医生" align="center" width="300">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{scope.row.DoctorName  ? scope.row.DoctorName  : ""}}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="发药时间" align="center" width="400">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{scope.row.RecordDate  ? scope.row.RecordDate  : ""}}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" align="center" width="400">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button type="primary" @click="views(scope.row)">查看</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-table-column label="开立医生" align="center" width="300">
+          <template slot-scope="scope">
+            <span>{{scope.row.DoctorName  ? scope.row.DoctorName  : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发药时间" align="center" width="400">
+          <template slot-scope="scope">
+            <span>{{scope.row.RecordDate  ? scope.row.RecordDate  : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="400">
+          <template slot-scope="scope">
+            <el-button type="primary" @click="views(scope.row)">查看</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>
 
-<!--    <details-print-->
-<!--      ref="detailsprint"-->
-<!--      :visibility="isVisibility"-->
-<!--      :propsTable="propsTable"-->
-<!--    >-->
-<!--    </details-print>-->
+    <details-print
+      ref="detailsprint"
+      :visibility="isVisibility"
+      :propsTable="propsTable"
+    >
+    </details-print>
 
-<!--  </div>-->
+  </div>
 </template>
 
-<!--<script>-->
-<!--import detailsPrint from "./print/details.vue";-->
-<!--import BreadCrumb from "@/xt_pages/components/bread-crumb";-->
-<!--import {-->
-<!--  dispensingdetails,-->
-<!--  prescriptiondetails-->
-<!--} from "@/api/pharmacy"-->
-<!--const moment = require('moment')-->
-<!--export default {-->
-<!--  components: {-->
-<!--    detailsPrint,-->
-<!--    BreadCrumb,-->
-<!--  },-->
-<!--  data() {-->
-<!--    return {-->
-<!--      crumbs: [-->
-<!--        { path: false, name: "发药明细" },-->
-<!--        { path: "/Pharmacy/DispensingDetails", name: "发药明细" },-->
-<!--      ],-->
-<!--      keyword: "",-->
-<!--      tableList: [{}],-->
-<!--      signAndWeighBoxPatients: "sign-and-weigh-box-patients",-->
-<!--      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),-->
-<!--      end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),-->
-<!--      prescriptionList:[],//处方-->
-<!--      stat_order:[],//临时医嘱-->
-<!--      total: 0,-->
-<!--      page: 1,-->
-<!--      limit: 10,-->
-<!--    };-->
-<!--  },-->
-<!--  created() {-->
-<!--    this.init();-->
-<!--    this.query();-->
-<!--  },-->
-<!--  methods: {-->
-<!--    init(){-->
-<!--      this.page = 1;-->
-<!--      this.limit = 10;-->
-<!--      this.keyword = "";-->
-<!--    },-->
-<!--    query(){-->
-<!--      var params = {-->
-<!--        keyword: this.keyword,-->
-<!--        start_time: this.start_time,-->
-<!--        end_time: this.end_time,-->
-<!--        page: 1,-->
-<!--        limit: this.limit,-->
-<!--      }-->
-<!--      dispensingdetails(params).then((res) => {-->
-<!--        if (res.data.state == 1){-->
-<!--          this.tableList = res.data.data.list;-->
-<!--          this.total = res.data.data.total;-->
-<!--        }-->
-<!--      })-->
-<!--    },-->
-<!--    search(){-->
-<!--      console.log("this.start_time",this.start_time)-->
-<!--      console.log("this.end_time",this.end_time)-->
-<!--      var params = {-->
-<!--        keyword: this.keyword,-->
-<!--        start_time: this.start_time,-->
-<!--        end_time: this.end_time,-->
-<!--        page: this.page,-->
-<!--        limit: this.limit,-->
-<!--      }-->
-<!--      dispensingdetails(params).then((res) => {-->
-<!--        if (res.data.state == 1){-->
-<!--          this.tableList = res.data.data.list;-->
-<!--        }-->
-<!--      })-->
-<!--    },-->
+<script>
+import detailsPrint from "./print/details.vue";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  dispensingdetails,
+  prescriptiondetails
+} from "@/api/pharmacy"
+const moment = require('moment')
+export default {
+  components: {
+    detailsPrint,
+    BreadCrumb,
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "药房管理" },
+        { path: "/Pharmacy/DispensingDetails", name: "发药明细" },
+      ],
+      keyword: "",
+      tableList: [{}],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      prescriptionList:[],//处方
+      stat_order:[],//临时医嘱
+      total: 0,
+      page: 1,
+      limit: 10,
+    };
+  },
+  created() {
+    this.init();
+    this.query();
+  },
+  methods: {
+    init(){
+      this.page = 1;
+      this.limit = 10;
+      this.keyword = "";
+    },
+    query(){
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        page: 1,
+        limit: this.limit,
+      }
+      dispensingdetails(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableList = res.data.data.list;
+          this.total = res.data.data.total;
+        }
+      })
+    },
+    search(){
+      console.log("this.start_time",this.start_time)
+      console.log("this.end_time",this.end_time)
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        page: this.page,
+        limit: this.limit,
+      }
+      dispensingdetails(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableList = res.data.data.list;
+        }
+      })
+    },
 
-<!--    // 查看-->
-<!--    views(data) {-->
-<!--      console.log("吱吱吱",data)-->
-<!--      this.$refs.detailsprint.show();-->
-<!--      this.$refs.detailsprint.drugdetails(data);-->
-<!--    },-->
-<!--    // 页表操作-->
-<!--    handleSizeChange(val) {-->
-<!--      this.limit = val;-->
-<!--      this.search();-->
-<!--    },-->
-<!--    handleCurrentChange(val) {-->
-<!--      this.page = val;-->
-<!--      this.search();-->
-<!--    },-->
-<!--  },-->
-<!--};-->
-<!--</script>-->
+    // 查看
+    views(data) {
+      console.log("吱吱吱",data)
+      this.$refs.detailsprint.show();
+      this.$refs.detailsprint.drugdetails(data);
+    },
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.search();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.search();
+    },
+  },
+};
+</script>
 
-<!--<style rel="stylesheet/css" lang="scss" scoped>-->
-<!--</style>-->
+<style rel="stylesheet/css" lang="scss" scoped>
+</style>

src/xt_pages/Pharmacy/DrugDispensing.vue

               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>
             </el-button>
           </div>
 
-          <el-table
-            v-if="state == 1"
+          <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"
           >
             <el-table-column prop="name" label="名称" width="100">
                <template slot-scope="scope">
-                {{scope.row.drug_name}}
+                {{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)}}
+                {{scope.row.stock}}
               </template>
             </el-table-column>
           </el-table>
           <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"
+            ref="table02"
           >
             <el-table-column prop="name" label="名称" width="100">
                <template slot-scope="scope">
-                {{scope.row.drug_name}}
+                {{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)}}
+                {{scope.row.stock}}
               </template>
             </el-table-column>
           </el-table>
       </div>
       <div class="mainRight">
         <div class="titlelist">
+<!--          <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
             style="width: 1328px"
             @selection-change="handleSelectionChange"
              v-if="state == 1"
           >
-            >
             <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}}
-              </template>
             </el-table-column>
             <el-table-column prop="name" label="患者名称" width="180" align="center">
                 <template slot-scope="scope">
-                 {{getPatientName(scope.row.patient_id)}}
+                 {{scope.row.name}}
               </template>
             </el-table-column>
             <el-table-column prop="name" label="单次用量" width="170" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.single_dose}}
+                 {{scope.row.single_dosage}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="用法" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.delivery_way}}
+                 {{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}}
+                 {{scope.row.frequency}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="天数" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.day}}
+                 {{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}}
+                 {{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>
+                  {{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="selection" width="55"> </el-table-column>-->
             <el-table-column type="index" label="序号" width="120" align="center">
-              <template slot-scope="scope">
-                {{scope.$index + 1}}
-              </template>
             </el-table-column>
             <el-table-column prop="name" label="患者名称" width="180" align="center">
                 <template slot-scope="scope">
-                 {{getPatientName(scope.row.patient_id)}}
+                 {{scope.row.name}}
               </template>
             </el-table-column>
             <el-table-column prop="name" label="单次用量" width="170" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.single_dose}}
+                 {{scope.row.single_dosage}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="用法" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.delivery_way}}
+                 {{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}}
+                 {{scope.row.frequency}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="天数" width="160" align="center">
                <template  slot-scope="scope">
-                 {{scope.row.day}}
+                 {{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}}
+                 {{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>
+                  {{scope.row.data_sources}}
                </template>
             </el-table-column>
+              <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">领料人：
+        <div style="margin-top" v-if="state == 1">领药人：
           <el-select v-model="admin_user_id" placeholder="请选择">
             <el-option
               v-for="item in doctorList"
 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"
+import {
+  dispensemedicine,
+  waitingmedicine,
+  getpatientswithdrugs,
+  medicinedeparture,
+  getcurrentname
+} from "@/api/pharmacy"
 const moment = require('moment')
 export default {
   components: {
   data() {
     return {
       crumbs: [
-        { path: false, name: "药品发药" },
+        { path: false, name: "药房管理" },
         { path: "/Pharmacy/DrugDispensing", name: "药品发药" },
       ],
       tableHeight: 400,
       isVisibility:"",
       propsTable:"",
       doctorList:[],
-      admin_user_id:this.$store.getters.xt_user.user.id,
+      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(){
-
+      this.state = 1
+      this.tableData = null
+      this.currentRow = null
+    },
+    lala(){
+      this.currentRow = null
+      this.tableData = null
+      this.selectedbydefault()
     },
      searchAction() {
-      this.getlist();
+      // 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);
     },
+    //列表选择
     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
+      }
+      var tmp = "";
+      console.log("初始值",tmp)
+      for (var i=0;i < this.multipleSelection.length;i++){
+        tmp = tmp + this.multipleSelection[i].id + ","
       }
-      bloodStr = blood_ids.join(",")
-      hisStr =  his_ids.join(",")
       var params = {
-        bloodStr:bloodStr,
-        hisStr:hisStr,
-        admin_user_id:this.admin_user_id,
+        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(() => {});
+      medicinedeparture(params).then((res) => {
+        if (res.data.state == 1){
+          this.$message.success("操作成功")
+          this.getdruglist();
+          //刷新列表
+          this.handleCurrentChange(this.currentRow);
+          this.fun4(tps);
+          this.state = 2;
+        }else{
+          this.$message.error("操作失败：" + res.data.msg)
+          //刷新列表
+          this.handleCurrentChange(this.currentRow);
+          this.fun5(tps);
+          this.state = 1;
+        }
+      })
     },
-
-    // 药品退药
-    endispense() {
-      var params = {};
-      this.$confirm("确定是否对该药品进行退药?", "患者退药", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
+    //获取药品列表
+    getdruglist(){
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+      }
+      waitingmedicine(params).then((res) => {
+        if (res.data.state == 1){
+          this.waiting_drug = res.data.data.list
+        }
+      })
+      dispensemedicine(params).then((res) => {
+        if (res.data.state == 1){
+          this.issued_drug = res.data.data.list
+        }
       })
-        .then(() => {})
-        .catch(() => {});
+    },
+    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
+        }
+        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")
     },
 
+    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)
+        }
+      });
+    },
+    //获取领药人选项
     getlist(){
       var params = {
         start_time:this.start_time,
       }
       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
+           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
          }
       })
     },
-   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);
-        }
+   //  //获取药品的患者信息
+    informationofdrugs(val){
+      var params = {
+        // patient_id: this.currentRow.
       }
-      if (total < min_number) {
-        min_str = total + min_unit;
+    },
+    handleCurrentChange(val) {
+      this.currentRow = val;
+      if(this.state == 1){
+        this.getdrugsdetails(0)
       }
-      if (total == 0) {
-        min_str = "";
-        max_str = "";
+      if (this.state == 2){
+        this.getdrugsdetails(1)
       }
-      if (total >= min_number) {
-        if (parseInt(total / min_number) != 0) {
-          max_str = parseInt(total / min_number) + max_unit;
-        }
-        if (total % min_number != 0) {
-          min_str = (total % min_number) + min_unit;
-        }
-      }
-      return max_str + min_str;
-    },
-
-    handleCurrentChange(row) {
-      this.getPharmacyBaseDrug(row.id)
     },
-    getPharmacyBaseDrug(drug_id){
+    getdrugsdetails(val){
       var params = {
-        start_time:this.start_time,
-        drug_id:drug_id,
+        drug_id:this.currentRow.id,
+        is_medicine:val,
+        time:this.start_time,
       }
-      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
+      getpatientswithdrugs(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;//列表数据
+        }else {
+          this.$message.error(res.data.msg);
         }
       })
     },
-    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
-    },
+
     toSetting(){
       getPharmacyConfig().then(response=>{
         if(response.data.state == 1){
   },
   created() {
     this.init();
-    this.getlist()
+    this.morencreatename();
+    this.getlist();
+    // this.getdruglist();
+    this.fun3();
   },
 };
 </script>

src/xt_pages/Pharmacy/PatientDispensing.vue

-<template>
+<template><!--患者发药-->
   <div class="main-contain new-main-contain">
     <div class="position">
       <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
           <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>
-
+<!--          <el-button @click="testsss">调试1</el-button>-->
+<!--          <el-button @click="testsss2">调试2</el-button>-->
           <div class="list">
-            <el-radio-group v-model="state">
-              <el-radio :label="1">待发药{{ waitmount }}人</el-radio>
-              <el-radio :label="2">已发药{{ alreadmount }}人</el-radio>
+            <el-radio-group v-model="state" @change="lala()">
+              <el-radio :label="1" >待发药{{ waitmount }}人</el-radio>
+              <el-radio :label="2" >已发药{{ alreadmount }}人</el-radio>
             </el-radio-group>
           </div>
           <div class="list">
               v-model="keywords"
               class="filter-item"
               placeholder="请输入患者名称"
+              clearable
             />
             <el-button
               size="small"
             </el-button>
           </div>
 
-          <el-table
-            :height="tableHeight"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column prop="date" label="患者姓名" width="100">
+          <el-table :height="tableHeight" ref="table01" :data="waitmount_data" highlight-current-row @current-change="handleCurrentChange" border style="width: 100%" v-if="state == 1">
+            <el-table-column prop="date" label="患者姓名" width="100" >
+              <template slot-scope="scope">
+                <span >{{scope.row.Name ? scope.row.Name : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="单据编号" width="100">
+            <el-table-column prop="name" label="透析号" width="100">
+              <template slot-scope="scope">
+                <span>{{scope.row.DialysisNo ? scope.row.DialysisNo : ""}}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table :height="tableHeight" ref="table02" :data="alreadmount_data" highlight-current-row @current-change="handleCurrentChange" border style="width: 100%" v-if="state == 2">
+            <el-table-column prop="date" label="患者姓名" width="100" >
+              <template slot-scope="scope" >
+                <span>{{scope.row.Name ? scope.row.Name : ""}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="透析号" width="100">
+              <template slot-scope="scope">
+                <span>{{scope.row.DialysisNo ? scope.row.DialysisNo : ""}}</span>
+              </template>
             </el-table-column>
           </el-table>
         </div>
             >退药</el-button
           >
           <el-button type="primary" @click="toPrint">打印</el-button>
-          <el-button type="primary" v-if="state == 1">设置</el-button>
+<!--          <el-button @click="tiaoshi">调试</el-button>-->
+          <el-button type="primary" v-if="state == 1" @click="toSetting">设置</el-button>
         </div>
         <el-divider></el-divider>
         <div>
           <el-table
             :height="tableHeight"
-            :data="tableData_list"
+            :data="tableData"
             border
             style="width: 100%"
           >
             <el-table-column type="index" label="序号" width="120" align="center">
             </el-table-column>
-            <el-table-column prop="name" label="名称" width="220" align="center">
+            <el-table-column  label="名称" width="200" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Name  ? scope.row.Name  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="单次用量" width="170" align="center">
+            <el-table-column  label="单次用量" width="150" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.SingleDosage  ? scope.row.SingleDosage  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="用法" width="160" align="center">
+            <el-table-column  label="用法" width="160" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Usage  ? scope.row.Usage  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="频率" width="160" align="center">
+            <el-table-column  label="频率" width="160" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Frequency  ? scope.row.Frequency  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="天数" width="160" align="center">
+            <el-table-column  label="天数" width="140" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Days  ? scope.row.Days  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="总量" width="160" align="center">
+            <el-table-column  label="总量" width="140" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Total  ? scope.row.Total  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="开立医生" width="160" align="center">
+            <el-table-column  label="开立医生" width="150" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Doctor  ? scope.row.Doctor  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="数据来源" width="162" align="center">
+            <el-table-column  label="数据来源" width="162" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.DataSources  ? scope.row.DataSources  : ""}}</span>
+              </template>
             </el-table-column>
-            <el-table-column prop="name" label="备注" width="170" align="center">
+            <el-table-column  label="备注" width="170" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.Remarks  ? scope.row.Remarks  : ""}}</span>
+              </template>
             </el-table-column>
           </el-table>
         </div>
-        <div style="margin-top: 25px">诊断时间：2022-05-07 19:22:16</div>
+<!--        <div v-if="state == 2" style="margin-top: 25px">诊断时间：{{ timedate }}</div>-->
       </div>
+      <el-dialog
+        title="设置"
+        :visible.sync="dialogVisible"
+        width="30%">
+        <span>请选择药品是否要通过药房管理出库</span>
+        <span>
+          <el-radio v-model="is_open" label="1">是</el-radio>
+          <el-radio v-model="is_open" label="2">否</el-radio>
+        </span>
+        <span>
+          若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="SaveSetting">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
 
     <patient-print
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import patientPrint from "./print/patientPrint.vue";
+import { getPharmacyConfig,SaveSetting } from "@/api/his/advice";
+import {
+  waitingdrug,
+  issueddrugs,
+  todaynumber,
+  getpharmacycontent,
+  dispensingmedicine,
+  drugwithdrawal
+} from "@/api/pharmacy"
+const moment = require('moment')
 export default {
   components: {
     BreadCrumb,
   },
   data() {
     return {
+      patient_id:0,
       crumbs: [
-        { path: false, name: "患者发药" },
+        { path: false, name: "药房管理" },
         { path: "/Pharmacy/patiantDispensing", name: "患者发药" },
       ],
       tableHeight: 400,
-      datepick: "",
-      state: 1,
-      waitmount: 0,
-      alreadmount: 0,
+      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      state: 1,//1待发药，2已发药
+      waitmount: 0,//待发药人数
+      waitmount_data: [],
+      alreadmount: 0,//已发药人数
+      alreadmount_data: [],
       keywords: "",
       tableData: [],
       propsTable: [],
       tableData_list: [],
       isVisibility: false,
+      currentRow:null,
+      dialogVisible:false,
+      is_open:"2",
     };
   },
   watch: {
   },
-
+  created() {
+    this.init();
+    this.gettodaynumber();
+    this.fun3();
+    // this.getwaitmount();//fun3
+    // this.selectedbydefault();
+  },
   methods: {
+    tiaoshi(){
+      console.log("this.tableData",this.tableData)
+    },
+    async fun3(){
+      console.log("fun3")
+        this.fun1().then(val => {
+          this.fun2();
+        })
+    },
+    async fun4(tmp){
+      console.log("fun3")
+      this.fun1().then(val => {
+        console.log("this.alreadmount_data",this.alreadmount_data)
+        for (let i = 0;i < this.alreadmount_data.length;i++){
+          console.log("tmp = ",tmp)
+          if (this.alreadmount_data[i].PatientID == tmp){
+            console.log("i = ",i)
+            this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
+            this.handleCurrentChange(this.alreadmount_data[i])
+          }
+        }
+      })
+    },
+    async fun5(tmp){
+      console.log("fun3")
+      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.handleCurrentChange(this.waitmount_data[i])
+          }
+        }
+      })
+    },
+
+    lala(){
+      console.log("this.state!!!!!!",this.state)
+      //初始化状态
+      this.tableData = null
+      this.currentRow = null
+      this.selectedbydefault()
+    },
+    //选中行数
+    handleCurrentChange(val) {
+      this.currentRow = val;
+      console.log("this.currentRow",this.currentRow)
+      if(this.state == 1){
+        this.getpatientdetails(0)
+      }
+      if(this.state == 2){
+        this.getpatientdetails(1)
+      }
+    },
+    init(){
+      // console.log("初始化了")
+      this.state = 1
+      this.tableData = null
+      this.currentRow = null
+    },
+    testsss(){
+     this.state = 1;
+    },
+    //默认选中的
+    selectedbydefault(){
+      if(this.state == 1 && this.waitmount_data.length > 0){
+        this.$refs.table01.setCurrentRow(this.waitmount_data[0]);
+        this.handleCurrentChange(this.waitmount_data[0])
+      }
+      if(this.state == 2 && this.alreadmount_data.length >0){
+        this.$refs.table02.setCurrentRow(this.alreadmount_data[0]);
+        this.handleCurrentChange(this.alreadmount_data[0])
+      }
+    },
+    //包装selectedbydefault
+    fun2(){
+      console.log("3333333this.waitmount_data",this.waitmount_data)
+      // return new Promise((resolve, reject) => {
+        if(this.state == 1 && this.waitmount_data.length > 0){
+          this.$refs.table01.setCurrentRow(this.waitmount_data[0]);
+          this.handleCurrentChange(this.waitmount_data[0])
+        }
+        if(this.state == 2 && this.alreadmount_data.length >0){
+          this.$refs.table02.setCurrentRow(this.alreadmount_data[0]);
+          this.handleCurrentChange(this.alreadmount_data[0])
+        }
+      // });
+    },
+    changeTimes(){
+      this.gettodaynumber();
+      this.getwaitmount();
+      this.fun3();
+    },
+    //获取当天发药的人数
+    gettodaynumber(){
+      console.log("aaa")
+      var params = {
+        time: this.start_time,
+      }
+      todaynumber(params).then((res) => {
+        if (res.data.state == 1){
+          this.waitmount = res.data.data.itotal;
+          this.alreadmount = res.data.data.wtotal;
+        }
+      })
+      // console.log("2222222")
+    },
+    //获取发药人列表
+    getwaitmount(){
+      var params = {
+        keyword: this.keywords,
+        time: this.start_time,
+      }
+      waitingdrug(params).then((res) => {
+        if (res.data.state == 1){
+          this.waitmount_data = res.data.data.list;
+        }
+      })
+      issueddrugs(params).then((res) => {
+        if (res.data.state == 1){
+          this.alreadmount_data = res.data.data.list;
+        }
+      })
+    },
+    //包装getwaitmount
+    async fun1(){
+      // return new Promise((resolve, reject) => {
+        var params = {
+          keyword: this.keywords,
+          time: this.start_time,
+        }
+        await waitingdrug(params).then((res) => {
+          if (res.data.state == 1){
+            this.waitmount_data = res.data.data.list;
+            console.log("1111111")
+          }
+        })
+        await issueddrugs(params).then((res) => {
+          if (res.data.state == 1){
+            this.alreadmount_data = res.data.data.list;
+            console.log("1111111s")
+          }
+        })
+        console.log("222222222")
+
+      // })
+    },
+    //获取患者信息详情
+    getpatientdetails(val){
+      var params = {
+        patient_id:this.currentRow.PatientID,
+        is_medicine: val,
+        time:this.start_time,
+      }
+      getpharmacycontent(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+        }else{
+          this.$message.error(res.data.msg);
+        }
+      })
+    },
     // 跳转打印页面
     toPrint() {
-      // this.$router.push({ path: "/Pharmacy/print/patientPrint" });
-      this.$refs.patientprint.show();
+      if (this.tableData == null){
+        this.$message.error("未选择任何数据");
+        return
+      }
+      this.$refs.patientprint.show(this.tableData,this.currentRow,this.state);
     },
 
     // 搜索患者
-    searchAction() {},
+    searchAction() {
+      this.tableData = null;
+      this.getwaitmount();
+    },
 
     // 药品发药
     dispense() {
-      var params = {};
+      var tmp = this.currentRow.PatientID;
+      var params = {
+        patient_id:this.currentRow.PatientID,
+        time:this.start_time,
+      };
       this.$confirm("确定是否对该药品进行发药?", "患者发药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {})
-        .catch(() => {});
+      }).then(() => {
+        dispensingmedicine(params).then((res) => {
+          if(res.data.state == 1){
+            this.$message.success('操作成功');
+            this.gettodaynumber();
+            this.searchAction();
+            this.tableData = null;
+            this.fun4(tmp);
+            this.state = 2;
+            // console.log("this.alreadmount_data",this.alreadmount_data)
+            // for (let i = 0;i < this.alreadmount_data.length;i++){
+            //   console.log("tmp = ",tmp)
+            //     if (this.alreadmount_data[i].PatientID == tmp){
+            //       console.log("i = ",i)
+            //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
+            //       this.handleCurrentChange(this.alreadmount_data[i])
+            //     }
+            // }
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })
+      }).catch(() => {});
     },
 
+    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(){
+      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
+        }
+      })
+    },
     // 药品退药
     endispense() {
-      var params = {};
+      var tmp = this.currentRow.PatientID;
+      var params = {
+        patient_id:this.currentRow.PatientID,
+        time:this.start_time,
+      };
       this.$confirm("确定是否对该药品进行退药?", "患者退药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {})
-        .catch(() => {});
+      }).then(() => {
+        drugwithdrawal(params).then((res) => {
+          if(res.data.state == 1){
+            this.$message.success('操作成功');
+            this.gettodaynumber();
+            this.searchAction();
+            this.tableData = null;
+            this.fun4(tmp);
+            this.state = 1;
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })
+      }).catch(() => {});
     },
   },
-  created() {},
+
 };
 </script>
 
     justify-content: flex-end;
   }
 }
-</style>
+</style>

src/xt_pages/Pharmacy/print/details.vue

-<template>
+<template><!--发药明细详情-->
   <el-dialog
-    title="打印"
+    title="详情"
     :visible.sync="visibility"
     :close-on-click-modal="isClose"
     :close-on-press-escape="isClose"
   >
-    <el-button type="primary" @click="print" class="print_style"
-      >打印</el-button
-    >
+<!--    <el-button type="primary" @click="print" class="print_style">详情</el-button>-->
+<!--    <el-button  @click="lili" >调试</el-button>-->
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
       <!-- <div class="list_title">
         <div>药品名称：</div>
         <div>发药状态：</div>
         <div v-if="state==2">领药人：</div>
       </div> -->
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="处方详情" name="first">
-          <el-tabs v-model="editableTabsValue" type="card">
-            <el-tab-pane
-              :key="item.name"
-              v-for="(item, index) in editableTabs"
-              :label="item.title"
-            >
-              Rp
-              <el-table
+      <el-table
                 style="width: 1020px; margin: 0 auto"
-                :data="tableData"
+                :data="list"
                 border
                 max-height="450"
                 :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
               >
-                <el-table-column prop="name" label="名称" width="160" align="center">
-                </el-table-column>
-                 <el-table-column prop="group" label="组" width="100" align="center">
+                <el-table-column prop="Drugname" label="名称" width="160" align="center">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.Drugname  ? scope.row.Drugname  : ""}}</span>
+                  </template>
                 </el-table-column>
                 <el-table-column prop="SingleDosage" label="单次用量" width="100" 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">
+                <el-table-column prop="Usage" 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="frequency" label="频率" width="120" align="center">
+                <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">
+                <el-table-column prop="Days" 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="amount" label="总量" width="90" align="center">
+                <el-table-column prop="Total" label="总量" width="90" align="center">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.Total  ? scope.row.Total  : ""}}</span>
+                  </template>
                 </el-table-column>
-                <el-table-column prop="price" label="单价" width="100" align="center">
+                <el-table-column prop="UnitPrice" label="单价" width="100" align="center">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.UnitPrice  ? scope.row.UnitPrice  : ""}}</span>
+                  </template>
                 </el-table-column>
-                <el-table-column prop="tips" label="备注" width="120" align="center">
+                <el-table-column prop="Remarks" label="备注" width="120" align="center">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.Remarks  ? scope.row.Remarks  : ""}}</span>
+                  </template>
                 </el-table-column>
               </el-table>
-            </el-tab-pane>
-          </el-tabs>
-        </el-tab-pane>
-        <el-tab-pane label="病历详情" name="second">病历详情</el-tab-pane>
-      </el-tabs>
+<!--        <el-tab-pane label="病历详情" name="second">病历详情</el-tab-pane>-->
     </div>
   </el-dialog>
 </template>
 import Vue from "vue";
 import print from "print-js";
 import printutils from "./print.js";
+import {
+  prescriptiondetails
+} from "@/api/pharmacy"
 
 export default {
   data() {
       isClose: false,
       activeName: "first",
       editableTabsValue: "2",
-      editableTabs: [
-        {
-          title: "处方1",
-        },
-        {
-          title: "处方2",
-        },
-      ],
+      editableTabs: [],//名字
+      // dialysisTabs: [],//名字
+      dialysisName:"",
       tabIndex: 2,
+      list:[],
     };
   },
   props: {
         }
       }
     },
+    init(){
+      console.log("初始化中。。。。。。。。。。")
+      this.dialysisName = "";
+      this.list = [];
+      this.editableTabs = [];
+    },
     show: function () {
       this.visibility = true;
+      console.log("this.visibility",this.visibility)
+      this.init();
+    },
+    lili(){
+      console.log("this.list",this.list)
+      let v = [];
+      //key
+      for (let k in this.list){
+        v.push(k);
+        console.log("k",k)
+        console.log("v",this.list[k])
+        console.log("editableTabs",this.editableTabs)
+        for(let i = 0;i < this.list[k].length;i++){
+          this.editableTabs.push(this.list[k][i])
+        }
+      }
+
+    },
+    //发药明细详情
+    drugdetails(data){
+      console.log("aaaaaaaaaaaaa")
+      var params = {
+        patient_id: data.PatientID,
+        record_date: data.RecordTime,
+      }
+      prescriptiondetails(params).then((res) => {
+        if (res.data.state == 1){
+            this.list = res.data.data.list;
+            this.lili();
+        }else{
+          this.$message.error(res.data.msg);
+        }
+      })
+
     },
 
     comfirm: function (formName) {
       Vue.prototype.printJson = printutils.printJson;
       this.printJson({
         // title: ``, // 打印出来的标题
-        data: this.tableData, // 需要打印的数据
+        data: this.list, // 需要打印的数据
         serial: false, // 是否需要打印序列号
         fields: [
           // 需要打印的字段
 
-          "name",
-          "group",
+          "Drugname",
           "SingleDosage",
-          "use",
-          "frequency",
-          "day",
-          "amount",
-          "price",
-          "tips",
+          "Usage",
+          "Frequency",
+          "Days",
+          "Total",
+          "UnitPrice",
+          "Remarks",
         ],
         properties: [
           // 需要打印的字段对应的表头名
 
           {
-            field: "name",
+            field: "Drugname",
             displayName: "名称",
-          },
-            {
-            field: "group",
-            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: "price",
+            field: "UnitPrice",
             displayName: "单价",
           },
-          
+
           {
-            field: "tips",
+            field: "Remarks",
             displayName: "备注",
           },
         ],

src/xt_pages/Pharmacy/print/drugPrint.vue

     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
       <div class="list_title">
-        <div>药品名称：</div>
-        <div>规格：</div>
-        <div>发药状态：</div>
-        <div v-if="state==2">领药人：</div>
+        <div>药品名称：{{name}}</div>
+        <div>规格：{{specifications}}</div>
+        <div>发药状态：{{state_name}}</div>
+<!--        <div v-if="state==2">领药人：</div>-->
       </div>
 
       <el-table
         <el-table-column type="index" prop="index" label="序号" width="60">
         </el-table-column>
         <el-table-column prop="name" label="患者姓名" width="160">
+          <template  slot-scope="scope">
+            {{scope.row.name}}
+          </template>
         </el-table-column>
-        <el-table-column prop="SingleDosage" label="单次用量" width="120">
+        <el-table-column prop="single_dosage" label="单次用量" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.single_dosage}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="usage" label="用法" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.usage}}
+          </template>
         </el-table-column>
-        <el-table-column prop="use" label="用法" width="120"> </el-table-column>
         <el-table-column prop="frequency" label="频率" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.frequency}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="days" label="天数" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.days}}
+          </template>
         </el-table-column>
-        <el-table-column prop="day" label="天数" width="120"> </el-table-column>
-        <el-table-column prop="amount" label="总量" width="120">
+        <el-table-column prop="total" label="总量" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.total}}
+          </template>
         </el-table-column>
-        <el-table-column prop="tips" label="数据来源" width="120">
+        <el-table-column prop="data_sources" label="数据来源" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.data_sources}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="people" label="领药人" width="120">
+          <template  slot-scope="scope">
+            {{scope.row.people}}
+          </template>
         </el-table-column>
       </el-table>
     </div>
   data() {
     return {
       visibility: false,
-      tableData: [{}],
-      isClose:false
+      tableData: [],
+      isClose:false,
+      name:"",
+      specifications:"",
+      state_name:"",
     };
   },
   props: {
         }
       }
     },
-    show: function () {
+    show: function (val,data,state,ids) {
       this.visibility = true;
+      this.name = data.name
+      this.specifications = data.specifications
+      console.log("this.multipleSelection",ids)
+      console.log("this.val",val)
+      if (state == 1){
+        this.state_name = "待发药"
+        this.tableData = ids
+      }
+      if (state == 2){
+        this.state_name = "已发药"
+        this.tableData = val
+      }
     },
 
     comfirm: function (formName) {
       //   });
       this.printJson({
         title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
-        <div style="width: 230px;padding: 10px 0;">药品名称：${1}</div>
-        <div style="width: 230px;padding: 10px 0;">规格：${1}</div>
-        <div style="width: 230px;padding: 10px 0;">发药状态：${1}</div>
+        <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>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
           // 需要打印的字段
 
           "name",
-          "SingleDosage",
-          "use",
+          "single_dosage",
+          "usage",
           "frequency",
-          "day",
-          "amount",
-          "tips",
+          "days",
+          "total",
+          "data_sources",
+          "people",
         ],
         properties: [
           // 需要打印的字段对应的表头名
             displayName: "姓名",
           },
           {
-            field: "SingleDosage",
-            displayName: "单词用量",
+            field: "single_dosage",
+            displayName: "单次用量",
           },
           {
-            field: "use",
+            field: "usage",
             displayName: "用法",
           },
           {
             displayName: "频率",
           },
           {
-            field: "day",
+            field: "days",
             displayName: "天数",
           },
           {
-            field: "amount",
+            field: "total",
             displayName: "总量",
           },
           {
-            field: "tips",
-            displayName: "备注",
+            field: "data_sources",
+            displayName: "数据来源",
+          },
+          {
+            field: "people",
+            displayName: "领药人",
           },
         ],
       });

src/xt_pages/Pharmacy/print/patientPrint.vue

     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
       <div class="list_title">
-        <div>患者名称：</div>
-        <div>数据来源：</div>
-        <div>发药状态：</div>
-        <div>领药时间：</div>
+        <div>患者名称：{{name}}</div>
+        <div>发药状态：{{state}}</div>
       </div>
 
       <el-table
         <el-table-column type="index" prop="index" label="序号" width="60">
         </el-table-column>
         <el-table-column prop="name" label="名称" width="160">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Name ? scope.row.Name : ""}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="SingleDosage" label="单次用量" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.SingleDosage ? scope.row.SingleDosage : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="use" label="用法" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Usage ? scope.row.Usage : ""}}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="use" label="用法" width="120"> </el-table-column>
         <el-table-column prop="frequency" label="频率" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Frequency ? scope.row.Frequency : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="day" label="天数" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Days ? scope.row.Days : ""}}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="day" label="天数" width="120"> </el-table-column>
         <el-table-column prop="amount" label="总量" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Total ? scope.row.Total : ""}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="tips" label="数据来源" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.DataSources ? scope.row.DataSources : ""}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="tips" label="备注" width="120">
+          <template slot-scope="scope" >
+            <span>{{scope.row.Remarks ? scope.row.Remarks : ""}}</span>
+          </template>
         </el-table-column>
       </el-table>
     </div>
   data() {
     return {
       visibility: false,
-      tableData: [{}],
-      isClose:false
+      tableData: [],
+      isClose:false,
+      name:"",
+      state:null,
     };
   },
   props: {
         }
       }
     },
-    show: function () {
+    show: function (val,data,state) {
       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) {
       //   });
       this.printJson({
         title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
-        <div style="width: 230px;padding: 10px 0;">患者名称：${1}</div>
-        <div style="width: 230px;padding: 10px 0;">数据来源：${1}</div>
-        <div style="width: 230px;padding: 10px 0;">预约状态：${1}</div>
-        <div style="width: 230px;padding: 10px 0;">领药时间：${1}</div>
+        <div style="width: 230px;padding: 10px 0;">患者名称：${this.name}</div>
+        <div style="width: 230px;padding: 10px 0;">发药状态：${this.state}</div>
         </div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
         fields: [
           // 需要打印的字段
 
-          "name",
+          "Name",
           "SingleDosage",
-          "use",
-          "frequency",
-          "day",
-          "amount",
-          "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: "tips",
+            field: "DataSources",
+            displayName: "数据来源",
+          },
+          {
+            field: "Remarks",
             displayName: "备注",
           },
         ],

src/xt_pages/data/components/addDrugs.vue

                     <el-form-item label="是否统计工作量:" prop="is_statistics_work">
                         <el-select v-model="form.is_statistics_work" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
+                                    v-for="(item,index) in options"
                                     :key="index"
                                     :label="item.label"
                                     :value="item.value">
                     <el-form-item label="是否收费常用项:" prop="is_charge_use">
                         <el-select v-model="form.is_charge_use" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
+                                    v-for="(item,index) in options"
                                     :key="index"
                                     :label="item.label"
                                     :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="是否通过药房发药:" prop="">
-                        <el-select v-model="form.is_charge_use" style="width:160px;" placeholder="请选择">
+                    <el-form-item label="是否通过药房发药:" prop="is_pharmacy">
+                        <el-select v-model="form.is_pharmacy" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
-                                    :key="index"
+                                    v-for="item in Pharmacy"
+                                    :key="item.value"
                                     :label="item.label"
                                     :value="item.value">
                             </el-option>
           { id: 2, name: '特殊护理' },
           { id: 3, name: '抗凝剂' }
         ],
-        options: [{
+        options: [
+          {
           value: '1',
           label: '是'
-        }, {
+          },
+          {
           value: '2',
           label: '否'
-        }],
+          }
+        ],
+        Pharmacy: [
+          {
+            value: 1,
+            label: '是'
+          },
+          {
+            value: 0,
+            label: '否'
+          }
+        ],
         lmt_used_flags: [{
           id: 0,
           name: '否'
           is_user:"2",
           sum_count:"",
           sum_in_count:"",
+          is_pharmacy:0,//是否通过药房发药
         },
 
         rules: {
         this.form.intro = ''
       },
       show(id, obj) {
-        console.log("obj3223323232332",obj)
         this.unitList = []
         this.packingUnit = []
         var arr =  getDataConfig('hemodialysis','units')
         form['is_user'] = this.form.is_user
         form['sum_count'] = this.form.sum_count
         form['sum_in_count'] = this.form.sum_in_count
+        form['is_pharmacy'] = this.form.is_pharmacy
         return form
       },
       getlist() {

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

         :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> -->
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
         <el-button @click="hideForm">取 消</el-button>
         <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(选择医嘱名称前)保 存1-->
-        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(选择医嘱名称后)保 存2-->
+        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(编辑医嘱存2-->
       </div>
       <!-- 医嘱表单 end -->
     </el-dialog>
       }
       ,
       openDeleteGroupAdvice(val) {
+        if(this.currentRow.is_medicine == 1){
+          this.$message.error('已发药，不可删除')
+          return
+        }
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要删除的医嘱内容')
           return
       }
       ,
       openNewChildTwo(index, row) {
+        if(this.currentRow.is_medicine == 1){
+          this.$message.error('已发药,不可操作')
+          return
+        }
         this.currentRow = row
         if (this.currentRow == null) {
           this.$message.error('请先选择要新增子药的医嘱！')
       ,
 
       openEdit(index, row) {
+        console.log("lilili",this.currentRow)
+        if(this.currentRow.is_medicine == 1){
+          this.$message.error('已发药不可修改')
+          return
+        }
         if (row.stop_state == 1 || row.execution_state == 1) {
           this.$message.error('所选医嘱已停止或执行')
           return false
           advice_doctor: row.advice_doctor,
           remark: row.remark,
           parent_id: row.parent_id,
-          drug_id:0,
-          way:0,
+          drug_id:row.drug_id,
+          way:row.way,
           drug_name_id:0,
         }
       }
       ,
 
       openEditGroupAdvice() {
+        console.log("thissssss",this.currentRow)
+        if(this.currentRow.is_medicine == 1){
+          this.$message.error('已发药不可修改')
+          return
+        }
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要修改的医嘱内容')
           return
       }
       ,
       openDelete(index, row) {
+        if(this.currentRow.is_medicine == 1){
+          this.$message.error('已发药不可删除')
+          return
+        }
         this.currentRow = row
         this.$confirm('确认删除此条医嘱?', '医嘱删除', {
           confirmButtonText: '确定',
       ,
       getAdviceContent(row, isChild) {
         // alert("来")
+        console.log("this.doctor_advices",this.doctor_advices)
         console.log("row",row)
         console.log("isChild",isChild)
         let tempSingleDoseDesc = ''

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

     </div>
 
     <div class="app-container" v-loading="loading">
-    
+
       <drugs-stock-dialog
         ref="dialog"
         :propForm="propForm"
         </el-date-picker>
       </div>
 
-      
+
    <!-- 编辑入库单详情 -->
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
                     :disabled="disabled"
-                   
+
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
               </el-form-item>
             </template>
           </el-table-column>
-       
+
          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>药品类型</span>
                   :key="index"
                   :label="option.name"
                   :value="option.id"
-                  
+
                   >
                 </el-option>
                </el-select>
                 </el-form-item>
               </template>
          </el-table-column>
-       
-                   
+
+
          <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
                   v-model="scope.row.retail_price"
                   :disabled="disabled"
                 ></el-input>
-               
+
               </el-form-item>
             </template>
           </el-table-column>
                     v-model="scope.row.last_price"
                     :disabled="disabled"
                   ></el-input>
-                
+
                 </el-form-item>
               </template>
           </el-table-column>
 
           <el-table-column label="总价(元)" align="center" width="80">
             <template slot-scope="scope">
-              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
-    
+
 
          <el-table-column  width="180" align="center">
              <template slot="header" slot-scope="scope">
             </template>
           </el-table-column>
 
-             
+
           <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
                <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled="disabled">
                </el-select>
             </template>
           </el-table-column>
-       
+
 
           <el-table-column label="经销商" width="140" align="center">
             <template slot-scope="scope">
             </template>
           </el-table-column>
 
-          
+
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
               </el-form-item>
             </template>
           </el-table-column>
- 
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark" :disabled="disabled"></el-input>
   methods: {
     comfirm: function(val) {
       this.$refs.dialog.hide();
-   
+
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0 ; i--) {
           if (i == 0) {
       return name;
     },
     specificationName: function(drug_id) {
- 
+
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
         return "";
       }
     },
-    
+
     back() {
       this.$router.go(-1);
     },
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }
-             
+
              if(this.recordInfo.recordData[i].manufacturer == ""){
                this.recordInfo.recordData[i].manufacturer = 0
              }
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].last_price.toString()
 
              this.recordInfo.recordData[i].retail_price = this.recordInfo.recordData[i].retail_price.toString()
-          
+
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
               }
             }
-            
+
           }
           const params = {
             stockIn: this.recordInfo.recordData
           this.$message.error(response.data.msg);
           return false;
         } else {
-       
+
           var manufacturerList = response.data.data.manufacturerList
           this.manufacturerList = manufacturerList
           var dealerList  = response.data.data.dealerList
-        
+
           this.dealerList = dealerList
-         
+
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
             response.data.data.info[i].retail_price = response.data.data.info[i].retail_price.toString();
 
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
-             
+
             response.data.data.info[i].name = response.data.data.info[i].drug.dose + response.data.data.info[i].drug.dose_unit+"*"+response.data.data.info[i].drug.min_number+ response.data.data.info[i].drug.min_unit+"/"+response.data.data.info[i].drug.max_unit
 
             response.data.data.info[i].lot_number = response.data.data.info[i].number
            if(response.data.data.info[i].dealer == 0){
                response.data.data.info[i].dealer = ""
             }
-          
+
             this.recordInfo.recordData.push(response.data.data.info[i]);
-           
+
             for(let j=0;j<manufacturerList.length;j++){
               if(response.data.data.info[i].manufacturer == manufacturerList[j].id){
                  response.data.data.info[i].manufacturer = manufacturerList[j].manufacturer_name
           if (response.data.state == 1) {
              searchArray = response.data.data.list;
              var list = response.data.data.list
-         
+
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
              var dealerList = response.data.data.dealerList
              this.dealerList = dealerList
              for(let i=0;i<this.drugList.length;i++){
-               
+
                 for(let j=0;j<this.manufacturerList.length;j++){
                   if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
                      this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
                   if(this.drugList[i].dealer == this.dealerList[z].id){
                       this.drugList[i].dealer = this.dealerList[z].dealer_name
                   }
-               
+
                 }
              }
              cb(this.drugList)
              }else{
                this.recordInfo.recordData[i].retail_price = val.min_price
              }
-           
+
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
              }else{
                this.recordInfo.recordData[i].dealer =  val.dealer
              }
-            
+
            }
         }
       },
     },
   },
   created() {
-   
-    this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+
+    this.drugTypeList = getDictionaryDataConfig('system','drug_type')
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

       }
     },
     created(){
-      console.log("药品类型",this.propForm)
+      console.log("药品类型.",this.propForm)
     },
     methods: {
       hide: function() {
 
       },
       comfirm: function(formName) {
-       
+
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
       //   for (let i = 0; i < searchArr.length; i++) {
       //     this.goodInfoTableData.push(searchArr[i])
       //   }
-      // }, 
+      // },
       search:function() {
        if (this.keywords.length <= 0) {
           this.$message.error('搜索关键字不能为空')
-        } 
-        const searchArr = [] 
+        }
+        const searchArr = []
         for(let i=0;i<this.propForm.goods.length;i++){
            if(this.propForm.goods[i].drug_name.indexOf(this.keywords)!=-1){
               searchArr.push(this.propForm.goods[i])
            }
-        } 
+        }
         this.propForm.goods = []
         this.propForm.goods.push(...searchArr)
          console.log("2333333",this.propForm.goods)

src/xt_pages/stock/drugs/query.vue

           >搜索
           </el-button> -->
       </div>
-
+<!--      <el-button @click="lili()">调试</el-button>-->
       <el-table
         :data="tableList"
         border
   },
 
   methods: {
+    lili(){
+      console.log("调试：this.tanlelist",this.tableList)
+    },
     //获取库存
     getlist() {
       const params = {
       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) {
           min_str = (total % min_number) + min_unit;
         }
       }
+      console.log("这是什么！！！！！",max_str + min_str)
       return max_str + min_str;
     },
     getOutFlushNight(

src/xt_pages/user/components/EditGroupAdvice.vue

       this.nameFormTitle = "添加子药内容";
     },
     openGroupAdvice(isEdit) {
-     
+
       this.isChild = false;
       if (isEdit) {
         if (this.groupSelectRow === null) {

src/xt_pages/user/doctorAdvice.vue

           icon="el-icon-printer"
           >打印
         </el-button>
+<!--        <el-button @click=lili()>调试</el-button>-->
       </div>
       <div class="cell clearfix">
         <el-input
       });
     },
     submitNewAdvice(formName, action) {
+      console.log("kkkthis.adviceForm",this.adviceForm)
       this.$refs[formName].validate(valid => {
         if (valid) {
           let mode = "";
               var arr = this.adviceForm.advice_name.split("(自备药)")
               this.adviceForm.advice_name = arr[0]
           }
-          console.log("222222",this.adviceForm)
+          console.log("222222???????this.adviceForm",this.adviceForm)
 
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
         execution_frequency: row.execution_frequency,
         advice_doctor: row.advice_doctor,
         remark: "",
-        parent_id: row.parent_id > 0 ? row.parent_id : row.id
+        parent_id: row.parent_id > 0 ? row.parent_id : row.id,
+        drug_id:""
       };
       this.dialogFormVisible = true;
     },
         this.nameForm.delivery_way = tmp.delivery_way//给药途径
         this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
         this.nameForm.drug_id = tmp.id
+        console.log("isiisisthis.adviceForm",this.adviceForm)
+        this.adviceForm.drug_id = tmp.id
       }
   },
   watch: {