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

src/api/config.js

@@ -186,3 +186,11 @@ export function changeStockSetting(params) {
     params: params
   })
 }
+
+export function changeAdviceConfig(params) {
+  return request({
+    url: '/api/changeadviceconfig',
+    method: 'get',
+    params: params
+  })
+}

src/api/deposit.js

@@ -0,0 +1,172 @@
+import request from '@/utils/request'
+
+//获取患者押金列表=
+export function getuserlist(params) {
+  return request({
+    url: '/api/his/getuserlist',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取病例中心，有效患者名称=
+export function gethisuser(params) {
+  return request({
+    url: '/api/his/gethisuser',
+    method: 'get',
+    params: params
+  })
+}
+
+//新增押金=
+export function adddeposit(data) {
+  return request({
+    url: '/api/his/adddeposit',
+    method: 'post',
+    data: data
+  })
+}
+
+//新增一条退款申请=
+export function refundapplication(data) {
+  return request({
+    url: '/api/his/refundapplication',
+    method: 'post',
+    data: data
+  })
+}
+
+//更改退款申请=
+export function changerefund(data) {
+  return request({
+    url: '/api/his/changerefund',
+    method: 'post',
+    data: data
+  })
+}
+
+//获取新增押金编号=
+export function getdepositcode(params) {
+  return request({
+    url: '/api/his/getdepositcode',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取退款编号=
+export function getdeletecode(params) {
+  return request({
+    url: '/api/his/getdeletecode',
+    method: 'get',
+    params: params
+  })
+}
+
+//充值明细列表=
+export function rechargedetails(params) {
+  return request({
+    url: '/api/his/rechargedetails',
+    method: 'get',
+    params: params
+  })
+}
+
+//押金审核=
+export function updeposit(params) {
+  return request({
+    url: '/api/his/updeposit',
+    method: 'get',
+    params: params
+  })
+}
+
+//押金删除=
+export function deletehistory(params) {
+  return request({
+    url: '/api/his/deletehistory',
+    method: 'get',
+    params: params
+  })
+}
+
+//充值汇总列表=
+export function rechargesummary(params) {
+  return request({
+    url: '/api/his/rechargesummary',
+    method: 'get',
+    params: params
+  })
+}
+
+//根据患者id获取押金流水
+export function depositflow(params) {
+  return request({
+    url: '/api/his/depositflow',
+    method: 'get',
+    params: params
+  })
+}
+
+//扣费明细查询=
+export function deductiondetails(params) {
+  return request({
+    url: '/api/his/deductiondetails',
+    method: 'get',
+    params: params
+  })
+}
+
+//扣费汇总=
+export function desummary(params) {
+  return request({
+    url: '/api/his/desummary',
+    method: 'get',
+    params: params
+  })
+}
+
+//根据患者id查询患者的余额=
+export function idtobalance(params) {
+  return request({
+    url: '/api/his/idtobalance',
+    method: 'get',
+    params: params
+  })
+}
+
+//退款审核通过/拒绝=
+export function refundreview(params) {
+  return request({
+    url: '/api/his/refundreview',
+    method: 'get',
+    params: params
+  })
+}
+
+//退款删除=
+export function deleterefund(params) {
+  return request({
+    url: '/api/his/deleterefund',
+    method: 'get',
+    params: params
+  })
+}
+
+//退款分页=
+export function refundlist(params) {
+  return request({
+    url: '/api/his/refundlist',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取机构名称
+export function getorgname(params) {
+  return request({
+    url: '/api/his/getorgname',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/his.js

@@ -17,7 +17,6 @@ export function getPatientInfo(params) {
 }
 
 export function createCaseHistory(params) {
-  console.log('params', params)
   return request({
     url: '/api/doctorworkstation/casehistory/create',
     method: 'get',
@@ -630,8 +629,6 @@ export function getHisHospitalDetailInfo(params) {
   })
 }
 
-
-
 export function getMonthHisHospitalDetailInfo(params) {
   return request({
     url: '/api/monthhospitaldetail/get',
@@ -640,8 +637,6 @@ export function getMonthHisHospitalDetailInfo(params) {
   })
 }
 
-
-
 export function getYidiClearRecord(params) {
   return request({
     url: '/api/his/getyidiclear',
@@ -658,6 +653,3 @@ export function getBatchPrint(params) {
   })
 }
 
-
-
-

src/xt_pages/DepositManagement/DeductionDetailsSummary.vue

@@ -13,14 +13,14 @@
             <DeductionSummary></DeductionSummary>
           </el-tab-pane>
         </el-tabs>
-        <div
-          style="position: absolute; top: 80px; right: 40px"
-          v-if="activeName == 'first'"
-        >
-          <el-button size="small" type="primary" @click="Add()">
-            新增
-          </el-button>
-        </div>
+<!--        <div-->
+<!--          style="position: absolute; top: 80px; right: 40px"-->
+<!--          v-if="activeName == 'first'"-->
+<!--        >-->
+<!--          <el-button size="small" type="primary" @click="Add()">-->
+<!--            新增-->
+<!--          </el-button>-->
+<!--        </div>-->
       </div>
       <el-dialog
         title="新增押金"
@@ -106,4 +106,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/DepositRefund.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  退款列表-->
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
@@ -34,18 +35,18 @@
                 style="width: 200px; margin-left: 10px"
                 class="filter-item"
                 placeholder="请输入编号/患者名称"
-                v-model.trim="keywords"
+                v-model.trim="keyword"
               />
             </div>
 
             <div style="margin-right: 30px">
               退款类型：
-              <el-select v-model="value" placeholder="请选择">
+              <el-select v-model="refundtype" placeholder="请选择" @change="updaterefundtype">
                 <el-option
-                  v-for="item in [1, 2]"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                  v-for="item in refundtypelist"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
                 >
                 </el-option>
               </el-select>
@@ -53,12 +54,12 @@
 
             <div style="margin-right: 30px">
               审核状态：
-              <el-select v-model="status" placeholder="请选择">
+              <el-select v-model="examinetype" placeholder="请选择" @change="updateexaminetype">
                 <el-option
-                  v-for="item in [1, 2]"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                  v-for="item in examinelist"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
                 >
                 </el-option>
               </el-select>
@@ -67,11 +68,13 @@
             <div style="width: 465px">
               <span>日期查询：</span>
               <el-date-picker
-                v-model="date"
+                v-model="value1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
               >
               </el-date-picker>
             </div>
@@ -99,43 +102,44 @@
 
           <el-table-column label="申请编号" align="center">
             <template slot-scope="scope">
-              <span></span>
+              <span>{{scope.row.deposit_code  ? scope.row.deposit_code  : ""}}</span>
             </template>
           </el-table-column>
           <el-table-column label="患者名称" align="center">
             <template slot-scope="scope">
-              <span></span>
+              <span>{{scope.row.his_name  ? scope.row.his_name  : ""}}</span>
             </template>
           </el-table-column>
 
           <el-table-column label="退款类型" align="center">
             <template slot-scope="scope">
-              <span></span>
+<!--              <span>{{scope.row.deposit_code  ? scope.row.deposit_code  : ""}}</span>-->
+              <span v-if="scope.row.deposit_status == 3">手动退款</span>
+              <span v-if="scope.row.deposit_status == 4">自动退费</span>
             </template>
           </el-table-column>
           <el-table-column label="退款金额" align="center">
             <template slot-scope="scope">
-              <span></span>
+              <span>{{scope.row.deposit  ? scope.row.deposit  : ""}}</span>
             </template>
           </el-table-column>
           <el-table-column label="退款状态" align="center">
             <template slot-scope="scope">
-              <span></span>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" align="center">
-            <template slot-scope="scope">
-              <span></span>
+<!--              <span>{{scope.row.deposit_code  ? scope.row.deposit_code  : ""}}</span>-->
+              <span v-if="scope.row.trial_status == 0 && scope.row.deposit_status == 3">未审核</span>
+              <span v-if="scope.row.trial_status == 1 && scope.row.deposit_status == 3">已审核</span>
+              <span v-if="scope.row.trial_status == 2 && scope.row.deposit_status == 3">审核拒绝</span>
+              <span v-if="scope.row.deposit_status == 4">-</span>
             </template>
           </el-table-column>
           <el-table-column label="申请人" align="center">
             <template slot-scope="scope">
-              <span></span>
+              <span>{{scope.row.name  ? scope.row.name  : ""}}</span>
             </template>
           </el-table-column>
           <el-table-column label="申请时间" align="center">
             <template slot-scope="scope">
-              <span></span>
+              <span>{{scope.row.starttime  ? scope.row.starttime  : ""}}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="350px">
@@ -157,7 +161,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div>充值金额合计：<span></span></div>
+<!--        <div>充值金额合计：<span>{{sum}}</span></div>-->
       </div>
 
       <el-dialog
@@ -166,74 +170,243 @@
         width="30%"
         :show-close="close"
       >
-        <refundAdd></refundAdd>
+        <refundAdd ref="refuna_add" v-bind="$attrs"></refundAdd>
         <span slot="footer" class="dialog-footer">
           <el-button @click="pass">审核通过</el-button>
           <el-button type="primary" @click="Submit">保 存</el-button>
         </span>
       </el-dialog>
+
+      <el-dialog
+        title="编辑退款"
+        :visible.sync="dialogVisible02"
+        width="30%"
+        :show-close="close"
+      >
+        <refundUpdate ref="refuna_up" v-bind="$attrs"></refundUpdate>
+        <span slot="footer" class="dialog-footer">
+<!--          <el-button @click="pass">审核通过</el-button>-->
+          <el-button type="primary" @click="Submit02">保 存</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import refundAdd from "./Template/refundAdd.vue";
+import refundUpdate from "./Template/refundUpdate.vue";
+import {
+  refundlist,
+  deleterefund,
+  refundreview
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
     refundAdd,
+    refundUpdate,
   },
   data() {
     return {
+      refundtypelist:[{name:"全部",value:0},{name:"手动退款",value: 3},{name:"自动退费",value: 4}],
+      examinelist:[{name:"全部",value:3},{name:"未审核",value: 0},{name:"已审核",value: 1},{name:"审核拒绝",value: 2}],
       status: "",
       value: "",
       crumbs: [
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "充值详情" },
       ],
-      tableData: [{}, {}],
-      total: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
+      tableData: [],
+      multipleSelection: [],
+      // total: 0,
+      // page: 1,
+      // limit: 10,
+      keyword: "",
+      value1:"",
+      start_time:"",
+      end_time:"",
+      // sum:"",
       dialogVisible: false,
+      dialogVisible02:false,
       close: false,
-      date:""
+      refundtype: 0,//退款类型
+      examinetype: 3,//审核类型
+
     };
   },
 
+  created(){
+    this.search()
+  },
   methods: {
     // 初始化数据
     init() {},
+    updaterefundtype(){
+      console.log("refundtype",this.refundtype)
+    },
+    updateexaminetype(){
+      console.log("examinetype",this.examinetype)
+    },
 
     // 查询操作
-    search() {},
+    search() {
+      // alert("gagaga")
+      // console.log("value1",this.value1)
+      if (this.value1 != null){
+        if(this.value1[0] != undefined && this.value1[1] != undefined){
+          this.start_time = this.value1[0]
+          this.end_time = this.value1[1]
+        }
+      }else {
+        this.start_time = ""
+        this.end_time = ""
+      }
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        refundtype: this.refundtype,
+        examinetype: this.examinetype,
+      };
+      // console.log("params",params)
+      refundlist(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+        }
+      })
+    },
 
     // 新增
     to_add() {
       this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs['refuna_add'].closePop();
+        this.$refs['refuna_add'].getcode();
+        this.$refs['refuna_add'].getusername();
+      })
     },
 
     // 编辑
-    edit(){},
+    edit(data,val){
+      if(data.trial_status != 0){
+        alert("当前状态不可编辑")
+          return
+      }
+      this.dialogVisible02 = true;
+      this.$nextTick(() => {
+        this.$refs['refuna_up'].getinformation(data, val);
+        this.$refs['refuna_up'].getusername();
+        this.$refs['refuna_up'].updateconfig();
+      })
+    },
 
     // 删除
-    toDelete(){},
+    toDelete(val,index) {
+      var params = {
+        id:val.id,
+      };
+      this.$confirm("是否确定删除?", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        deleterefund(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+          .then(() =>{
+            this.search();
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }).catch(() => {});
+    },
 
     // 审核通过
-    pass_exam() {},
+    pass_exam() {
+      if(this.multipleSelection.length < 1){
+        alert("未选择任何信息")
+        return
+      }
+      var tmp = "";
+      console.log("初始值",tmp)
+      for (var i=0;i < this.multipleSelection.length;i++){
+        tmp = tmp + this.multipleSelection[i].id + ","
+      }
+      var params = {
+        ids: tmp,
+        trial_status: 1,
+      }
+      refundreview(params).then((res) => {
+        if (res.data.state == 1){
+          this.$message.success("审核通过");
+          this.search();
+        }else {
+          this.$message.error("审核失败：" + res.data.msg);
+        }
+      })
+
+    },
 
     // 审核拒绝
-    reject_exam() {},
+    reject_exam() {
+      if(this.multipleSelection.length < 1){
+        alert("未选择任何信息")
+        return
+      }
+      var tmp = "";
+      console.log("初始值",tmp)
+      for (var i=0;i < this.multipleSelection.length;i++){
+        tmp = tmp + this.multipleSelection[i].id + ","
+      }
+      var params = {
+        ids: tmp,
+        trial_status: 2,
+      }
+      refundreview(params).then((res) => {
+        if (res.data.state == 1){
+          this.$message.success("审核拒绝成功");
+          this.search();
+        }else {
+          this.$message.error("审核拒绝失败：" + res.data.msg);
+        }
+      })
 
-    // 提交
-    Submit() {},
+    },
 
+    // 提交
+    Submit() {
+      this.$refs['refuna_add'].subfrom();
+      // setTimeout(() => {
+      //   this.$refs['rechange_details'].search();
+      // },500)
+    },
+    Submit02(){
+      this.$refs['refuna_up'].subfrom();
+    },
     // 退款申请审核
-    pass(){},
+    pass(){
+      this.$refs['refuna_add'].examine();
+    },
+    pli() {
+      // alert("父组件被调用!")
+      this.dialogVisible = false;
+    },
+    pli02() {
+      // alert("父组件被调用!")
+      this.dialogVisible02 = false;
+    },
 
     // 列表选择
-    handleSelectionChange(){}
+    handleSelectionChange(val){
+        this.multipleSelection = val
+        console.log("this.multipleSelection",this.multipleSelection)
+    }
   },
 };
 </script>

src/xt_pages/DepositManagement/DepositSearch.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 押金查询-->
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
@@ -13,13 +14,22 @@
         "
       >
         <div>
-          <el-input
-            size="small"
-            style="width: 200px; margin-left: 10px"
-            class="filter-item"
-            placeholder="请输入患者名称"
-            v-model.trim="keywords"
-          />
+<!--          <el-input-->
+<!--            size="small"-->
+<!--            style="width: 200px; margin-left: 10px"-->
+<!--            class="filter-item"-->
+<!--            placeholder="请输入患者名称"-->
+<!--            v-model.trim="keyword"-->
+<!--          />-->
+          <el-select v-model.trim="keyword" clearable filterable placeholder="请输入患者名称" @select="handleSelect" ><!--@change="updateconfig1(h1)"-->
+            <el-option
+              v-for="item in users"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
           <el-button
             size="small"
             class="filter-item"
@@ -43,12 +53,12 @@
         </el-table-column>
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.his_patient_name ? scope.row.his_patient_name : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="可用金额" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.drug_spec ? scope.row.drug_spec : "" }}</span>
+            <span>{{ scope.row.deposit ? scope.row.deposit : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="450px">
@@ -81,6 +91,10 @@
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  gethisuser,
+  getuserlist
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -91,20 +105,61 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "押金查询" },
       ],
-      tableData: [{}, {}],
+      tableData: [],
       total: 0,
       page: 1,
       limit: 10,
-      keywords:''
+      keyword:'',
+      users:[],//可用患者列表
     };
   },
+  created(){
+    this.init()
+    this.getuser()
+  },
 
   methods: {
     // 初始化数据
-    init() {},
+    init() {
+      //分页
+      var params = {
+        keyword: this.keyword,
+        page: this.page,
+        limit: this.limit,
+      };
+      getuserlist(params).then((res) =>{
+        if (res.data.state == 1){
+          this.total = res.data.data.total;
+          this.tableData = res.data.data.list;
+        }
+      })
+    },
+
+    //获取患者列表
+    getuser(){
+      var params = {};
+      gethisuser(params).then((res) =>{
+        if (res.data.state == 1){
+          this.users = res.data.data.list;
+        }
+        console.log("this.users",this.users)
+      })
+    },
 
     // 查询操作
-    search() {},
+    search() {
+      var params = {
+        keyword: this.keyword,
+        page: this.page,
+        limit: this.limit,
+      };
+      getuserlist(params).then((res) =>{
+        if (res.data.state == 1){
+          this.total = res.data.data.total;
+          this.tableData = res.data.data.list;
+        }
+      })
+    },
 
     // 页表操作
     handleSizeChange(val) {
@@ -115,13 +170,21 @@ export default {
       this.page = val;
       this.init();
     },
+    handleSelect(item){
+      this.keyword = item.id
+    },
+    updateconfig(){
+      console.log("keyword",this.keyword)
+    },
 
     // 流水详情
-    toDetails() {
-      this.$router.push({ path: "/DepositManagement/DepositDetails" });
+    toDetails(data,val) {
+      console.log("data",data)
+      console.log("data",val)
+      this.$router.push({ path: "/DepositManagement/DepositDetails",query:{key:data}});
     },
   },
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/RechargeDetailsSummary.vue

@@ -7,10 +7,10 @@
       <div style="width: 100%">
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="充值明细" name="first">
-            <RechangeDetails></RechangeDetails>
+            <RechangeDetails ref="rechange_details"></RechangeDetails>
           </el-tab-pane>
           <el-tab-pane label="充值汇总" name="second">
-            <RechargeSummary></RechargeSummary>
+            <RechargeSummary ref="recharge_summary"></RechargeSummary>
           </el-tab-pane>
         </el-tabs>
         <div
@@ -29,7 +29,7 @@
         :show-close="close"
       >
         <!-- <span>这是一段信息</span> -->
-        <RechangeAd></RechangeAd>
+        <RechangeAd ref="add_page" v-bind="$attrs"></RechangeAd>
         <span slot="footer" class="dialog-footer">
           <el-button @click="pass">审核通过</el-button>
           <el-button type="primary" @click="Submit">提 交</el-button>
@@ -66,16 +66,24 @@ export default {
       close: false,
     };
   },
-
   methods: {
     // 初始化数据
-    init() {},
+    init() {
+
+    },
 
     // 查询操作
     search() {},
     // 切换明细
     handleClick(tab, event) {
-      console.log(tab, event);
+      // console.log(tab, event);
+      if(tab.name == "first"){
+        // alert("充值明细")
+        this.$refs['rechange_details'].search();
+      }else {
+        // alert("充值汇总")
+        this.$refs['recharge_summary'].search();
+      }
     },
     // 页表操作
     handleSizeChange(val) {
@@ -95,15 +103,34 @@ export default {
     // 新增
     Add() {
       this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs['add_page'].closePop();
+        this.$refs['add_page'].getcode();
+        this.$refs['add_page'].getusername();
+      })
     },
 
     // 审核通过
-    pass() {},
+    pass() {
+      this.$refs['add_page'].examine();
+    },
 
     // 提交
-    Submit() {},
+    Submit() {
+      // this.$nextTick(() => {
+        this.$refs['add_page'].subfrom();
+        // setTimeout(() => {
+        this.$refs['rechange_details'].search();
+        // },500)
+
+      // })
+    },
+    pli() {
+      // alert("父组件被调用!")
+      this.dialogVisible = false;
+    },
   },
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/Template/DeductionDetails.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  扣费明细-->
   <div class="main-contain">
     <div class="app-container">
       <div
@@ -16,7 +17,7 @@
               style="width: 200px; margin-left: 10px"
               class="filter-item"
               placeholder="请输入编号/患者名称"
-              v-model.trim="keywords"
+              v-model.trim="keyword"
             />
           </div>
 
@@ -28,6 +29,8 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </div>
@@ -54,33 +57,33 @@
         </el-table-column>
         <el-table-column label="就诊号" align="center" width="300">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.code	 ? scope.row.code : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.name	 ? scope.row.name	 : "" }}</span>
           </template>
         </el-table-column>
 
         <el-table-column label="医收费类型" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.chargetype	 ? scope.row.chargetype	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="医疗费总额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.total	 ? scope.row.total	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="押金支付金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.decimal	 ? scope.row.decimal	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="收费日期" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.charge_date	 ? scope.row.charge_date	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="350px">
@@ -96,12 +99,15 @@
         </el-table-column>
       </el-table>
 
-      <div>押金支付金额合计：<span></span></div>
+      <div>押金支付金额合计：<span>{{sum}}</span></div>
     </div>
   </div>
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  deductiondetails
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -112,21 +118,51 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "押金查询" },
       ],
-      tableData: [{}, {}],
-      total: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
+      tableData: [],
+      // total: 0,
+      // page: 1,
+      // limit: 10,
+      keyword: "",
       value1: "",
+      start_time:"",
+      end_time:"",
+      sum:""
     };
   },
 
+  created(){
+    this.search()
+  },
   methods: {
     // 初始化数据
     init() {},
 
     // 查询操作
-    search() {},
+    search() {
+      // this.value1 = ["2022-04-10","2022-05-10"],有空在改。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
+      // console.log("value1",this.value1)
+      if (this.value1 != null){
+        if(this.value1[0] != undefined && this.value1[1] != undefined){
+          this.start_time = this.value1[0]
+          this.end_time = this.value1[1]
+        }
+      }else {
+        this.start_time = ""
+        this.end_time = ""
+      }
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+      };
+      console.log("params",params)
+      deductiondetails(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          this.sum = res.data.data.sum;
+        }
+      })
+    },
 
     // 查看详情
     Details() {},
@@ -134,4 +170,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/Template/DeductionSummary.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  扣费汇总-->
   <div class="main-contain">
     <div class="app-container">
       <div
@@ -16,7 +17,7 @@
               style="width: 200px; margin-left: 10px"
               class="filter-item"
               placeholder="请输入编号/患者名称"
-              v-model.trim="keywords"
+              v-model.trim="keyword"
             />
           </div>
 
@@ -28,6 +29,8 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </div>
@@ -55,28 +58,31 @@
 
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.name	 ? scope.row.name	 : "" }}</span>
           </template>
         </el-table-column>
 
         <el-table-column label="医疗费总额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.total	 ? scope.row.total	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="押金支付金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.decimal	 ? scope.row.decimal	 : "" }}</span>
           </template>
         </el-table-column>
       </el-table>
 
-      <div>押金支付金额合计：<span></span></div>
+      <div>押金支付金额合计：<span>{{sum}}</span></div>
     </div>
   </div>
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  desummary
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -87,21 +93,49 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "押金查询" },
       ],
-      tableData: [{}, {}],
-      total: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
+      tableData: [{},{},{}],
+      // total: 0,
+      // page: 1,
+      // limit: 10,
+      keyword: "",
       value1: "",
+      start_time:"",
+      end_time:"",
+      sum:""
     };
   },
 
+  created(){
+    this.search()
+  },
   methods: {
     // 初始化数据
     init() {},
 
     // 查询操作
-    search() {},
+    search() {
+      if (this.value1 != null){
+        if(this.value1[0] != undefined && this.value1[1] != undefined){
+          this.start_time = this.value1[0]
+          this.end_time = this.value1[1]
+        }
+      }else {
+        this.start_time = ""
+        this.end_time = ""
+      }
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+      };
+      console.log("params",params)
+      desummary(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          this.sum = res.data.data.sum;
+        }
+      })
+    },
 
     // 删除
     toDelete() {},
@@ -115,4 +149,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/Template/DepositDetails.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  押金流水-->
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
@@ -13,10 +14,10 @@
         "
       >
         <div style="width: 200px">
-          <span>患者名称：</span>
+          <span>患者名称：{{name}}</span>
         </div>
         <div style="width: 200px">
-          <span>可用金额：</span>
+          <span>可用金额：{{sum}}</span>
         </div>
       </div>
       <div
@@ -35,17 +36,20 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="search"
           >
           </el-date-picker>
         </div>
         <div style="width: 300px">
           <span>押金类型：</span>
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="deposit_status" placeholder="请选择" @change="search">
             <el-option
-              v-for="item in [1,2]"
-              :key="item"
-              :label="item"
-              :value="item"
+              v-for="item in depositlist"
+              :key="item.name"
+              :label="item.name"
+              :value="item.value"
             >
             </el-option>
           </el-select>
@@ -64,30 +68,42 @@
         </el-table-column>
         <el-table-column label="押金类型" align="center">
           <template slot-scope="scope">
-            <span></span>
+<!--            <span>{{ scope.row.deposit_status	 ? scope.row.deposit_status	 : "" }}</span>-->
+            <span v-if="scope.row.deposit_status == 1">充值</span>
+            <span v-if="scope.row.deposit_status == 2">扣费</span>
+            <span v-if="scope.row.deposit_status == 3">退款</span>
+            <span v-if="scope.row.deposit_status == 4">退费</span>
           </template>
         </el-table-column>
         <el-table-column label="充值/扣费单据编码" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.deposit_code	 ? scope.row.deposit_code	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="充值金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+<!--            <span>{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>-->
+            <span v-if="scope.row.deposit_status == 1">{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>
+            <span v-if="scope.row.deposit_status == 2">-</span>
+            <span v-if="scope.row.deposit_status == 3">-</span>
+            <span v-if="scope.row.deposit_status == 4">{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="扣费金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+<!--            <span>{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>-->
+            <span v-if="scope.row.deposit_status == 1">-</span>
+            <span v-if="scope.row.deposit_status == 2">{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>
+            <span v-if="scope.row.deposit_status == 3">{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>
+            <span v-if="scope.row.deposit_status == 4">-</span>
           </template>
         </el-table-column>
         <el-table-column label="可用金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.surplus_deposit	 ? scope.row.surplus_deposit	 : "" }}</span>
           </template>
         </el-table-column>
-       
+
       </el-table>
 
     </div>
@@ -95,6 +111,10 @@
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  refundlist,
+  depositflow
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -105,21 +125,60 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "流水详情" },
       ],
-      tableData: [{}, {}],
-      total: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
-      value1:""
+      tableData: [],
+      depositlist:[{name:"全部",value:0},{name:"充值",value:1},{name:"扣费",value:2},{name:"退款",value:3},{name:"退费",value:4}],
+      value1:"",
+      start_time:"",
+      end_time:"",
+      id: 0,
+      name: "",
+      sum:0,
+      deposit_status:0,
     };
   },
-
+  created(){
+    this.init();
+    this.search();
+  },
   methods: {
     // 初始化数据
-    init() {},
-
+    init() {
+      // this.$route.query.key
+      // console.log("this.$route.query.key",this.$route.query.key);
+      this.name = this.$route.query.key.his_patient_name
+      this.id = this.$route.query.key.his_patient_id
+    },
+    // lili(){
+    //   alert("触发")
+    // },
+    // ljc(){
+    //   alert(this.deposit_status)
+    // },
     // 查询操作
-    search() {},
+    search() {
+      if (this.value1 != null){
+        if(this.value1[0] != undefined && this.value1[1] != undefined){
+          this.start_time = this.value1[0]
+          this.end_time = this.value1[1]
+        }
+      }else {
+        this.start_time = ""
+        this.end_time = ""
+      }
+      var params = {
+        id: this.id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        deposit_status: this.deposit_status,
+      };
+      // console.log("params",params)
+      depositflow(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          this.sum = res.data.data.decimal;
+        }
+      })
+    },
   },
 };
 </script>
@@ -127,4 +186,4 @@ export default {
 /deep/ .el-range-separator {
   width: 10%;
 }
-</style>
+</style>

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  充值明细-->
   <div class="main-contain">
     <div class="app-container">
       <div
@@ -16,7 +17,7 @@
               style="width: 200px; margin-left: 10px"
               class="filter-item"
               placeholder="请输入编号/患者名称"
-              v-model.trim="keywords"
+              v-model.trim="keyword"
             />
           </div>
 
@@ -28,6 +29,8 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </div>
@@ -54,38 +57,41 @@
         </el-table-column>
         <el-table-column label="单据编号" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.deposit_code	 ? scope.row.deposit_code	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.his_name	 ? scope.row.his_name	 : "" }}</span>
           </template>
         </el-table-column>
 
         <el-table-column label="充值金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="审核状态" align="center">
           <template slot-scope="scope">
-            <span></span>
+<!--            <span>{{ scope.row.trial_status	 ? scope.row.trial_status	 : "" }}</span>-->
+            <span v-if="scope.row.trial_status == 1">审核通过</span>
+            <span v-if="scope.row.trial_status == 0">未审核</span>
+            <span v-if="scope.row.trial_status == 2">审核拒绝</span>
           </template>
         </el-table-column>
         <el-table-column label="创建人" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.name	 ? scope.row.name	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="充值时间" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.starttime	 ? scope.row.starttime	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.remarks	 ? scope.row.remarks	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="350px">
@@ -116,13 +122,18 @@
       </el-table>
 
       <div>
-          充值金额合计：<span></span>
+          充值金额合计：<span>{{sum}}</span>
       </div>
     </div>
   </div>
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  rechargedetails,
+  deletehistory,
+  updeposit
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -133,34 +144,102 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "押金查询" },
       ],
-      tableData: [{}, {}],
-      total: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
-      value1:""
+      tableData: [],
+      // total: 0,
+      // page: 1,
+      // limit: 10,
+      keyword: "",
+      value1:"",//日期
+      start_time:"",
+      end_time:"",
+      sum:""
     };
   },
-
+  created(){
+    this.search()
+  },
   methods: {
     // 初始化数据
     init() {},
 
     // 查询操作
-    search() {},
+    search() {
+      // alert("gagaga")
+      console.log("value1",this.value1)
+      if (this.value1 != null){
+        if(this.value1[0] != undefined && this.value1[1] != undefined){
+          this.start_time = this.value1[0]
+          this.end_time = this.value1[1]
+        }
+      }else {
+        this.start_time = ""
+        this.end_time = ""
+      }
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+      };
+      console.log("params",params)
+      rechargedetails(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          this.sum = res.data.data.sum;
+        }
+      })
+    },
 
     // 删除
-    toDelete() {},
+    toDelete(val,index) {
+      var params = {
+        id:val.id,
+      };
+      this.$confirm("是否确定删除?", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        deletehistory(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+          .then(() =>{
+            this.search();
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }).catch(() => {});
+    },
 
     // 审核
-    examine() {},
+    examine(val,index) {
+      var params = {
+        id:val.id,
+      };
+      updeposit(params).then((res) =>{
+        if (res.data.state == 1) {
+          this.$message.success(res.data.data.list);
+        }else {
+          this.$message.error(res.data.msg);
+        }
+      })
+      setTimeout(() => {
+        this.search();
+      },500)
+    },
 
     // 打印凭证
-    print(){
-      this.$router.push({path:"/DepositManagement/printindex"})
-    }
+    print(data,val){
+      console.log("data",data)
+      // alert("aaaaaaa")
+      this.$router.push({path:"/DepositManagement/printindex",query:{key:data}})
+    },
   },
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/Template/RechargeSummary.vue

@@ -1,4 +1,5 @@
 <template>
+<!--  充值汇总-->
   <div class="main-contain">
     <div class="app-container">
       <div
@@ -15,8 +16,8 @@
               size="small"
               style="width: 200px; margin-left: 10px"
               class="filter-item"
-              placeholder="请输入编号/患者名称"
-              v-model.trim="keywords"
+              placeholder="请输入患者名称"
+              v-model.trim="keyword"
             />
           </div>
 
@@ -28,6 +29,8 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </div>
@@ -52,34 +55,37 @@
       >
         <el-table-column type="index" label="序号" align="center" width="200">
         </el-table-column>
-        
+
         <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.his_name	 ? scope.row.his_name	 : "" }}</span>
           </template>
         </el-table-column>
 
         <el-table-column label="充值金额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.sum_decimal	 ? scope.row.sum_decimal	 : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="押金余额" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <span>{{ scope.row.decimal	 ? scope.row.decimal	 : "" }}</span>
           </template>
         </el-table-column>
-        
+
       </el-table>
 
       <div>
-          充值金额合计：<span></span>
+          充值金额合计：<span>{{sum}}</span>
       </div>
     </div>
   </div>
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  rechargesummary
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -90,21 +96,49 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "押金查询" },
       ],
-      tableData: [{}, {}],
-      total: 0,
-      page: 1,
-      limit: 10,
-      keywords: "",
-      value1:""
+      tableData: [],
+      // total: 0,
+      // page: 1,
+      // limit: 10,
+      keyword: "",
+      value1:"",
+      start_time:"",
+      end_time:"",
+      sum:""
     };
   },
-
+  created(){
+    this.search()
+  },
   methods: {
     // 初始化数据
     init() {},
 
     // 查询操作
-    search() {},
+    search() {
+      // console.log("value1",this.value1)
+      if (this.value1 != null){
+        if(this.value1[0] != undefined && this.value1[1] != undefined){
+          this.start_time = this.value1[0]
+          this.end_time = this.value1[1]
+        }
+      }else {
+        this.start_time = ""
+        this.end_time = ""
+      }
+      var params = {
+        keyword: this.keyword,
+        start_time: this.start_time,
+        end_time: this.end_time,
+      };
+      console.log("params",params)
+      rechargesummary(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          this.sum = res.data.data.sum;
+        }
+      })
+    },
 
     // 删除
     toDelete() {},
@@ -118,4 +152,4 @@ export default {
 };
 </script>
 <style>
-</style>
+</style>

src/xt_pages/DepositManagement/Template/add_page.vue

@@ -1,14 +1,25 @@
 <template>
+<!--  新增押金中间的部分-->
   <div>
-    <el-form ref="form" :model="form" label-width="80px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
       <el-form-item label="押金编号">
-        <span>{{form.id}}</span>
+        <span>{{form.code}}</span>
       </el-form-item>
-      <el-form-item label="患者名称">
-        <el-input v-model="form.patient_name"></el-input>
+      <el-form-item label="患者名称" prop="patient_name">
+<!--        <el-input v-model="form.patient_name"></el-input>-->
+        <el-select v-model="form.patient_name" clearable filterable placeholder="请输入患者名称" @select="handleSelect" ><!--@change="updateconfig1(h1)"-->
+          <el-option
+            v-for="item in users"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+
       </el-form-item>
-      <el-form-item label="押金金额">
-        <el-input v-model="form.money"></el-input>
+      <el-form-item label="押金金额" prop="money">
+        <el-input v-model="form.money" ></el-input>
       </el-form-item>
       <el-form-item label="备注">
         <el-input type="textarea" v-model="form.remarks"></el-input>
@@ -17,17 +28,94 @@
   </div>
 </template>
 <script>
+import {
+  getdepositcode,
+  gethisuser,
+  adddeposit
+}from "@/api/deposit";
 export default {
   data() {
     return {
       form: {
         remarks:"",
-        id:"HSG47565",
+        code:"",
         patient_name:"",
         money:0
       },
+      users:[],//可用患者列表
+      trial_status:0,
+      //表单验证规则
+      rules: {
+        patient_name:[{
+          required:true,message:"患者姓名不能为空",trigger: "change"
+        }],
+        money:[{
+          required:true,message:"押金金额不能为空",trigger: "change"
+        }],
+      },
     };
   },
+  created(){
+    // this.getusername()
+  },
+  methods:{
+    getcode(){
+      var params = {}
+      getdepositcode(params).then((res) => {
+        if(res.data.state == 1){
+          this.form.code = res.data.data.list;
+        }
+      })
+    },
+    //获取患者列表
+    getusername(){
+      var params = {};
+      gethisuser(params).then((res) =>{
+        if (res.data.state == 1){
+          this.users = res.data.data.list;
+        }
+      })
+    },
+    //提交
+    subfrom(){
+      // console.log("========")
+      // this.$parent.$parent.pli();
+      // console.log("子组件",this.$parent.$parent)
+      // console.log("========")
+      var params = {
+        code: this.form.code,
+        his_patient_id: this.form.patient_name,
+        deposit: this.form.money,
+        remarks: this.form.remarks,
+        trial_status: this.trial_status,
+      }
+      adddeposit(params).then((res) =>{
+        if (res.data.state == 1){
+          this.$message.success("添加成功");
+          // this.closePop();
+          this.$parent.$parent.pli();
+          this.$parent.$parent.search();
+        }else {
+          this.$message.error("新增失败：" + res.data.msg);
+        }
+      })
+    },
+    handleSelect(item){
+      this.form.patient_name = item.id
+    },
+    //审核通过
+    examine(){
+      this.trial_status = 1
+    },
+    //清除表单数据
+    closePop(){
+      // alert("清除");
+      this.form.patient_name = "";
+      this.form.remarks = "";
+      this.form.money = 0;
+      this.trial_status = 0;
+    },
+  },
 };
 </script>
 

src/xt_pages/DepositManagement/Template/refundAdd.vue

@@ -1,33 +1,131 @@
 <template>
   <div>
-    <el-form ref="form" :model="form" label-width="80px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="申请编号">
-        <span>{{form.id}}</span>
+        <span>{{form.code}}</span>
       </el-form-item>
-      <el-form-item label="患者名称">
-        <el-input v-model="form.patient_name"></el-input>
+      <el-form-item label="患者名称" prop="patient_name">
+<!--        <el-input v-model="form.patient_name"></el-input>-->
+        <el-select v-model="form.patient_name" clearable filterable placeholder="请输入患者名称" @select="handleSelect" @change="updateconfig"><!--@change="updateconfig1(h1)"-->
+          <el-option
+            v-for="item in users"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="押金余额">
-        <span>{{form.id}}</span>
+      <el-form-item label="押金余额" prop="decote">
+        <span>{{decote}}</span>
       </el-form-item>
-     <el-form-item label="退款金额">
-        <el-input v-model="form.patient_name"></el-input>元
+     <el-form-item label="退款金额" prop="money">
+        <el-input v-model="form.money"></el-input>元
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
+import {
+  getdeletecode,
+  gethisuser,
+  idtobalance,
+  refundapplication
+}from "@/api/deposit";
 export default {
   data() {
     return {
       form: {
         remarks:"",
-        id:"HSG47565",
-        patient_name:"",
-        money:0
+        code:"",//编号
+        patient_name:"",//患者名称
+        money:0//退款金额
+      },
+      users:[],//可用患者列表
+      trial_status:0,//审核
+      decote:0,//押金余额
+      rules: {
+        patient_name:[{
+          required:true,message:"患者姓名不能为空",trigger: "change"
+        }],
+        money:[{
+          required:true,message:"退款金额不能为空",trigger: "change"
+        }],
       },
     };
   },
+  methods:{
+    //获取编号
+    getcode(){
+      console.log("decote获取编号",this.decote)
+      var params = {}
+      getdeletecode(params).then((res) => {
+        if(res.data.state == 1){
+          this.form.code = res.data.data.list;
+        }
+      })
+    },
+    //获取患者列表
+    getusername(){
+      console.log("decote获取患者列表",this.decote)
+      var params = {};
+      gethisuser(params).then((res) =>{
+        if (res.data.state == 1){
+          this.users = res.data.data.list;
+        }
+      })
+    },
+    //获取用户押金余额
+    updateconfig(){
+      console.log("this.name",this.form.patient_name);
+      var params = {
+        his_patient_id: this.form.patient_name,
+      }
+      idtobalance(params).then((res) => {
+        if (res.data.state == 1){
+          this.decote = res.data.data.list;
+        }
+      })
+    },
+    handleSelect(item){
+      this.form.patient_name = item.id;
+
+    },
+
+    //提交
+    subfrom(){
+      var params = {
+        code: this.form.code,
+        his_patient_id: this.form.patient_name,
+        deposit: this.form.money,
+        trial_status: this.trial_status,
+      }
+      refundapplication(params).then((res) =>{
+        if (res.data.state == 1){
+          this.$message.success("添加成功");
+          // this.closePop();
+          this.$parent.$parent.pli();
+          this.$parent.$parent.search();
+        }else {
+          this.$message.error("新增失败：" + res.data.msg);
+        }
+      })
+    },
+    //审核通过
+    examine(){
+      this.trial_status = 1
+      alert(this.trial_status)
+    },
+    //清除表单数据
+    closePop(){
+      // alert("清除");
+      this.form.patient_name = "";
+      this.form.remarks = "";
+      this.form.money = 0;
+      this.trial_status = 0;
+      this.decote = 0;
+    },
+  }
 };
 </script>
 

src/xt_pages/DepositManagement/Template/refundUpdate.vue

@@ -0,0 +1,142 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="申请编号">
+        <span>{{form.code}}</span>
+      </el-form-item>
+      <el-form-item label="患者名称" prop="patient_name">
+        <!--        <el-input v-model="form.patient_name"></el-input>-->
+        <el-select v-model="form.patient_name" clearable filterable placeholder="请输入患者名称" @select="handleSelect" @change="updateconfig"><!--@change="updateconfig1(h1)"-->
+          <el-option
+            v-for="item in users"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="押金余额" prop="decote">
+        <span>{{decote}}</span>
+      </el-form-item>
+      <el-form-item label="退款金额" prop="money">
+        <el-input v-model="form.money"></el-input>元
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import {
+  gethisuser,
+  idtobalance,
+  changerefund
+}from "@/api/deposit";
+export default {
+  data() {
+    return {
+      id:"",
+      form: {
+        remarks:"",
+        code:"",//编号
+        patient_name:"",//患者名称
+        money:0//退款金额
+      },
+      users:[],//可用患者列表
+      trial_status:0,//审核
+      decote:0,//押金余额
+      rules: {
+        patient_name:[{
+          required:true,message:"患者姓名不能为空",trigger: "change"
+        }],
+        money:[{
+          required:true,message:"退款金额不能为空",trigger: "change"
+        }],
+      },
+    };
+  },
+  methods:{
+    //获取信息
+    getinformation(data,type){
+      this.form.code = data.deposit_code;
+      this.form.patient_name = data.his_patient_id;
+      this.form.money = data.deposit;
+      this.trial_status = data.trial_status,
+      this.id = data.id;
+    },
+    //获取患者列表
+    getusername(){
+      console.log("decote获取患者列表",this.decote)
+      var params = {};
+      gethisuser(params).then((res) =>{
+        if (res.data.state == 1){
+          this.users = res.data.data.list;
+        }
+      })
+    },
+    //获取用户押金余额
+    updateconfig(){
+      console.log("this.name",this.form.patient_name);
+      var params = {
+        his_patient_id: this.form.patient_name,
+      }
+      idtobalance(params).then((res) => {
+        if (res.data.state == 1){
+          this.decote = res.data.data.list;
+        }
+      })
+    },
+    handleSelect(item){
+      this.form.patient_name = item.id;
+
+    },
+
+    //提交
+    subfrom(){
+      var params = {
+        id: this.id,
+        code: this.form.code,
+        his_patient_id: this.form.patient_name,
+        deposit: this.form.money,
+        trial_status: this.trial_status,
+      }
+      changerefund(params).then((res) =>{
+        if (res.data.state == 1){
+          this.$message.success("保存成功");
+          // this.closePop();
+          this.$parent.$parent.pli02();
+          this.$parent.$parent.search();
+        }else {
+          this.$message.error("保存失败：" + res.data.msg);
+        }
+      })
+    },
+    //审核通过
+    examine(){
+      if(this.trial_status == 1){
+        alert("已审核")
+      }
+      this.trial_status = 1
+
+    },
+    //清除表单数据
+    closePop(){
+      // alert("清除");
+      this.form.patient_name = "";
+      this.form.remarks = "";
+      this.form.money = 0;
+      this.trial_status = 0;
+      this.decote = 0;
+    },
+  }
+};
+</script>
+
+<style scoped>
+.el-input{
+  width: 50%;
+}
+
+.el-textarea{
+  width: 65%;
+}
+</style>

src/xt_pages/DepositManagement/print/printindex.vue

@@ -12,17 +12,19 @@
         <div class="dialysis-print-order">
           <div class="print">
             <h2>收据凭证</h2>
-            <p>收款日期： 2022年4月27日</p>
+            <p>收款日期： {{ time }}</p>
             <div class="content">
               <div style="display: flex; padding: 0 30px">
                 <div style="display: flex">
                   <div>收款单位：</div>
+                  <span>{{name}}</span>
                   <div
                     style="min-width: 224px; border-bottom: 1px solid #000"
                   ></div>
                 </div>
                 <div style="display: flex">
                   <div>收款方式：</div>
+                  <span>现金</span>
                   <div
                     style="min-width: 224px; border-bottom: 1px solid #000"
                   ></div>
@@ -30,13 +32,15 @@
               </div>
               <div style="display: flex; padding: 0 30px">
                 <div>人民币：</div>
-                ￥
+                ￥{{money}}
                 <div
                   style="min-width: 225px; border-bottom: 1px solid #000"
                 ></div>
               </div>
               <div style="display: flex; padding: 0 30px">
                 <div>收款是由：</div>
+<!--                <span>{{ li }}</span>-->
+                <span>预交押金</span>
                 <div style="width: 86%; border-bottom: 1px solid #000"></div>
               </div>
             </div>
@@ -48,6 +52,9 @@
 </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {
+  getorgname
+}from "@/api/deposit";
 export default {
   components: {
     BreadCrumb,
@@ -58,9 +65,34 @@ export default {
         { path: false, name: "押金管理" },
         { path: "/DepositManagement/DepositSearch", name: "打印凭证" },
       ],
+      name:"",//机构名称
+      time:"",//日期
+      money:"",//金额
     };
   },
+  created(){
+    this.init();
+    this.getname();
+  },
   methods: {
+    //获取机构名称
+    getname(){
+      var params = {};
+      getorgname(params).then((res) =>{
+        if (res.data.state == 1){
+          this.name = res.data.data.list;
+        }
+      })
+    },
+    init(){
+      this.money = this.$route.query.key.deposit
+      var tmp = this.$route.query.key.starttime
+      this.time = tmp.slice(0,4)+"年"+tmp.slice(5,7)+"月"+tmp.slice(8,10)+"日"
+      // this.li = this.time.slice(0,4)
+      // alert(this.time.slice(0,4))
+      // alert(this.time.slice(5,7))
+      // alert(this.time.slice(8,10))
+    },
     to_print() {
       const style =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto} .print h2{text-align: center;} .print p{width: 85%;text-align: right;} .content{width: 70%;height: 250px;border: 1px solid #000;margin: 20px auto;display: flex;flex-direction: column;justify-content: space-evenly;}';
@@ -99,4 +131,4 @@ export default {
   flex-direction: column;
   justify-content: space-evenly;
 }
-</style>
+</style>

src/xt_pages/data/basicConfig.vue

@@ -23,6 +23,8 @@
           <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方同步到透析医嘱后，同一个患者，门诊医生站开的药品类处方自动同步到透析管理临时医嘱中，同时在透析管理中，给患者开长期医嘱和临时医嘱的功能失效，医生只能在门诊医生站开处方，只有同时使用门诊管理和透析管理的机构方可开启。</p>
           <p style="margin-top:20px;">门诊处方同步到透析医嘱：
           <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
+          <p style="margin-top:20px;">门诊处方和临时医嘱同步到透析医嘱：
+          <el-switch v-model="is_open_advice_xt_his" @change="changeFuncSix"></el-switch>
           </p>
         </div>
 
@@ -90,7 +92,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -109,6 +111,7 @@ export default {
       is_open_print:false,
       is_open_xt_his_project: false,
       is_open_is_type:false,
+      is_open_advice_xt_his:false,
     };
   },
   methods: {
@@ -136,6 +139,12 @@ export default {
               this.is_open_is_type = false
             }
 
+            if(response.data.data.is_open_advice == 1){
+              this.is_open_advice_xt_his = true
+            }else{
+              this.is_open_advice_xt_his = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -205,10 +214,7 @@ export default {
         )
       }
     },
-
-
     changeFuncTwo(){
-      console.log("3333333",this.is_open_monitor)
       var is_open = 0
       if(this.is_open_monitor == true){
           is_open = 1
@@ -219,7 +225,6 @@ export default {
       let params = {
          is_open:is_open,
        }
-     console.log("params",params)
       postMonitorIsOpen(params).then(response=>{
          if(response.data.state == 1){
             var config = response.data.data.config
@@ -232,7 +237,6 @@ export default {
       getMonitorConfig().then(response=>{
          if(response.data.state == 1){
            var config =  response.data.data.config
-           console.log("config",config)
            if (config.is_open == 1) {
               this.is_open_monitor = true
            }
@@ -277,7 +281,6 @@ export default {
     },
 
     changeFuncPrint(val){
-      console.log("val22222",val)
       var is_open  = 0
       if(val == true){
          is_open = 1
@@ -302,7 +305,6 @@ export default {
       getDataPrintList().then(response=>{
          if(response.data.state ==1){
            var dataPrint = response.data.data.dataPrint
-           console.log("列表数据",dataPrint)
            if(dataPrint.is_open == 1){
               this.is_open_print = true
            }
@@ -328,6 +330,24 @@ export default {
            this.$message.success("保存成功!")
         }
       })
+    },
+    changeFuncSix(){
+      var is_advice_open = 2
+      if(this.is_open_advice_xt_his == false){
+        is_advice_open = 2
+      }
+      if(this.is_open_advice_xt_his == true){
+        is_advice_open = 1
+      }
+      var params = {
+        is_advice_open:is_advice_open,
+      }
+      changeAdviceConfig(params).then(response=>{
+         if(response.data.state == 1){
+          var msg =  response.data.data.msg
+          this.$message.success("保存成功!")
+         }
+      })
     }
 
   },

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1135,6 +1135,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
+                          <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对者</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
                         <tr
@@ -1238,6 +1239,28 @@
                               getTime(advice[0].execution_time, " {h}:{i}")
                             }}</span>
                           </td>
+
+                          <td height="35px" v-if="org_id == 10223">
+                            <span
+                              v-if="
+                                setAdminUserES(advice[0], 'checker') ==
+                                  ''
+                              "
+                              >{{
+                                getAdminUser(advice[0], "checker")
+                              }}</span
+                            >
+                            <img
+                              class="es-img"
+                              :src="
+                                setAdminUserES(advice[0], 'checker')
+                              "
+                              alt=""
+                              srcset=""
+                              v-else
+                              style="height: 40px;"
+                            />
+                          </td>
                         </tr>
                         <!-- </template> -->
                       </tbody>
@@ -2174,10 +2197,12 @@ export default {
               var item = this.records[recordIndex].advices[index];
               if (item.id in childMap) {
                 item.children = childMap[item.id];
+                // advices.push(childMap[item.id]);
               } else {
                 item.children = [];
               }
               advices.push(item);
+              
             }
 
             var leftAdvice = [];
@@ -2378,8 +2403,6 @@ export default {
       }
     },
     getAdminUser(key, id) {
-      console.log("key", key);
-      console.log("id", id);
       if (
         typeof key === "undefined" ||
         key == null ||

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -319,16 +319,7 @@
           >批量打印</el-button
         >
       </template>
-      <!-- <template v-if="this.template_id == 48">
-        <el-button
-          size="small"
-          icon="el-icon-printer"
-          :disabled="selecting_schs.length == 0"
-          @click="batchPrintAction"
-          type="primary"
-          >批量打印</el-button
-        >
-      </template> -->
+
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">

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

@@ -687,6 +687,18 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="血容量(L)"
+            width="140"
+            v-if="isShow('血容量')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.accumulated_blood_volume }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -1312,6 +1324,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('血容量')">
+            <el-form-item label="血容量(L)：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('血温监测')">
             <el-form-item label="血温监测">
               <el-input v-model="form.blood_temperature"></el-input>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -33,6 +33,7 @@
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
+          <th v-if="isShow('血容量')" width="92px">血容量(ml)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>
@@ -80,6 +81,7 @@
             <span v-if="monitor.monitor_anticoagulant_value!=''">（{{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }}）</span>
           </td>
           <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
+          <th v-if="isShow('血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
           <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
           <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -134,7 +134,7 @@
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 上次透后体重:
-                {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg
+                {{ predialysis.weight_after_last_transparency?predialysis.weight_after_last_transparency:'/' }}kg
               </span>
             </td>
             <td style="text-align: left" colspan="2">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -667,6 +667,7 @@
                         <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
                         <td style="font-size: 16px" width="10%">执行人签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对护士</td>
                       </tr>
                       <!-- <template v-for="group in doctor_advices" > -->
 
@@ -708,6 +709,10 @@
                         <td height="32px">
                           <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         </td>
+                        <td height="32px" v-if="org_id == 10223">
+                          <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker) }}</span>
+                          <img style="height:30px" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else />
+                        </td>
                       </tr>
                       <!-- </template> -->
                     </tbody>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2293,6 +2293,44 @@ export default {
 
                 }
 
+                for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
+                  if(this.prescriptions[i].advices[b].delivery_way == "" ){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}用法未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].execution_frequency == "" ){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}频率未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].day == NaN){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].day == 0){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数不能为0`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].prescribing_number == ""){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].prescribing_number == "0"){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量不能为0`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].prescribing_number_unit == ""){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量单位未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                }
+
                 for (let b = 0; b < this.prescriptions[i].project.length; b++) {
                   this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
@@ -2301,6 +2339,29 @@ export default {
 
                 }
 
+                // for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+                //   if(this.prescriptions[i].project[b].delivery_way == "" ){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].project_name}用法未填写`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                //   if(this.prescriptions[i].project[b].execution_frequency == "" ){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].project_name}频率未填写`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                //   if(this.prescriptions[i].project[b].day == " "){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].number_days}天数未填写`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                //   if(this.prescriptions[i].project[b].day == "0"){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].number_days}天数不能为0`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                // }
+
                 for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
                   this.prescriptions[i].addition[b].id = prarseInt(this.prescriptions[i].addition[b].id)
                   this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -11,16 +11,16 @@
     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
-        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.name" placeholder="姓名" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="性别: " prop="name">
-        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.gender" placeholder="性别" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="年龄: " prop="name">
-        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.age" placeholder="年龄" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="证件号:" prop="name">
-        <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.id_card_no" placeholder="证件号" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="出生日期: " prop="name">
         <el-date-picker
@@ -32,7 +32,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="联系电话: " prop="name">
-        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.phone" placeholder="联系电话" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保类型: " prop="name">
         <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
@@ -45,33 +45,79 @@
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="医保证号" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="家庭住址: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.home_address" placeholder="家庭住址" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="过敏史: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+      <el-form-item label="药物过敏史: " prop="name">
+        <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
+<!-- 
+  <el-form-item label="初始透析日期: " prop="name">
+         <el-date-picker
+          :disabled="true"
+          style="width:100%;"
+          v-model="first_dialysis_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="工作单位: " prop="name">
+         <el-input v-model="patientInfo.work_unit" placeholder="工作单位"  :disabled="true"></el-input>
+      </el-form-item>
+
+      <el-form-item label="原发病: " prop="name">
+        <el-input v-model="primary_disease" placeholder="原发病"></el-input>
+      </el-form-item>
+      
+  
+
+      <el-form-item label="确诊肾衰日期: " prop="name">
+         <el-date-picker
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          style="width:100%;"
+          v-model="confirm_failure_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+     
+
+
+      <el-form-item label="体格检查: " prop="name">
+        <el-input v-model="physical_examination" placeholder="体格检查"></el-input>
+      </el-form-item>
+
+       <el-form-item label="专科检查: " prop="name">
+        <el-input v-model="special_inspection" placeholder="专科检查"></el-input>
+      </el-form-item>
+
+      <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
+        <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
+      </el-form-item> -->
+
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
       <el-form-item label="体温:" prop="temperature">
-        <el-input v-model="case_history.temperature" placeholder=""></el-input>
+        <el-input v-model="case_history.temperature" placeholder="体温"></el-input>
         <span>℃</span>
       </el-form-item>
       <el-form-item label="脉搏: " prop="pulse">
-        <el-input v-model="case_history.pulse" placeholder=""></el-input>
+        <el-input v-model="case_history.pulse" placeholder="脉搏"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="呼吸: " prop="breathing">
-        <el-input v-model="case_history.breathing" placeholder=""></el-input>
+        <el-input v-model="case_history.breathing" placeholder="呼吸"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="血压:" prop="name">
-        <el-input v-model="case_history.sbp" placeholder=""></el-input>
+        <el-input v-model="case_history.sbp" placeholder="血压"></el-input>
         /
-        <el-input v-model="case_history.dbp" placeholder=""></el-input>
+        <el-input v-model="case_history.dbp" placeholder="血压"></el-input>
         mmHg
       </el-form-item>
     </el-form>
@@ -314,6 +360,14 @@
         diagnoses:[],
         sick:[],
         allergic_history:"",
+        primary_disease:"",
+        confirm_failure_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+        drug_allergy_history:"",
+        start_dialysis_date:"",
+        physical_examination:"",
+        special_inspection:"",
+        lab_apparatus:"",
+        first_dialysis_date:"",
         form:{
           id:0,
         },
@@ -371,6 +425,12 @@
             "diagnose":this.case_history.diagnose,
             "allergic_history":this.allergic_history,
             "id":this.form.id,
+            "primary_disease":this.primary_disease,
+            "confirm_failure_date":this.confirm_failure_date,
+            "drug_allergy_history":this.drug_allergy_history,
+            "physical_examination":this.physical_examination,
+            "special_inspection":this.special_inspection,
+            "lab_apparatus":this.lab_apparatus,
           };
           console.log("prams222",params);
           createCaseHistory(params).then(response => {
@@ -381,6 +441,14 @@
             } else {
               var caseHistory = response.data.data.caseHistory;
               console.log("caseHistory",caseHistory);
+              
+              this.primary_disease = caseHistory.primary_disease
+              this.confirm_failure_date = this.getTime(caseHistory.confirm_failure_date)
+              this.drug_allergy_history = caseHistory.drug_allergy_history
+              this.physical_examination = caseHistory.physical_examination
+              this.special_inspection = caseHistory.special_inspection
+              this.lab_apparatus = caseHistory.lab_apparatus
+
               this.$message.success("保存成功");
               this.doctor_advice = "";
               this.remark = "";
@@ -538,16 +606,22 @@
       },
     },
     created(){
+     
        this.getlist();
        this.getInitData();
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       console.log("232322323",this);
+       console.log("232322323",this.case_history);
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-
+      this.primary_disease = this.case_history.primary_disease
+      this.confirm_failure_date = this.case_history.confirm_failure_date
+      this.drug_allergy_history = this.case_history.drug_allergy_history
+      this.physical_examination = this.case_history.physical_examination
+      this.special_inspection = this.case_history.special_inspection
+      this.lab_apparatus = this.case_history.lab_apparatus
     },
     watch:{
       detalid:function(val){
@@ -579,7 +653,14 @@
           }
           this.form.id = this.case_history.id;
           this.allergic_history = this.case_history.allergic_history;
+          this.primary_disease = this.case_history.primary_disease
+          this.confirm_failure_date = this.case_history.confirm_failure_date
+          this.drug_allergy_history = this.case_history.drug_allergy_history
+          this.physical_examination = this.case_history.physical_examination
+          this.special_inspection = this.case_history.special_inspection
+          this.lab_apparatus = this.case_history.lab_apparatus
           this.watchSign++
+
         },
         deep:true
       },

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -14,7 +14,6 @@
                         :editable="false"
                         style="width: 100%;"
                         type="date"
-                        :picker-options="pickerOptions"
                         placeholder="选择开始时间"
                         align="right"
                         format="yyyy-MM-dd"
@@ -1102,6 +1101,7 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
+            console.log("电子比你2333223232323232323232323",this.case_history)
             this.info = response.data.data.info
             this.last_info = response.data.data.last_info
             this.schedule = response.data.data.schedule
@@ -1157,7 +1157,15 @@
             } else {
               this.case_history.is_infect = false
             }
-
+            
+            this.case_history.primary_disease = this.case_history.primary_disease
+            this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+            this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+            this.case_history.physical_examination = this.case_history.physical_examination
+            this.case_history.special_inspection = this.case_history.special_inspection
+            this.case_history.lab_apparatus = this.case_history.lab_apparatus
+         
+          
             //处方相关
             this.prescriptionList = response.data.data.prescription
 
@@ -1557,6 +1565,14 @@
                   } else {
                     this.case_history.is_infect = false
                   }
+
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                
                   this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {
@@ -2034,6 +2050,13 @@
                   } else {
                     this.case_history.is_infect = false
                   }
+
+                   this.case_history.primary_disease = this.case_history.primary_disease
+                   this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                   this.case_history.physical_examination = this.case_history.physical_examination
+                   this.case_history.special_inspection = this.case_history.special_inspection
+                   this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {
@@ -2491,6 +2514,12 @@
                 } else {
                   this.case_history.is_infect = false
                 }
+                this.case_history.primary_disease = this.case_history.primary_disease
+                this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                this.case_history.physical_examination = this.case_history.physical_examination
+                this.case_history.special_inspection = this.case_history.special_inspection
+                this.case_history.lab_apparatus = this.case_history.lab_apparatus
                 this.prescriptionList = response.data.data.prescription
 
                 if (response.data.data.prescription.length > 0) {
@@ -3007,7 +3036,13 @@
                   } else {
                     this.case_history.is_infect = false
                   }
-                  this.prescriptionList = response.data.data.prescription
+                   this.case_history.primary_disease = this.case_history.primary_disease
+                    this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                    this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                    this.case_history.physical_examination = this.case_history.physical_examination
+                    this.case_history.special_inspection = this.case_history.special_inspection
+                    this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                 this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {
                     for (let i = 0; i < response.data.data.prescription.length; i++) {
@@ -3340,6 +3375,12 @@
                     this.case_history.sick_type = ''
                   }
                   this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   if (this.case_history.is_infect == 1) {
                     this.case_history.is_infect = true
                   } else {
@@ -3440,7 +3481,12 @@
                     this.case_history.is_infect = false
                   }
                   this.prescriptionList = response.data.data.prescription
-
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   if (response.data.data.prescription.length > 0) {
                     for (let i = 0; i < response.data.data.prescription.length; i++) {
                       var prescription = response.data.data.prescription[i]
@@ -3768,6 +3814,12 @@
                     this.case_history.sick_type = ''
                   }
                   this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   if (this.case_history.is_infect == 1) {
                     this.case_history.is_infect = true
                   } else {
@@ -3938,7 +3990,9 @@
         }
       },
       handleClick() {
-        if (this.titleType == '电子处方') {
+        console.log("hhahdf adf adf ",this.titleType)
+         console.log("radio ",this.radio)
+        if (this.titleType == '电子处方' || this.titleType == "电子病历") {
           if (this.radio == 1) {
             this.un_cure_data.map(item => {
               if (item.id == this.patientid) {
@@ -3959,7 +4013,6 @@
             })
           }
         }
-
       },
       savePrint() {
         //处方
@@ -4134,6 +4187,12 @@
             }
 
             this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+            this.case_history.primary_disease = this.case_history.primary_disease
+            this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+            this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+            this.case_history.physical_examination = this.case_history.physical_examination
+            this.case_history.special_inspection = this.case_history.special_inspection
+            this.case_history.lab_apparatus = this.case_history.lab_apparatus
             if (this.case_history.is_infect == 1) {
               this.case_history.is_infect = true
             } else {

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -13,9 +13,9 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=0" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10215  || org_id == 0 " :paramsObj="invoiceParams"></printTwo>
-            <printThree v-if="org_id == 10265" :paramsObj="invoiceParams"></printThree>
+            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=4&& org_id !=0" :paramsObj="invoiceParams"></printOne>
+            <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
+            <printThree v-if="org_id == 10265 || org_id == 0|| org_id == 4" :paramsObj="invoiceParams"></printThree>
         </div>
     </div>
   </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -10,6 +10,10 @@
             <div  style="position: absolute;left:560px;top:70px;">
             <!-- 发票序号 -->
             </div>
+             <div  style="position: absolute;left:660px;top:70px;">
+            <!-- 类别 -->
+            类别：
+            </div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
@@ -78,7 +82,7 @@
             <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
             <div style="position: absolute;top:250px;left:340px">氧气费</div>
             <div style="position: absolute;top:250px;left:420px"></div>
-            <div style="position: absolute;top:250px;left:500px">其他</div>
+            <div style="position: absolute;top:250px;left:500px">其他费</div>
             <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
 
@@ -157,17 +161,16 @@
           {{list.order.maf_pay?list.order.maf_pay:''}}
           <!-- 医疗救助 -->
         </div>
-        <div style="position: absolute;top:340px;left:500px">
-            <!-- 大病 -->
+        <!-- 大病 -->
+        <!-- <div style="position: absolute;top:340px;left:500px">
           {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
-
-
-        </div>
-        <div style="position: absolute;top:340px;left:560px">
-            <!-- 其他基金支付 -->
+        </div> -->
+        <!-- 其他基金支付 -->
+        <!-- <div style="position: absolute;top:340px;left:560px">
+            
           {{list.order.oth_pay?list.order.oth_pay:''}}
 
-        </div>
+        </div> -->
         <div style="position: absolute;top:370px;left:320px">
             <!-- 预交款合计 -->
 

src/xt_pages/outpatientCharges/components/dayPrescriptionTable.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+          <el-select v-model="scope.row.execution_frequency" placeholder="请选择">
             <el-option
               v-for="item,index in efs"
               :key="index"

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2262,6 +2262,8 @@
                   return
                 }
               }
+
+
               this.$emit('editKeepLoad', true)
               let params = {
                 p_type: 2,
@@ -2293,6 +2295,44 @@
 
                 }
 
+                for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
+                  if(this.prescriptions[i].advices[b].delivery_way == "" ){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}用法未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].execution_frequency == "" ){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}频率未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].day == NaN){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].day == 0){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数不能为0`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].prescribing_number == ""){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].prescribing_number == "0"){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量不能为0`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].prescribing_number_unit == ""){
+                    this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量单位未填写`)
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                }
+
                 for (let b = 0; b < this.prescriptions[i].project.length; b++) {
                   this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
@@ -2301,6 +2341,29 @@
 
                 }
 
+                // for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+                //   if(this.prescriptions[i].project[b].delivery_way == "" ){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].project_name}用法未填写`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                //   if(this.prescriptions[i].project[b].execution_frequency == "" ){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].project_name}频率未填写`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                //   if(this.prescriptions[i].project[b].day == " "){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].number_days}天数未填写`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                //   if(this.prescriptions[i].project[b].day == "0"){
+                //     this.$message.error(`处方${i+1}的${this.prescriptions[i].project[b].number_days}天数不能为0`)
+                //     this.$emit('editKeepLoad', false)
+                //     return
+                //   }
+                // }
+
                 for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
                   this.prescriptions[i].addition[b].id = prarseInt(this.prescriptions[i].addition[b].id)
                   this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)
@@ -3028,7 +3091,7 @@
                    good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
                 }
               }
-               console.log("耗材列表2323232322332",good_info)
+               
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -11,13 +11,13 @@
     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
-        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.name" placeholder="姓名" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="性别: " prop="name">
-        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.gender" placeholder="性别" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="年龄: " prop="name">
-        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.age" placeholder="年龄" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="证件号:" prop="name">
         <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
@@ -32,7 +32,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="联系电话: " prop="name">
-        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.phone" placeholder="联系电话" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保类型: " prop="name">
         <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
@@ -45,45 +45,56 @@
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="医保证号" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="家庭住址: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.home_address" placeholder="家庭住址" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="过敏史: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+      <el-form-item label="药物过敏史: " prop="name">
+        <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
-<!-- 
+     
+      <!-- <el-form-item label="初始透析日期: " prop="name">
+         <el-date-picker
+          :disabled="true"
+          style="width:100%;"
+          v-model="first_dialysis_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item label="工作单位: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+         <el-input v-model="patientInfo.work_unit" placeholder="工作单位"  :disabled="true"></el-input>
       </el-form-item>
 
       <el-form-item label="原发病: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+        <el-input v-model="primary_disease" placeholder="原发病"></el-input>
       </el-form-item>
+      
+  
 
       <el-form-item label="确诊肾衰日期: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
-      </el-form-item>
-
-     <el-form-item label="药物过敏史: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
-      </el-form-item>
-
-       <el-form-item label="初始透析日期: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+         <el-date-picker
+          style="width:100%;"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          v-model="confirm_failure_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
       </el-form-item>
-
-       <el-form-item label="体格检查: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+     
+      <el-form-item label="体格检查: " prop="name">
+        <el-input v-model="physical_examination" placeholder="体格检查"></el-input>
       </el-form-item>
 
        <el-form-item label="专科检查: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+        <el-input v-model="special_inspection" placeholder="专科检查"></el-input>
       </el-form-item>
 
-        <el-form-item label="实验室及器械检查: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+      <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
+        <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
       </el-form-item> -->
 
     </el-form>
@@ -278,6 +289,7 @@
   import {  createCaseHistory,getInitData } from '@/api/his/his'
   import { getDataConfig } from "@/utils/data";
   import { getTemplateDetail,getMedicalTemplateList } from "@/api/project/project"
+  import { uParseTime } from '@/utils/tools'
   export default {
     props: {
       case_history: Object,
@@ -347,6 +359,15 @@
         diagnoses:[],
         sick:[],
         allergic_history:"",
+        primary_disease:"",
+        confirm_failure_date:"",
+        drug_allergy_history:"",
+        start_dialysis_date:"",
+        physical_examination:"",
+        special_inspection:"",
+        lab_apparatus:"",
+        first_dialysis_date:"",
+        work_unit:"",
         form:{
           id:0,
         },
@@ -404,9 +425,14 @@
             "diagnose":this.case_history.diagnose,
             "allergic_history":this.allergic_history,
             "id":this.form.id,
+            "primary_disease":this.primary_disease,
+            "confirm_failure_date":this.confirm_failure_date,
+            "drug_allergy_history":this.drug_allergy_history,
+            "physical_examination":this.physical_examination,
+            "special_inspection":this.special_inspection,
+            "lab_apparatus":this.lab_apparatus,
           }
-          console.log("prams222",params)
-         
+          console.log("param233322332232323",params)
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
@@ -415,6 +441,16 @@
             } else {
               var caseHistory = response.data.data.caseHistory
               console.log("caseHistory",caseHistory)
+              var historyInfo = response.data.data.historyInfo
+              console.log("historyInfo",historyInfo)
+              this.primary_disease = caseHistory.primary_disease
+              this.confirm_failure_date = this.getTime(caseHistory.confirm_failure_date)
+              this.drug_allergy_history = caseHistory.drug_allergy_history
+              this.physical_examination = caseHistory.physical_examination
+              this.special_inspection = caseHistory.special_inspection
+              this.lab_apparatus = caseHistory.lab_apparatus
+              this.form.id = historyInfo.id
+
               this.$message.success("保存成功")
               this.doctor_advice = ""
               this.remark = ""
@@ -432,7 +468,6 @@
               if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
                 console.log("templatedetail",templatedetail)
-
                 this.case_history.chief_conplaint =  templatedetail.chief_conplaint
                 this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness
                 this.case_history.past_history =  templatedetail.past_history
@@ -443,7 +478,7 @@
                 this.case_history.remark = templatedetail.remark
                 this.case_history.sick = templatedetail.sick
                 this.case_history.diagnose = templatedetail.diagnose
-
+              
               }
           })
         },
@@ -570,26 +605,44 @@
         })
 
       },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
     },
     created(){
+      
        this.getlist()
        this.getInitData()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       this.allergic_history = this.case_history.allergic_history
+      
+   
+      
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-
+      
+      this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
+      
+      this.primary_disease = this.case_history.primary_disease
+      this.confirm_failure_date = this.case_history.confirm_failure_date
+      this.drug_allergy_history = this.case_history.drug_allergy_history
+      this.physical_examination = this.case_history.physical_examination
+      this.special_inspection = this.case_history.special_inspection
+      this.lab_apparatus = this.case_history.lab_apparatus
     },
     watch:{
       detalid:function(val){
         this.getTemplateDetail(val)
+
       },
       'patientInfo.gender':{
         handler(newName, oldName){
-          console.log('newName',newName)
           if(newName == 1){
             this.patientInfo.gender = '男'
           }else if(newName == 2){
@@ -601,7 +654,7 @@
       },
       case_history:{
         handler(val){
-          console.log("南京人明",this.case_history)
+          
           this.allergic_history = this.case_history.allergic_history
           if(this.case_history.breathing == 0){
             this.case_history.breathing = ""
@@ -613,7 +666,13 @@
             this.case_history.diagnose = ""
           }
           this.form.id = this.case_history.id
-
+          
+          this.primary_disease = this.case_history.primary_disease
+          this.confirm_failure_date = this.case_history.confirm_failure_date
+          this.drug_allergy_history = this.case_history.drug_allergy_history
+          this.physical_examination = this.case_history.physical_examination
+          this.special_inspection = this.case_history.special_inspection
+          this.lab_apparatus = this.case_history.lab_apparatus
           this.watchSign++
         },
         deep:true

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -14,7 +14,6 @@
             :editable="false"
             style="width: 100%;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择开始时间"
             align="right"
             format="yyyy-MM-dd"
@@ -1333,6 +1332,7 @@ export default {
 
       }
       this.isloading = true
+      console.log("param32323232323323223233232332",params)
       getPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
@@ -1366,6 +1366,7 @@ export default {
           this.patientInfo = response.data.data.xt_info
           this.hisPatientInfo = response.data.data.his_info
           this.case_history = response.data.data.case_history
+        
           this.info = response.data.data.info
           this.last_info = response.data.data.last_info
           this.schedule = response.data.data.schedule
@@ -1422,6 +1423,14 @@ export default {
             this.case_history.is_infect = false
           }
 
+           this.case_history.allergic_history = this.case_history.allergic_history
+           this.case_history.primary_disease = this.case_history.primary_disease
+           this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+           this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+           this.case_history.physical_examination = this.case_history.physical_examination
+           this.case_history.special_inspection = this.case_history.special_inspection
+           this.case_history.lab_apparatus = this.case_history.lab_apparatus
+
           //处方相关
           this.prescriptionList = response.data.data.prescription
 
@@ -1712,7 +1721,7 @@ export default {
 
     choosePatient(val) {
       if (this.titleType == '电子病历') {
-        if (this.$refs.child.watchSign > 2) {
+        if (this.$refs.child!=undefined && this.$refs.child.watchSign > 2) {
           this.$confirm('是否保存当前病例', '保存', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -1743,6 +1752,7 @@ export default {
                 '-' +
                 (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
                 ':' + (min < 10 ? '0' + min : min)
+          
             getPatientInfo(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1776,6 +1786,45 @@ export default {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                
+                if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+               
+               
+                
+               
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
                 this.schedule = response.data.data.schedule
@@ -1829,6 +1878,8 @@ export default {
                 } else {
                   this.case_history.is_infect = false
                 }
+
+
                 this.prescriptionList = response.data.data.prescription
 
                 if (response.data.data.prescription.length > 0) {
@@ -2282,6 +2333,8 @@ export default {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+
+             
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
@@ -2334,6 +2387,42 @@ export default {
                 } else {
                   this.case_history.is_infect = false
                 }
+
+               if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.prescriptionList = response.data.data.prescription
 
                 if (response.data.data.prescription.length > 0) {
@@ -2768,6 +2857,7 @@ export default {
               this.patientInfo = response.data.data.xt_info
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
+             
               this.info = response.data.data.info
               this.last_info = response.data.data.last_info
 
@@ -2820,6 +2910,32 @@ export default {
               } else {
                 this.case_history.is_infect = false
               }
+
+                    
+             if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+              }
+                
+            
+               this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }
+
+
               this.prescriptionList = response.data.data.prescription
 
               if (response.data.data.prescription.length > 0) {
@@ -3213,7 +3329,7 @@ export default {
           this.$refs.child.watchSign = 0
         }
       } else {
-
+       
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -3313,6 +3429,43 @@ export default {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                console.log("999923923323232",this.case_history)
+               
+               if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.doctors = response.data.data.doctors
                 this.department = response.data.data.department
                 this.schedule = response.data.data.schedule
@@ -3323,7 +3476,7 @@ export default {
                   }
                 }
 
-                this.case_history = response.data.data.case_history
+              
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
@@ -3789,6 +3942,14 @@ export default {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                
+                this.case_history.primary_disease = this.case_history.primary_disease
+                this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                this.case_history.physical_examination = this.case_history.physical_examination
+                this.case_history.special_inspection = this.case_history.special_inspection
+                this.case_history.lab_apparatus = this.case_history.lab_apparatus
+
                 var month_prescriptions = response.data.data.month_prescriptions
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
@@ -3801,7 +3962,6 @@ export default {
                   }
                 }
 
-                this.case_history = response.data.data.case_history
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
@@ -3891,6 +4051,42 @@ export default {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                
+                if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
                 this.schedule = response.data.data.schedule
@@ -4251,6 +4447,42 @@ export default {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+
+                if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
                 this.schedule = response.data.data.schedule
@@ -4468,10 +4700,9 @@ export default {
       }
     },
     handleClick() {
-      if (this.titleType == '电子处方') {
+      if (this.titleType == '电子处方' || this.titleType == '电子病历') {
         if (this.radio == 1) {
           this.un_cure_data.map(item => {
-            console.log('~~~~~~~~')
             if (item.id == this.patientid) {
               console.log('~~~~~~~~22222222')
 
@@ -4618,6 +4849,42 @@ export default {
           this.patientInfo = response.data.data.xt_info
           this.hisPatientInfo = response.data.data.his_info
           this.case_history = response.data.data.case_history
+
+            if(this.case_history.primary_disease == ""){
+                this.case_history.primary_disease = ""
+            }else{
+              this.case_history.primary_disease = this.case_history.primary_disease
+            }
+            
+            if(this.case_history.confirm_failure_date <=0){
+              this.case_history.confirm_failure_date = ""
+            }else{
+              this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+            }
+
+            if(this.case_history.drug_allergy_history ==""){
+                this.case_history.drug_allergy_history = ""
+            }else{
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+            }
+              
+            if(this.case_history.physical_examination ==""){
+              this.case_history.physical_examination = ""
+            }else{
+              this.case_history.physical_examination = this.case_history.physical_examination
+            }
+            if(this.case_history.special_inspection == ""){
+              this.case_history.special_inspection = ""
+            }else{
+              this.case_history.special_inspection = this.case_history.special_inspection
+            }
+              
+            if(this.case_history.lab_apparatus == ""){
+              this.case_history.lab_apparatus = ""
+            }else{
+              this.case_history.lab_apparatus = this.case_history.lab_apparatus
+            }
+
           this.info = response.data.data.info
           this.last_info = response.data.data.last_info
           this.schedule = response.data.data.schedule

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -2,7 +2,7 @@
   <div>
     <template>
       <el-button
-        style="position:fixed;right:25px;z-index:999"
+        style="position: fixed; right: 25px; z-index: 999"
         size="small"
         icon="el-icon-printer"
         @click="printThisPage"
@@ -10,52 +10,71 @@
         >打印</el-button
       >
     </template>
-            
-    <div class='dialysisPage' style="padding-top:40px;">
-      <printOne ref="printOne"  v-bind:childResponse="childResponse" :patient="patient" :hispatient="hispatient" :history="history" :patientid="patientid"></printOne>
+
+    <div class="dialysisPage" style="padding-top: 40px">
+      <printOne
+        v-if="org_id != 10217 && org_id != 0"
+        ref="printOne"
+        v-bind:childResponse="childResponse"
+        :patient="patient"
+        :hispatient="hispatient"
+        :history="history"
+        :patientid="patientid"
+      ></printOne>
+      <printTwo
+        v-if="org_id == 10217 || org_id == 0"
+        ref="printTwo"
+        v-bind:childResponse="childResponse"
+        :patient="patient"
+        :hispatient="hispatient"
+        :history="history"
+        :patientid="patientid"
+      ></printTwo>
     </div>
   </div>
 </template>
 
 <script>
-
 import { parseTime } from "@/utils";
 import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
-import { getSchedulePatientList } from '@/api/his/his'
-import { getPatientCaseHistory } from "@/api/project/project"
-import printOne from "./recordTemplate/printOne"
+import { getSchedulePatientList } from "@/api/his/his";
+import { getPatientCaseHistory } from "@/api/project/project";
+import printOne from "./recordTemplate/printOne";
+import printTwo from "./recordTemplate/printTwo";
 export default {
   name: "dialysisPrintOrder",
   components: {
     BreadCrumb,
-    printOne
+    printOne,
+    printTwo,
   },
-  props:{
-    patientid:Number,
+  props: {
+    patientid: Number,
   },
   data() {
     return {
       crumbs: [
         { path: false, name: "透析管理" },
-        { path: false, name: "打印单" }
+        { path: false, name: "打印单" },
       ],
       childResponse: {},
       patientTableData: [],
-      search_input:"",
-      patient:{},
-      hispatient:{},
-      educationOptions:[],
-      history:{},
-      keyword:"",
+      search_input: "",
+      patient: {},
+      hispatient: {},
+      educationOptions: [],
+      history: {},
+      keyword: "",
+      org_id,
     };
   },
   methods: {
-    show(val){
-       
-       this.$refs.printOne.show(val)
+    show(val) {
+      this.$refs.printOne.show(val);
+      this.$refs.printTwo.show(val);
     },
     getAdminUser(id) {
       if (id == 0) {
@@ -84,68 +103,80 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}';
-      printJS({
-        printable: "prescription-print",
-        type: "html",
-        style: style,
-        scanStyles: false
-      });
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
+       const style1 =
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.infoTitle div{width: 300px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
+      
+      
+      if (this.org_id != 10217 && this.org_id != 0) {
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      } else if (this.org_id == 10217 || this.org_id == 0) {
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style1,
+          scanStyles: false,
+        });
+      }
     },
 
-     //患者列表
-      getPatientList(){
-        
-         let params = {
-           'record_date':this.$route.query.record,
-        }
-     
-      getSchedulePatientList(params).then(response => {
-         if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-         } else {
-            this.patientTableData = []
-            console.log("list0000000",response.data.data.list)
-            // for (let i = 0; i < response.data.data.list.length; i++) {
-            //   if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
-            //      this.patientTableData.push(response.data.data.list[i])
-            //     }
-            //   }
-              this.patientTableData = response.data.data.list
-             }  
-          })
-      },
+    //患者列表
+    getPatientList() {
+      let params = {
+        record_date: this.$route.query.record,
+      };
 
-    changePatient(val){
+      getSchedulePatientList(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.patientTableData = [];
+          console.log("list0000000", response.data.data.list);
+          // for (let i = 0; i < response.data.data.list.length; i++) {
+          //   if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+          //      this.patientTableData.push(response.data.data.list[i])
+          //     }
+          //   }
+          this.patientTableData = response.data.data.list;
+        }
+      });
+    },
 
-        const params = {
-          patient_id:val.patient_id
+    changePatient(val) {
+      const params = {
+        patient_id: val.patient_id,
+      };
+      console.log("params", params);
+      getPatientCaseHistory(params).then((response) => {
+        if (response.data.state == 1) {
+          var patient = response.data.data.patient;
+          console.log("patinet", patient);
+          this.patient = patient;
+          var history = response.data.data.history;
+          console.log("history", history);
+          this.history = history;
+          var hispatient = response.data.data.hispatient;
+          console.log("hispatient", hispatient);
+          this.hispatient = hispatient;
         }
-        console.log("params",params)
-      getPatientCaseHistory(params).then(response=>{
-         if(response.data.state == 1){
-           var patient = response.data.data.patient
-           console.log("patinet",patient)
-           this.patient = patient
-           var history = response.data.data.history
-           console.log("history",history)
-           this.history = history
-           var hispatient = response.data.data.hispatient
-           console.log("hispatient",hispatient)
-           this.hispatient = hispatient
-         }
-      })
+      });
     },
-    searchAction(){
-      this.getPatientList()
+    searchAction() {
+      this.getPatientList();
     },
-  
   },
   created() {
-    // this.getPatientList() 
-    console.log("455555555555555",this.patientid)
-    this.$refs.printOne.show(this.patientid)
+    // this.getPatientList()
+    this.org_id = this.$store.getters.xt_user.org.id;
+    console.log("=====", this.org_id);
+    this.$refs.printOne.show(this.patientid);
+    this.$refs.printTwo.show(this.patientid);
   },
   // computed:{
   //   filtedSchedules: function() {
@@ -336,22 +367,22 @@ export default {
 </style>
 
 <style lang="scss">
-
-.newContainer{
+.newContainer {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
-  .el-date-editor{
-    .el-input__inner{
-      padding-right:0px;
+
+  .el-date-editor {
+    .el-input__inner {
+      padding-right: 0px;
     }
   }
-  .el-table td, .el-table th{
+  .el-table td,
+  .el-table th {
     text-align: center;
   }
 }
-.newContainer::-webkit-scrollbar{
+.newContainer::-webkit-scrollbar {
   height: 15px !important;
 }
 </style>

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -0,0 +1,334 @@
+<template>
+  <div id="prescription-print">
+    <div class="prescription-print">
+      <div class="printTitle">{{ orgname }}血透中心病历</div>
+       <div class="record_Title">
+            <div>姓名：{{patient.name?patient.name:''}}</div>
+            <div>性别：
+                <span v-if="patient.gender == 1">男</span>
+                <span v-if="patient.gender == 2">女</span>
+            </div>
+            <div>年龄：{{patient.age?patient.age:''}}岁</div>
+            <div>透析病历号:{{patient.id?patient.id:''}}</div>
+        </div>
+      <div class="infoTitle" style="margin-top:20px;">
+        <div>姓名：{{ patient.name ? patient.name : "" }}</div>
+        <div>
+          家庭住址：{{ patient.home_address ? patient.home_address : "" }}
+        </div>
+      </div>
+      <div class="infoTitle">
+        <div>
+          性别：
+          <span v-if="patient.gender == 1">男</span>
+          <span v-if="patient.gender == 2">女</span>
+        </div>
+        <div>工作单位：</div>
+       
+      </div>
+      <div class="infoTitle">
+        <div>出生日期：</div>
+        <div>身份证号：</div>
+      </div>
+      <div class="infoTitle">
+        <div>联系人：</div>
+        <div>联系电话：{{ patient.phone ? patient.phone : "" }}</div>
+      </div>
+      <div class="otherInfo" style="border-bottom: 1px solid">
+        <div>进入透析时间：</div>
+        <div style="flex: 1"></div>
+      </div>
+      <div class="infoTitle">
+        <div style="width: 300px">原发病：</div>
+        <div>确诊肾衰日期：</div>
+      </div>
+      <div class="otherInfo">
+        <div>
+          药物过敏史：{{ patient.past_history ? patient.past_history : "" }}
+        </div>
+      </div>
+      <div class="otherInfo">
+        <div>初始透析日期：</div>
+        <div style="flex: 1"></div>
+      </div>
+      <div class="otherInfo" style="border-bottom: 1px solid">
+        <div>血管通路：</div>
+        <div style="flex: 1"></div>
+      </div>
+
+      <div class="otherInfo" style="min-height: 60px;">
+        <div class="otherName">主诉：</div>
+        <div style="flex: 1">
+          {{ history.chief_conplaint ? history.chief_conplaint : "" }}
+        </div>
+      </div>
+
+      <div class="otherInfo" style="min-height: 200px;">
+        <div class="otherName">现病史：</div>
+        <div style="flex: 1">
+          {{
+            history.history_of_present_illness
+              ? history.history_of_present_illness
+              : ""
+          }}
+        </div>
+      </div>
+
+      <div class="otherInfo" style="min-height: 100px;">
+        <div class="otherName">既往史：</div>
+        <div style="flex: 1">
+          {{ history.past_history ? history.past_history : "" }}
+        </div>
+      </div>
+
+      <div class="otherInfo" style="min-height: 80px;">
+        <div class="otherName">个人史：</div>
+        <div style="flex: 1">
+          {{ history.personal_history ? history.personal_history : "" }}
+        </div>
+      </div>
+
+      <div class="otherInfo" style="min-height: 80px;">
+        <div class="otherName">家族史：</div>
+        <div style="flex: 1">
+          {{ history.family_history ? history.family_history : "" }}
+        </div>
+      </div>
+
+      <div style="page-break-after: always; margin-top: 50px"></div>
+    </div>
+
+    <div class="prescription-print">
+      <!-- <div class="printTitle">病历内容</div> -->
+      <div class="recordTitle">
+        <div>体格检查</div>
+        <div class="recordContent" style="height:250px;">
+          <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+          <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+          <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+          <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+        </div>
+        <div></div>
+      </div>
+      <div class="recordTitle">
+        <div>专科检查</div>
+        <div class="recordContent"></div>
+      </div>
+      <div class="recordTitle" style="border-bottom: 1px solid">
+        <div>实验室及器械检查</div>
+        <div class="recordContent" style="height:250px;"></div>
+      </div>
+      <div style="display: flex; justify-content: end">
+        <div class="endInfo">
+          <div style="height: 100px">
+            诊断：{{ history.diagnostic ? history.diagnostic : "" }}
+          </div>
+          <div style="display: flex">
+            <div>医师：</div>
+            <div>
+              手签：{{
+                getDoctor(history.doctor) ? getDoctor(history.doctor) : ""
+              }}
+            </div>
+          </div>
+          <div style="text-align: center; letter-spacing: 3px">2000 年 2 月 4 日</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { jsGetAge, uParseTime } from "@/utils/tools";
+
+import { getDataConfig } from "@/utils/data";
+import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
+export default {
+  props: {
+    patient: Object,
+    hispatient: Object,
+    patientid: Number,
+    //   history:Object,
+  },
+  data() {
+    return {
+      educationOptions: [],
+      departmentList: [],
+      orgname: "",
+      history: {},
+      printDate: "",
+    };
+  },
+  methods: {
+    getAge(patient) {
+      var thisLen = patient.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + patient.id_card_no.substr(6, 6);
+      } else {
+        birth = patient.id_card_no.substr(6, 8);
+      }
+      var births =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+      return jsGetAge(births, "-");
+    },
+    show(val) {
+      this.patientid = val;
+      this.getAllDoctorList();
+      this.getPatientCaseHistory();
+    },
+    getProfession(id) {
+      var name = "";
+      for (let i = 0; i < this.educationOptions.length; i++) {
+        if (id == this.educationOptions[i].id) {
+          name = this.educationOptions[i].name;
+        }
+      }
+      return name;
+    },
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
+
+          this.doctorList = doctor;
+          var department = response.data.data.department;
+          console.log("department", department);
+          this.departmentList = department;
+        }
+      });
+    },
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
+        }
+      }
+      return name;
+    },
+    getPatientCaseHistory() {
+      const params = {
+        patient_id: this.patientid,
+      };
+      console.log("病历22222", params);
+      getPatientCaseHistory(params).then((response) => {
+        if (response.data.state == 1) {
+          var patient = response.data.data.patient;
+          //    console.log("patinet",patient)
+          this.patient = patient;
+          var history = response.data.data.history;
+          console.log("中国history222222", history);
+          this.history = history;
+          var hispatient = response.data.data.hispatient;
+          //    console.log("hispatient",hispatient)
+          this.hispatient = hispatient;
+        }
+      });
+    },
+    getDeparment(id) {
+      var name = "";
+      for (let i = 0; i < this.departmentList.length; i++) {
+        if (id == this.departmentList[i].id) {
+          name = this.departmentList[i].name;
+        }
+      }
+      return name;
+    },
+  },
+  created() {
+    this.educationOptions = getDataConfig("patient", "education_types");
+    this.getAllDoctorList();
+    this.getPatientCaseHistory();
+
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    var data = new Date();
+    var month =
+      data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+    var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+    this.printDate = data.getFullYear() + "-" + month + "-" + date;
+  },
+  watch: {
+    patientid: function (val) {
+      console.log("val22332323", val);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+}
+.infoTitle {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.infoTitle div {
+  width: 200px;
+}
+.otherInfo {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.endInfo {
+  display: flex;
+  flex-direction: column;
+  justify-content: end;
+  margin-top: 10px;
+  line-height: 24px;
+}
+.endInfo div {
+  width: 300px;
+}
+.recordTitle {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+  border-top: 1px solid;
+}
+.recordTitle div {
+  width: 100%;
+  text-align: center;
+}
+.recordTitle .recordContent {
+  width: 100%;
+  height: 150px;
+  text-align: left;
+}
+
+.record_Title{
+    display: flex;
+    margin-top:10px;
+    line-height: 24px;
+    padding:0 10px;
+    border-bottom: 2px solid #000;
+}
+
+.record_Title div{
+  width: 200px;
+}
+</style>

src/xt_pages/outpatientTool/components/drugDetail.vue

@@ -58,7 +58,7 @@
            
             <el-table-column align="center" prop="total" label="操作">
                 <template slot-scope="scope">
-                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id)">使用明细</div>
+                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id,scope.row.max_unit,scope.row.min_unit)">使用明细</div>
                 </template>
             </el-table-column>
 
@@ -96,7 +96,8 @@
             </el-table-column>
             <el-table-column align="center" prop="name" label="数量">
                 <template slot-scope="scope">
-                    {{scope.row.prescribing_number/min_number}}
+                  <span v-if="scope.row.prescribing_number_unit == max_unit">{{scope.row.prescribing_number/min_number}}</span>   
+                  <span v-if="scope.row.prescribing_number_unit == min_unit && max_unit!=min_unit">{{scope.row.prescribing_number}}</span>   
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="单位">
@@ -150,6 +151,8 @@ import { min } from 'moment'
        min_number:0,
        drug_type:"",
        drug_id:0,
+       max_unit:"",
+       min_unit:"",
       }
     },
     methods:{
@@ -285,10 +288,14 @@ import { min } from 'moment'
         }
         return max_str + min_str
        },
-       jump(val,min_number,drug_id){
+       jump(val,min_number,drug_id,max_unit,min_unit){
+         console.log("max_unit23232233",max_unit)
+         console.log("min_unit23232233",min_unit)
          this.dialogVisible = true
          this.tableList= val
          this.min_number = min_number
+         this.max_unit = max_unit
+         this.min_unit = min_unit
          this.drug_id = drug_id
        },
        getPatientName(id){

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -21,7 +21,7 @@
               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
               <td style="line-height:18px;" width="100">规格<br>型号</td>
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
-            
+              <td style="line-height:18px;" width="80">经销商</td>
               <td style="line-height:18px;" width="80">进货价</td>
               <td style="line-height:18px;" width="80">入库<br>数量</td>
               <td style="line-height:18px;" width="80">单位</td>
@@ -43,6 +43,7 @@
                  <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
+              <td style="line-height: 18px">{{ getDeatl(item.dealer) }}</td>
               <td style="line-height:18px">
                   {{item.price}}
               </td>
@@ -64,7 +65,9 @@
             </tr>
             <tr>
               <td>合计</td>
-              <td colspan="12" style="text-align:right;">{{getAllPrince(it.id).toFixed(2)}}</td>
+              <td colspan="7" style="text-align:center"></td>
+              <td style="text-align:center">{{getAllPrince(it.id).toFixed(2)}}</td>
+              <td colspan="6" style="text-align:center"></td>
             </tr>
             </tbody>
           </table>
@@ -282,6 +285,7 @@
             return false;
             } else {
              this.manufacturer = response.data.data.manufacturer;
+             this.dealer = response.data.data.dealer
               this.getList()
             }
         });
@@ -358,6 +362,16 @@
           }
         }
         return count
+      },
+       getDeatl(id){
+       
+        var dealer_name = ""
+        for(let i=0;i<this.dealer.length;i++){
+          if(id == this.dealer[i].id){
+            dealer_name = this.dealer[i].dealer_name
+          }
+        }
+        return dealer_name
       }
     },
     created() {

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -32,6 +32,7 @@
                                     <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
                                     <td style="line-height:18px;" width="80">规格<br>型号</td>
                                     <td style="line-height:18px;" width="80">生产<br>厂商</td>
+                                    <td style="line-height:18px;" width="80">经销商</td>
                                     <td style="line-height:18px;" width="80">单位</td>
                                     <td style="line-height:18px;" width="80">进货价</td>
                                     <td style="line-height:18px;" width="80">入库<br>数量</td> 
@@ -50,6 +51,7 @@
                                     <td style="line-height:18px;">{{ item.license_number }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
+                                    <td style="line-height:18px;">{{ getDeatl(item.dealer) }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
                                     <td style="line-height:18px;">{{item.price}}</td>
                                     <td style="line-height:18px;">{{item.warehousing_count}}</td> 
@@ -63,7 +65,9 @@
                                 </tr>
                                 <tr>
                                   <td>合计</td>
-                                  <td colspan="12" style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
+                                  <td colspan="7" style="text-align:center;"></td>
+                                  <td style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
+                                  <td colspan="6" style="text-align:center"></td>
                                </tr>
                             </tbody>
                         </table>
@@ -180,6 +184,7 @@ export default {
                   if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
                      this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
                   }
+                
                } 
             }
              console.log("商品信息",this.goodInfo)
@@ -297,9 +302,9 @@ export default {
      getManufacturer(id){
          let name = ""
          for(let i=0;i<this.goodInfo.length;i++){
-             if(id == this.goodInfo[i].id){
-                name  =this.goodInfo[i].manufacturer_name
-             }
+            if(id == this.goodInfo[i].id){
+              name  =this.goodInfo[i].manufacturer_name
+            }
          }
          return name
       },
@@ -348,6 +353,16 @@ export default {
           }
         }
         return total_price
+      },
+      getDeatl(id){
+        console.log("23323233223",id)
+        var dealer_name = ""
+        for(let i=0;i<this.dealer.length;i++){
+          if(id == this.dealer[i].id){
+            dealer_name = this.dealer[i].dealer_name
+          }
+        }
+        return dealer_name
       }
     },
     created(){

src/xt_pages/stock/stockQuery.vue

@@ -189,7 +189,7 @@
               getCancelCount(scope.row.id)
               }}
            </span>
-           <span v-if="org_id != 9675 || org_id != 3907 || org_id != 9583">
+           <span v-if="org_id != 9675 && org_id != 3907 && org_id != 9583">
                {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
            </span>
          </template>