bug

src/api/deposit.js

@@ -9,6 +9,15 @@ export function getuserlist(params) {
   })
 }
 
+//获取病例中心，有效患者名称（去除了转出和死亡的）
+export function gethisusertoalive(params) {
+  return request({
+    url: '/api/his/gethisusertoalive',
+    method: 'get',
+    params: params
+  })
+}
+
 //获取病例中心，有效患者名称=
 export function gethisuser(params) {
   return request({
@@ -99,7 +108,7 @@ export function rechargesummary(params) {
   })
 }
 
-//根据患者id获取押金流水
+//根据患者id获取押金流水=
 export function depositflow(params) {
   return request({
     url: '/api/his/depositflow',
@@ -153,7 +162,7 @@ export function deleterefund(params) {
   })
 }
 
-//退款分页=
+//退款列表=
 export function refundlist(params) {
   return request({
     url: '/api/his/refundlist',
@@ -162,7 +171,7 @@ export function refundlist(params) {
   })
 }
 
-//获取机构名称
+//获取机构名称=
 export function getorgname(params) {
   return request({
     url: '/api/his/getorgname',
@@ -170,3 +179,21 @@ export function getorgname(params) {
     params: params
   })
 }
+
+//获取本周起止时间
+export function getweektime(params) {
+  return request({
+    url: '/api/his/getweektime',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取本月起止时间
+export function getmonthtime(params) {
+  return request({
+    url: '/api/his/getmonthtime',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/DepositManagement/DepositRefund.vue

@@ -35,13 +35,13 @@
                 style="width: 200px; margin-left: 10px"
                 class="filter-item"
                 placeholder="请输入编号/患者名称"
-                v-model.trim="keyword"
+                v-model.trim="tmp_keyword"
               />
             </div>
 
             <div style="width: 287px;margin-right: 30px;white-space: nowrap;">
               退款类型：
-              <el-select v-model="refundtype" placeholder="请选择" @change="updaterefundtype">
+              <el-select v-model="tmp_refundtype" placeholder="请选择" @change="updaterefundtype">
                 <el-option
                   v-for="item in refundtypelist"
                   :key="item.name"
@@ -54,7 +54,7 @@
 
             <div style="width: 288px;margin-right: 30px;white-space: nowrap;">
               审核状态：
-              <el-select v-model="examinetype" placeholder="请选择" @change="updateexaminetype">
+              <el-select v-model="tmp_examinetype" placeholder="请选择" @change="updateexaminetype">
                 <el-option
                   v-for="item in examinelist"
                   :key="item.name"
@@ -68,7 +68,7 @@
             <div style="width: 465px;white-space: nowrap;">
               <span>日期查询：</span>
               <el-date-picker
-                v-model="value1"
+                v-model="tmp_value1"
                 type="daterange"
                 range-separator="至"
                 start-placeholder="开始日期"
@@ -83,7 +83,7 @@
               class="filter-item"
               type="primary"
               icon="el-icon-search"
-              @click="search"
+              @click="search_tmp"
               >查询</el-button
             >
           </div>
@@ -172,7 +172,7 @@
       >
         <refundAdd ref="refuna_add" v-bind="$attrs"></refundAdd>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="pass">审核通过</el-button>
+          <el-button @click="pass">取消</el-button>
           <el-button type="primary" @click="Submit">保 存</el-button>
         </span>
       </el-dialog>
@@ -185,10 +185,23 @@
       >
         <refundUpdate ref="refuna_up" v-bind="$attrs"></refundUpdate>
         <span slot="footer" class="dialog-footer">
-<!--          <el-button @click="pass">审核通过</el-button>-->
+          <el-button @click="pass02">取消</el-button>
           <el-button type="primary" @click="Submit02">保 存</el-button>
         </span>
       </el-dialog>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -199,7 +212,8 @@ import refundUpdate from "./Template/refundUpdate.vue";
 import {
   refundlist,
   deleterefund,
-  refundreview
+  refundreview,
+  getweektime
 }from "@/api/deposit";
 export default {
   components: {
@@ -219,11 +233,13 @@ export default {
       ],
       tableData: [],
       multipleSelection: [],
-      // total: 0,
-      // page: 1,
-      // limit: 10,
+      total: 0,
+      page: 1,
+      limit: 10,
       keyword: "",
+      tmp_keyword:"",//临时keyword
       value1:"",
+      tmp_value1:"",//临时日期
       start_time:"",
       end_time:"",
       // sum:"",
@@ -231,17 +247,29 @@ export default {
       dialogVisible02:false,
       close: false,
       refundtype: 0,//退款类型
+      tmp_refundtype: 0,//临时退款类型
       examinetype: 3,//审核类型
+      tmp_examinetype: 3,//临时审核状态
 
     };
   },
 
   created(){
-    this.search()
+    this.init();
+    // this.search()
   },
   methods: {
     // 初始化数据
-    init() {},
+    init() {
+      var params = {}
+      getweektime(params).then((res) => {
+        if (res.data.state == 1){
+          this.tmp_value1 = [res.data.data.srart_time,res.data.data.end_time]
+          this.value1 = [res.data.data.srart_time,res.data.data.end_time]
+        }
+        this.search()
+      })
+    },
     updaterefundtype(){
       console.log("refundtype",this.refundtype)
     },
@@ -268,11 +296,48 @@ export default {
         end_time: this.end_time,
         refundtype: this.refundtype,
         examinetype: this.examinetype,
+        page: this.page,
+        limit: this.limit,
+      };
+      // console.log("params",params)
+      refundlist(params).then((res) => {
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          this.total = res.data.data.total;
+        }
+      })
+    },
+    // 查询操作_查询按钮触发
+    search_tmp() {
+      console.log("==this.tmp_value1==",this.tmp_value1)
+      console.log("==this.value1==",this.value1)
+      this.keyword = this.tmp_keyword;
+      this.refundtype = this.tmp_refundtype;
+      this.examinetype = this.tmp_examinetype;
+      this.value1 = this.tmp_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,
+        page: 1,//this.page,
+        limit: this.limit,
       };
       // console.log("params",params)
       refundlist(params).then((res) => {
         if (res.data.state == 1){
           this.tableData = res.data.data.list;
+          this.total = res.data.data.total;
         }
       })
     },
@@ -290,7 +355,8 @@ export default {
     // 编辑
     edit(data,val){
       if(data.trial_status != 0){
-        alert("当前状态不可编辑")
+        // alert("当前状态不可编辑")
+        this.$message.error("当前状态不可编辑!")
           return
       }
       this.dialogVisible02 = true;
@@ -382,16 +448,18 @@ export default {
     // 提交
     Submit() {
       this.$refs['refuna_add'].subfrom();
-      // setTimeout(() => {
-      //   this.$refs['rechange_details'].search();
-      // },500)
     },
     Submit02(){
       this.$refs['refuna_up'].subfrom();
     },
     // 退款申请审核
     pass(){
-      this.$refs['refuna_add'].examine();
+      // this.$refs['refuna_add'].examine();
+      this.dialogVisible = false;
+    },
+    pass02(){
+      // this.$refs['refuna_add'].examine();
+      this.dialogVisible02 = false;
     },
     pli() {
       // alert("父组件被调用!")
@@ -401,6 +469,15 @@ export default {
       // alert("父组件被调用!")
       this.dialogVisible02 = false;
     },
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.search();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.search();
+    },
 
     // 列表选择
     handleSelectionChange(val){

src/xt_pages/DepositManagement/DepositSearch.vue

@@ -21,7 +21,7 @@
 <!--            placeholder="请输入患者名称"-->
 <!--            v-model.trim="keyword"-->
 <!--          />-->
-          <el-select v-model.trim="keyword" clearable filterable placeholder="请输入患者名称" @select="handleSelect" ><!--@change="updateconfig1(h1)"-->
+          <el-select v-model.trim="tmp_keyword" clearable filterable placeholder="请输入患者名称" @select="handleSelect" @change="updateconfig"><!--@change="updateconfig1(h1)"-->
             <el-option
               v-for="item in users"
               :key="item.id"
@@ -47,7 +47,7 @@
           color: '#606266',
         }"
         :data="tableData"
-        
+
         border
       >
         <el-table-column type="index" label="序号" align="center" width="200">
@@ -111,6 +111,7 @@ export default {
       page: 1,
       limit: 10,
       keyword:'',
+      tmp_keyword:'',
       users:[],//可用患者列表
     };
   },
@@ -149,9 +150,10 @@ export default {
 
     // 查询操作
     search() {
+      this.keyword = this.tmp_keyword
       var params = {
         keyword: this.keyword,
-        page: this.page,
+        page: 1,//this.page,
         limit: this.limit,
       };
       getuserlist(params).then((res) =>{
@@ -172,10 +174,11 @@ export default {
       this.init();
     },
     handleSelect(item){
-      this.keyword = item.id
+      this.tmp_keyword = item.id
     },
     updateconfig(){
       console.log("keyword",this.keyword)
+
     },
 
     // 流水详情

src/xt_pages/DepositManagement/RechargeDetailsSummary.vue

@@ -31,7 +31,7 @@
         <!-- <span>这是一段信息</span> -->
         <RechangeAd ref="add_page" v-bind="$attrs"></RechangeAd>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="pass">审核通过</el-button>
+          <el-button @click="pass">取消</el-button>
           <el-button type="primary" @click="Submit">提 交</el-button>
         </span>
       </el-dialog>
@@ -66,6 +66,9 @@ export default {
       close: false,
     };
   },
+  created(){
+    this.search()
+  },
   methods: {
     // 初始化数据
     init() {
@@ -73,7 +76,9 @@ export default {
     },
 
     // 查询操作
-    search() {},
+    search() {
+      this.$refs['rechange_details'].search();
+    },
     // 切换明细
     handleClick(tab, event) {
       // console.log(tab, event);
@@ -112,7 +117,8 @@ export default {
 
     // 审核通过
     pass() {
-      this.$refs['add_page'].examine();
+      // this.$refs['add_page'].examine();
+      this.dialogVisible = false;
     },
 
     // 提交

src/xt_pages/DepositManagement/Template/DeductionDetails.vue

@@ -69,7 +69,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="医收费类型" align="center">
+        <el-table-column label="收费类型" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.chargetype	 ? scope.row.chargetype	 : "" }}</span>
           </template>
@@ -91,6 +91,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="350px">
           <template slot-scope="scope">
+            <span v-if="scope.row.button_show == 1">
             <el-button
               size="small"
               type="primary"
@@ -98,6 +99,7 @@
             >
               查看详情
             </el-button>
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -109,7 +111,8 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
-  deductiondetails
+  deductiondetails,
+  getweektime
 }from "@/api/deposit";
 export default {
   components: {
@@ -134,7 +137,8 @@ export default {
   },
 
   created(){
-    this.search()
+    this.init();
+    // this.search()
   },
   methods: {
 
@@ -144,7 +148,7 @@ export default {
         console.log(param,'oo')
         let sums = [];
         columns.forEach((column, index) => {
-          
+
           if (index === 0) {
             sums[index] = '总价';
             return;
@@ -170,7 +174,15 @@ export default {
       },
 
     // 初始化数据
-    init() {},
+    init() {
+      var params = {}
+      getweektime(params).then((res) => {
+        if(res.data.state == 1){
+          this.value1 = [res.data.data.srart_time,res.data.data.end_time]
+        }
+        this.search()
+      })
+    },
 
     // 查询操作
     search() {
@@ -200,7 +212,9 @@ export default {
     },
 
     // 查看详情
-    Details() {},
+    Details(val,index) {
+      this.$router.push({path:"/outpatientCharges/summaryDetail?patient_id="+val.name_id+"&number="+val.number+"&id="+val.id})
+    },
   },
 };
 </script>

src/xt_pages/DepositManagement/Template/DeductionSummary.vue

@@ -85,7 +85,8 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
-  desummary
+  desummary,
+  getweektime
 }from "@/api/deposit";
 export default {
   components: {
@@ -110,11 +111,20 @@ export default {
   },
 
   created(){
-    this.search()
+    this.init();
+    // this.search()
   },
   methods: {
     // 初始化数据
-    init() {},
+    init() {
+      var params = {}
+      getweektime(params).then((res) => {
+        if (res.data.state == 1){
+          this.value1 = [res.data.data.srart_time,res.data.data.end_time]
+        }
+        this.search()
+      })
+    },
 
     // 查询操作
     search() {

src/xt_pages/DepositManagement/Template/DepositDetails.vue

@@ -38,7 +38,7 @@
             end-placeholder="结束日期"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="search"
+            @change="search_tmp"
           >
           </el-date-picker>
         </div>
@@ -106,6 +106,19 @@
 
       </el-table>
 
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100, 200, 500, 1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top: 20px"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -113,7 +126,8 @@
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
   refundlist,
-  depositflow
+  depositflow,
+  getmonthtime
 }from "@/api/deposit";
 export default {
   components: {
@@ -134,11 +148,14 @@ export default {
       name: "",
       sum:0,
       deposit_status:0,
+      total: 0,
+      page: 1,
+      limit: 10,
     };
   },
   created(){
     this.init();
-    this.search();
+    // this.search();
   },
   methods: {
     // 初始化数据
@@ -147,15 +164,48 @@ export default {
       // 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
+      var params = {}
+      getmonthtime(params).then((res) => {
+        if (res.data.state == 1){
+          this.value1 = [res.data.data.srart_time,res.data.data.end_time]
+          console.log("==========this.value1",this.value1);
+        }
+        this.search();
+      })
+      // this.search();
     },
-    // lili(){
-    //   alert("触发")
-    // },
-    // ljc(){
-    //   alert(this.deposit_status)
-    // },
     // 查询操作
     search() {
+      console.log("this.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 = {
+        id: this.id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        deposit_status: this.deposit_status,
+        page: this.page,
+        limit: this.limit,
+      };
+      // 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;
+          this.total = res.data.data.total;
+        }
+      })
+    },
+    // 查询操作_用于日期
+    search_tmp() {
+      console.log("this.value1++++++++++++",this.value1);
       if (this.value1 != null){
         if(this.value1[0] != undefined && this.value1[1] != undefined){
           this.start_time = this.value1[0]
@@ -170,15 +220,29 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         deposit_status: this.deposit_status,
+        page: 1,//this.page,
+        limit: this.limit,
       };
       // 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;
+          this.total = res.data.data.total;
         }
       })
     },
+
+    // 页表操作
+    handleSizeChange(val) {
+      this.limit = val;
+      this.search();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.search();
+    },
+
   },
 };
 </script>

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

@@ -106,6 +106,7 @@
             >
               审核
             </el-button>
+            <span v-if="scope.row.trial_status == 1">
             <el-button
               size="small"
               type="primary"
@@ -113,6 +114,7 @@
             >
               打印凭证
             </el-button>
+            </span>
             <el-button
               size="small"
               type="danger"
@@ -135,7 +137,8 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
   rechargedetails,
   deletehistory,
-  updeposit
+  updeposit,
+  getweektime
 }from "@/api/deposit";
 export default {
   components: {
@@ -159,11 +162,20 @@ export default {
     };
   },
   created(){
-    this.search()
+    this.init();
+    // this.search()
   },
   methods: {
     // 初始化数据
-    init() {},
+    init() {
+      var params = {}
+      getweektime(params).then((res) => {
+        if (res.data.state == 1){
+            this.value1 = [res.data.data.srart_time,res.data.data.end_time]
+        }
+        this.search()
+      })
+    },
 
     // 查询操作
     search() {

src/xt_pages/DepositManagement/Template/RechargeSummary.vue

@@ -77,7 +77,7 @@
         </el-table-column>
 
       </el-table>
-<!-- 
+<!--
       <div>
           充值金额合计：<span>{{sum}}</span>
       </div> -->
@@ -87,7 +87,8 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
-  rechargesummary
+  rechargesummary,
+  getweektime
 }from "@/api/deposit";
 export default {
   components: {
@@ -111,11 +112,19 @@ export default {
     };
   },
   created(){
+    this.init();
     this.search()
   },
   methods: {
     // 初始化数据
-    init() {},
+    init() {
+      var params = {}
+      getweektime(params).then((res) => {
+        if (res.data.state == 1){
+          this.value1 = [res.data.data.srart_time,res.data.data.end_time]
+        }
+      })
+    },
 
     // 查询操作
     search() {

src/xt_pages/DepositManagement/Template/add_page.vue

@@ -30,7 +30,7 @@
 <script>
 import {
   getdepositcode,
-  gethisuser,
+  gethisusertoalive,
   adddeposit
 }from "@/api/deposit";
 export default {
@@ -40,7 +40,7 @@ export default {
         remarks:"",
         code:"",
         patient_name:"",
-        money:0
+        money:"",
       },
       users:[],//可用患者列表
       trial_status:0,
@@ -70,7 +70,7 @@ export default {
     //获取患者列表
     getusername(){
       var params = {};
-      gethisuser(params).then((res) =>{
+      gethisusertoalive(params).then((res) =>{
         if (res.data.state == 1){
           this.users = res.data.data.list;
         }
@@ -98,6 +98,7 @@ export default {
         }else {
           this.$message.error("新增失败：" + res.data.msg);
         }
+
       })
     },
     handleSelect(item){
@@ -112,7 +113,7 @@ export default {
       // alert("清除");
       this.form.patient_name = "";
       this.form.remarks = "";
-      this.form.money = 0;
+      this.form.money = "";
       this.trial_status = 0;
     },
   },

src/xt_pages/DepositManagement/Template/refundUpdate.vue

@@ -113,7 +113,8 @@ export default {
     //审核通过
     examine(){
       if(this.trial_status == 1){
-        alert("已审核")
+        // alert("已审核")
+        this.$message.success("已审核");
       }
       this.trial_status = 1
 

src/xt_pages/data/components/addDrugs.vue

@@ -342,7 +342,7 @@
                             <el-input v-model="form.social_security_directory_code" style="width:160px"></el-input>
                         </el-form-item>
 
-                      
+
 
                         <el-form-item label="备案日期:">
                             <el-date-picker
@@ -353,7 +353,7 @@
                                     placeholder="选择日期时间">
                             </el-date-picker>
                         </el-form-item>
-                      
+
                         <el-form-item label="是否零用:">
 
                             <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
@@ -365,7 +365,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                      
+
 
                         <el-form-item label="药品备注:">
                             <el-input v-model="form.drug_remark" style="width:160px"></el-input>

src/xt_pages/data/components/editProject.vue

@@ -157,12 +157,12 @@
                                 placeholder="选择日期时间">
                             </el-date-picker>
                         </el-form-item>
-                      
+
                         <el-form-item label="备注 : " prop="remark" style="width:100%;">
                             <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                         </el-form-item>
 
-                        
+
                     </el-form>
                 </div>
             </el-tab-pane>
@@ -233,7 +233,7 @@
                             :value="item.value">
                             </el-option>
                         </el-select>
-                    </el-form-item>       
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -261,13 +261,13 @@ export default {
              ],
             value: '',
             radio:'1',
-          
+
             form:{
               id:0,
               project_name:"",
               pinyin:"",
-              wubi:"", 
-              price:"", 
+              wubi:"",
+              price:"",
               unit:"",
               cost_classify:"",
               executive_section:"",
@@ -296,7 +296,7 @@ export default {
               specail_project:"",
               social_security_directory_code:"",
               record_date:"",
-              
+
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -350,7 +350,7 @@ export default {
            this.visible = true
            this.formTitle = '编辑'
            this.getProjectDetail(id)
-          
+
         },
         hide() {
          this.visible = false
@@ -362,7 +362,7 @@ export default {
           return getDictionaryDataConfig(module, filed_name)
        },
        getProjectDetail(id){
-        
+
          getProjectDetail(id).then(response=>{
             if(response.data.state == 1){
               var projecDetail =  response.data.data.projecDetail
@@ -399,7 +399,7 @@ export default {
               this.form.execution_frequency = projecDetail.execution_frequency
               this.form.number_days = projecDetail.number_days
               this.form.total = projecDetail.total
-            
+
               this.form.category = projecDetail.category
                if(projecDetail.category == 0){
                 this.form.category = ""
@@ -419,8 +419,8 @@ export default {
             }
          })
        },
-     
-       
+
+
        submitAction(formName){
           this.$refs[formName].validate((valid)=>{
             if(valid){
@@ -459,14 +459,14 @@ export default {
                     social_security_directory_code:this.form.social_security_directory_code,
                     record_date:this.form.record_date
                }
-              
+
               updatedProject(params).then(response=>{
                  if(response.data.state == 1){
                    var hisProject = response.data.data.hisProject
                    this.$message.success('保存成功')
                    this.$parent.getlist()
                    this.visible = false
-                   
+
                  }
               })
             }
@@ -501,7 +501,7 @@ export default {
     },
 
     created(){
-       this.getlist() 
+       this.getlist()
        this.getInitializtion()
     }
 }

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -717,7 +717,7 @@ export default {
 
           this.records = this.records.concat(resp.data.schedules)
           console.log("记录23323322332",this.records)
- 
+
 
           for (const recordIndex in this.records) {
             var dlegh = 0

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -39,7 +39,7 @@
                         <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{d}") }}</div>日
                     </div>
                     <div class="inline_block" style="margin-right:5px;">
-                        姓名 
+                        姓名
                         <div class="inline_block under_line" style="width:100px;text-align: center;">
                             {{ record.patient.name ? record.patient.name : "" }}
                         </div>
@@ -57,7 +57,7 @@
                         岁
                     </div>
                     <div class="inline_block" style="margin-right:5px;">
-                        机器编号 
+                        机器编号
                         <div class="inline_block under_line" style="width:80px;">
                           {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
                         <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->
@@ -70,7 +70,7 @@
                 <div style="border-bottom: 2px solid #000;width:100%;"></div>
                 <div class="row">
                     <div class="inline_block" style="margin-right:30px;">
-                        血液净化方式 
+                        血液净化方式
                         <div
                           class="under_line"
                           style="width: 100px;text-align: center;font-weight:600;"
@@ -193,20 +193,20 @@
                         </div>
                     </div>
                     <div class="inline_block" style="margin-right:30px;">
-                        血液净化器类型 
+                        血液净化器类型
                         <div class="inline_block under_line" style="width:150px;text-align: center;">
                             {{ record.prescription.dialyzer_perfusion_apparatus ? record.prescription.dialyzer_perfusion_apparatus : ''}}
                         </div>
                     </div>
                     <div class="inline_block" style="margin-right:30px;">
-                        透析液配方 
+                        透析液配方
                         <div class="inline_block under_line" style="width:150px;text-align: center;">
                             {{ record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation) : ''}}
                         </div>
                     </div>
                 </div>
                 <div class="row">
-                    血管通路 
+                    血管通路
                     <div class="inline_block under_line" style="width:92%;text-align: left;">
                     <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-左') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-右')" showValue="内瘘"></label-box>
                     （<label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-左')" showValue="左"></label-box>
@@ -237,20 +237,20 @@
                 </div>
                 <div class="row">
                   <div class="inline_block" style="margin-right:30px;">
-                      导管 
+                      导管
                       <div class="inline_block under_line" style="width:200px;text-align: left;">
                           {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter : ''}}
                       </div>
                   </div>
                   <div class="inline_block" style="margin-right:30px;">
-                      内瘘 
+                      内瘘
                       <div class="inline_block under_line" style="width:200px;text-align: left;">
                           {{ record.assessment_before_dislysis.internal_fistula ? record.assessment_before_dislysis.internal_fistula : ''}}
                       </div>
                   </div>
                 </div>
                 <div class="row">
-                    抗凝药物 
+                    抗凝药物
                     <div class="inline_block under_line" style="width:92%;text-align: left;">
                     <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>&nbsp;
                     <label-box :isChecked="record.prescription.anticoagulant == 3 ?  true : record.prescription.anticoagulant == 6 ? true : record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
@@ -267,7 +267,7 @@
                         <span v-if="record.prescription.anticoagulant == 2">iu</span>
                         <span v-if="record.prescription.anticoagulant == 1">mg</span>
                         <span v-if="record.prescription.anticoagulant == 6">iu</span>
-                        <span v-if="record.prescription.anticoagulant == 7">iu</span>&nbsp; 
+                        <span v-if="record.prescription.anticoagulant == 7">iu</span>&nbsp;
                     </div>
                     <div class="inline_block">
                         追加
@@ -280,7 +280,7 @@
                         <span v-if="record.prescription.anticoagulant == 2">iu/h</span>
                         <span v-if="record.prescription.anticoagulant == 1">mg/h</span>
                         <span v-if="record.prescription.anticoagulant == 6">iu/h</span>
-                        <span v-if="record.prescription.anticoagulant == 7">iu/h</span>&nbsp; 
+                        <span v-if="record.prescription.anticoagulant == 7">iu/h</span>&nbsp;
                     </div>
                     <div class="inline_block">
                         总量
@@ -341,7 +341,7 @@
                     </div>
                 </div>
                 <div class="row">
-                    透前评估 
+                    透前评估
                     <div class="inline_block under_line" style="width:50%;text-align: left;">
                       <div class="inline_block" style="margin-right:30px;">
                           体温
@@ -373,7 +373,7 @@
                       <div class="inline_block under_line" style="width:80px;text-align: center;">
                         {{ record.assessment_before_dislysis.dialysis_count ? record.assessment_before_dislysis.dialysis_count : "" }}
                       </div>
-            
+
                     </div>
                 </div>
                 <div class="row">
@@ -475,7 +475,7 @@
                                     </span>
                                 </span>
                             </div>
-                            
+
                         </span>
                     </td>
                     <td>
@@ -593,7 +593,7 @@
                             </span>
                           </div>
                         </td>
-                        
+
                     </tr>
                     <tr>
                       <td width="90" style="border:none;padding-left:5px">实际置换量:</td>
@@ -701,8 +701,8 @@
                             <img class="es-img" style="height:30px;" :src="setAdminUserES(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false)" />
                         </span>
                         </span>
-                        
-                        
+
+
                     </td>
                     </tr>
                 </table>

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyEight.vue

@@ -160,7 +160,7 @@
                         <div class="widthLength25">治疗总时长：{{ record.prescription.dialysis_duration_hour ? record.prescription.dialysis_duration_hour : 0 }}小时
                         {{ record.prescription.dialysis_duration_minute ? record.prescription.dialysis_duration_minute : 0 }}分钟
                         </div>
-                        <div class="widthLength25">透析器：{{ record.prescription.dialysis_dialyszers ? record.prescription.dialysis_dialyszers : '' }} 
+                        <div class="widthLength25">透析器：{{ record.prescription.dialysis_dialyszers ? record.prescription.dialysis_dialyszers : '' }}
                         <span v-if="record.prescription.dialysis_irrigation!=''">/{{record.prescription.dialysis_irrigation}}</span>
                         </div>
                     </div>
@@ -367,7 +367,7 @@
                         <div class="widthLength25">透析器凝血：{{ record.assessment_after_dislysis.cruor ? record.assessment_after_dislysis.cruor : "" }}</div>
                         <div class="widthLength25"></div>
                         <div class="widthLength25"></div>
-                        
+
                     </div>
                     <div class="lineHeight">
                     <div class="widthLength25">血管通路功能：
@@ -384,14 +384,14 @@
                         <span v-if="record.assessment_after_dislysis.hemostasis_opera == 4">内瘘止血带</span>
                         </div>
                         <div class="widthLength25">透析状态：在透</div>
-                        
+
                     </div>
                     <div class="lineHeight">
                         <div class="widthLength25">URR：{{ record.assessment_after_dislysis.urr ? record.assessment_after_dislysis.urr : '未测' }}</div>
                         <div class="widthLength25">kt/V：{{ record.assessment_after_dislysis.ktv ? record.assessment_after_dislysis.ktv : '未测' }}</div>
                         <div class="widthLength25">透析相关高血压：{{ record.assessment_after_dislysis.hypertenison == 1 ? '有' : '无' }}</div>
                         <div class="widthLength25">透析相关低血压：{{ record.assessment_after_dislysis.hypopiesia == 1 ? '有' : '无' }}</div>
-                        
+
                     </div>
                     <div class="lineHeight">
                         <div class="widthLength25">转归：

src/xt_pages/dialysis/batch_print/batch_print_order_thirtySeven.vue

@@ -48,7 +48,7 @@
                         <span style="display:inline-block;width:25%;">
                         日期：{{getTime(record.schedule_date, "{y}-{m}-{d}")}}
                         </span>
-                        
+
                     </td>
                     <!-- <td style="text-align:center;" colspan="1">
                         机器号:
@@ -192,7 +192,7 @@
                     <tr>
                         <td style="text-align:left;" colspan="2">
                             <span style="display:inline-block;width:15%;margin-left:15px;width:100%;">
-                                
+
                                 <span style="display:inline-block;width:30%">
                                     透析机:{{ record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : '' }}
                                 </span>
@@ -269,8 +269,8 @@
                         <sub>2</sub>
                         <br />%
                     </td>
-                    
-                    
+
+
                     <td style="min-width:60px">病情变化及处理</td>
                     <td style="min-width:110px">护士签名核对者</td>
                     </tr>
@@ -325,7 +325,7 @@
                     <td
                         style="height:30px;line-height:30px"
                     >{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                    
+
                     <td class="parent" style="text-align:left;padding-left: 20px !important;">
                         <span v-if="advice.parent_id > 0">&nbsp;&nbsp;&nbsp;</span>
                         <span>{{ advice.advice_name }}</span>
@@ -418,7 +418,7 @@
                     </td>
                     </tr>
                 </table>
-                
+
 
                 <!-- <div style="margin-top:20px">
                     <span style="margin-left:280px;">肝素浓度:每毫升肝素生理盐水含肝素钠2.5毫克</span>

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -495,7 +495,7 @@
                       <label-box
                         :isChecked="
                           isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '人造血管')
-                           || 
+                           ||
                           isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '移植血管')
                         "
                         showValue="其他"
@@ -935,7 +935,7 @@
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
                         monitor.blood_flow_volume
-                          ? monitor.blood_flow_volume 
+                          ? monitor.blood_flow_volume
                           : "0"
                       }}</span
                     >
@@ -944,7 +944,7 @@
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
                         monitor.ultrafiltration_volume
-                          ? monitor.ultrafiltration_volume 
+                          ? monitor.ultrafiltration_volume
                           : "0"
                       }}
                     </span>
@@ -1149,7 +1149,7 @@
                                     </span>
                                 </span>
                             </div>
-                            
+
                         </span>
                     </td>
                     <td colspan="2">
@@ -1430,7 +1430,7 @@
                             srcset=""
                             v-else
                           />
-                      
+
                     </span>
                   </td>
                 </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_twenty.vue

@@ -60,7 +60,7 @@
                         <td width="10">床</td>
                         <td></td>
 
-                        
+
                     </tr>
                     </tbody>
                 </table>
@@ -149,7 +149,7 @@
                                 </td>
                                 <td width="35">℃</td>
                                 <td width='10'></td>
-                                
+
                                 <td></td>
                             </tr>
                             </tbody>
@@ -514,7 +514,7 @@
                                     <label-box :isChecked="false" showValue="3.0mmol/L"></label-box>
                                 )
                                 </td>
-                                
+
                                 <td></td>
                             </tr>
                             </tbody>
@@ -523,7 +523,7 @@
                         <table class="table-box">
                             <tbody>
                             <tr>
-                                
+
                                 <td width="70">治疗方式:</td>
                                 <td width="50">
                                 <label-box :isChecked="record.prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>
@@ -662,7 +662,7 @@
                                     </span>
                                 </span>
                             </div>
-                            
+
                         </span>
                     </td>
                     <td>
@@ -751,7 +751,7 @@
                         &nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
                         </td>
 
-                       
+
                         <td>
                         &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                         </td>
@@ -981,7 +981,7 @@
                                     {{ getAdminUser(record.dialysis_order, 'start_nurse') }}</span>
                                     <img class="es-img" style="height:30px" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset="" v-else />
 
-                                    
+
                                 </div>
                                 </td>
                                 <td width=""></td>
@@ -1016,7 +1016,7 @@
             </div>
             <div style="page-break-after: always;"></div>
         </div>
-      </div> 
+      </div>
     </div>
   </div>
 </template>

src/xt_pages/dialysis/batch_print/batch_print_order_twentyFive.vue

@@ -87,7 +87,7 @@
                     </tr>
                     </tbody>
                 </table>
-                
+
                 <table class="print-table" border="1">
                     <tbody>
                     <tr>
@@ -100,7 +100,7 @@
                             <td width="240">
                             <div style="display:flex;justify-content:space-between;">
                                 <label-box v-for="(item, index) in way_arr" :key="index" :isChecked="record.receive_assessment.way == item.id ? true : false" :showValue="item.name"></label-box>
-                                
+
                             </div>
                             </td>
 
@@ -137,7 +137,7 @@
                             <td width="35">℃</td>
                             <td width="30"></td>
 
-                           
+
 
                             <td width="40">脉搏:</td>
                             <td width="70">
@@ -178,7 +178,7 @@
                             </div>
                             </td>
                             <td width="40"></td>
-                            
+
                             <td width="40">打折:</td>
                             <td width="100">
                             <label-box :isChecked="record.assessment_before_dislysis.catheter_bend == 1?true:false" showValue='有'></label-box>
@@ -239,7 +239,7 @@
                         </tbody>
                         </table>
 
-                        
+
 
                         <table class="table-box">
                         <tbody>
@@ -297,7 +297,7 @@
                                 <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '颈内静脉-临时')" showValue="临时"></label-box>&nbsp;）
                                 <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '股静脉')" showValue="股静脉"></label-box>
                                 &nbsp;
-                                
+
                             </div>
                             </td>
 
@@ -399,7 +399,7 @@
                             </div>
                             </td>
                             <td width="20">L</td>
-                            
+
                             <td width="80">透析方式:</td>
                             <td width="50">
                             <label-box :isChecked="record.prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>
@@ -473,7 +473,7 @@
                             <div class="under-line" >
                                 &nbsp;
                                 <span v-if="record.prescription.anticoagulant == 2">{{ record.prescription.anticoagulant_weichi ? record.prescription.anticoagulant_weichi : "/" }}</span>
-                                
+
                             </div>
                             </td>
                             <td width="40">
@@ -606,7 +606,7 @@
                     <td>
                         &nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
                     </td>
-                
+
                     <td>
                         &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                     </td>
@@ -623,7 +623,7 @@
                 </table>
                 <table class="print-table" border="1">
                     <tbody>
-                
+
                     <tr style="line-height:35px;padding:8px 5px;">
                     <td style="font-size: 16px" width="30" :rowspan="record.advices.length + 1">
                         医嘱内容
@@ -947,7 +947,7 @@
             </div>
             <div style="page-break-after: always;"></div>
         </div>
-      </div> 
+      </div>
     </div>
   </div>
 </template>

src/xt_pages/dialysis/batch_print/batch_print_order_twentyTwo_one.vue

@@ -411,7 +411,7 @@
                             :checked="record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1?true:false"
                           >
                           </check-box>
-                        
+
                         <!-- <check-box
                           text="绳梯"
                           :checked="

src/xt_pages/dialysis/components/allSummaryDialog.vue

@@ -144,7 +144,7 @@ export default {
           })
         }
 
-      
+
     }
 }
 </script>

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -262,7 +262,7 @@ export default {
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-              
+
                 this.tableData = schedule
                 var total = response.data.data.total
                 this.total = total
@@ -367,7 +367,7 @@ export default {
           // 把时间日期转成时间戳
           return new Date(time).getTime() / 1000;
          },
-        getlist(){   
+        getlist(){
             const params ={
               start_time:this.start_time,
               keyword:this.search_input,
@@ -380,7 +380,7 @@ export default {
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-              
+
                 var total = response.data.data.total
                 this.total = total
                 var prescription =  response.data.data.prescription
@@ -388,7 +388,7 @@ export default {
                 this.prescriptionList = prescription
                 var dialysbefor = response.data.data.dialysbefor
                 this.dialysisBefor = dialysbefor
-                
+
                 var patient = response.data.data.patient
                  for(let i=0;i<patient.length;i++){
                   if(patient[i].mode_id == 1){
@@ -529,7 +529,7 @@ export default {
              dryWeight = this.dialysisBefor[i].dry_weight
           }
         }
-       
+
        return dryWeight
      },
      getSysBloodPressure(id){
@@ -539,7 +539,7 @@ export default {
              sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
           }
         }
-      
+
         return sysBloodPressure
      },
      getTargetUltrafiltration(id){
@@ -586,20 +586,20 @@ export default {
             shouji = "("+this.prescriptionList[i].anticoagulant_shouji
           }
         }
-       
+
        return shouji
      },
      getAnticoagulantWeichi(id){
-   
+
         var weichi = ""
         for(let i=0;i<this.prescriptionList.length;i++){
-         
+
           if(id == this.prescriptionList[i].patient_id){
              weichi =  "(" + this.prescriptionList[i].anticoagulant_weichi
-          } 
+          }
         }
         return weichi
-     
+
      },
      getAnticoagulantZongliang(id){
        var zongliang = ""

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -29,7 +29,7 @@
                    抗凝剂
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="规格名称"> 
+            <el-table-column align="center" prop="name" label="规格名称">
                 <template slot-scope="scope">
                    <span v-if="scope.row.anticoagulant==1">无肝素</span>
                    <span v-if="scope.row.anticoagulant==2">普通肝素</span>
@@ -135,7 +135,7 @@ export default {
                console.log("count22222",count)
                this.tableData = count
              }
-          })  
+          })
         }
     }
 }

src/xt_pages/dialysis/details/NavIgation.vue

@@ -565,21 +565,21 @@ export default {
       const sorted = this.groupBy(doctorAdvice, function(item) {
         return [item.groupno];
       });
-     
-    
+
+
       // var strLength = 0
       // var arr = []
       // if(this.his_doctor_advices!=undefined && this.his_doctor_advices.length > 0){
       //   for(let i=0;i<this.his_doctor_advices.length;i++){
       //     if (this.his_doctor_advices[i].execution_state == 2) {
       //      arr.push(this.his_doctor_advices[i]);
-      //    } 
+      //    }
       //   }
       //   strLength = arr.length
       // }
       // console.log("232332323232323223",arrOne.length + strLength);
       return sorted.length
-      
+
     },
     groupBy(array, f) {
       const groups = {};
@@ -640,6 +640,7 @@ export default {
       this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis,this.last_assessment_after_dislysis);
     },
     showDoctorAdviceDialog: function() {
+      console.log("!!!!!!temp_schedual",this.temp_schedual)
       this.$refs.doctor_advice.show(this.his_is_open,this.is_advice_open);
     },
     showComputerDialog: function() {
@@ -660,7 +661,7 @@ export default {
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
-      
+
       this.$refs.doubleCheck.show();
     },
     showrTeatmentSummary: function() {

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

@@ -24,7 +24,7 @@
       </div>
 
 
-      
+
       <el-form
         ref="adForm"
         :rules="adRules"
@@ -201,6 +201,8 @@
         >删除医嘱
         </el-button>
         <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
+        <el-button @click="lili">调试</el-button>
+<!--        <el-button @click="lili" >调试</el-button>-->
 
         <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
       </div>
@@ -227,6 +229,7 @@
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
+
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -275,7 +278,7 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士"><!--bug642-->
           <template slot-scope="scope">
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.execution_staff)}}
@@ -314,11 +317,20 @@
         :modal-append-to-body="false"
         highlight-current-row
       >
+
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
+
+        <!--===================================-->
+<!--        <el-table-column prop="date" label="调试" align="center" min-width="26px">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span @click="lili(scope.$index,scope.row)">{{ scope.row.parent_id }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -326,11 +338,11 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容32323" align="center">
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link">
-                {{ getAdviceContent(scope.row, 1)}}
+                {{ getAdviceContent(scope.row, 1)}}<!--修改这里医嘱内容s-->
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -389,6 +401,7 @@
             <span v-else>{{getXuserName(scope.row.checker)}}</span>
           </template>
         </el-table-column>
+
       </el-table>
 
       <!-- 医嘱列表 end -->
@@ -473,7 +486,7 @@
       <!-- 新医嘱列表 -->
 
 
-      <!-- 新增医嘱(子药)表单 -->
+      <!-- 新增医嘱(子药)表单 || 新增子药表单 -->
       <!-- 医嘱表单 -->
       <el-form ref="form" :model="form" label-width="100px" v-show="showAdviceForm">
         <el-row :gutter="20">
@@ -507,7 +520,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="药品规格：">
+            <el-form-item label="药品规格："><!--li-->
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
@@ -567,7 +580,7 @@
                   v-for="item in unitsOption"
                   :key="item.id"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -614,8 +627,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
         <el-button @click="hideForm">取 消</el-button>
-        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存</el-button>
-        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button>
+        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存1</el-button><!--新增子药保存按钮(选择医嘱名称前)-->
+        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存2</el-button><!--新增子药保存按钮(选择医嘱名称后)-->
       </div>
       <!-- 医嘱表单 end -->
     </el-dialog>
@@ -855,9 +868,16 @@
       'dialysis_order.id': function() {
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
-     
+
     },
     methods: {
+      //调试
+      lili(index,row){
+        // console.log("==index==",index)
+        // console.log("==row==",row)
+        console.log("==doctor_advices==",this.doctor_advices)
+        console.log("==this.form==",this.form)
+      },
       getContent: function() {
         if (this.sch != null) {
           var date = uParseTime(this.sch.schedule_date, '{y}-{m}-{d}')
@@ -928,7 +948,7 @@
               adviceNames: this.other_doctor_advices,
               remark: ''
             }
-           
+
             let mode = '1'
             CreateGroupAdvice(this.patientid, 0, submitForm, mode).then(
               response => {
@@ -969,6 +989,9 @@
         }
       },
       submitEditAdvice() {
+        // console.log()
+        console.log("==this.form==",this.form)
+        console.log("==this.src_type==",this.src_type)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
@@ -981,7 +1004,7 @@
           this.$message.error('没有选择患者')
           return false
         }
-        
+
         let mode = '2'
         if (this.form.advice_doctor != this.$store.getters.xt_user.user.id) {
           mode = '3'
@@ -1209,7 +1232,7 @@
             isEdit: 1,
             index: this.groupSelectRow.index
           }
-         
+
         } else {
           this.nameForm = {
             advice_name: '',
@@ -1267,7 +1290,7 @@
       }
       ,
       submitExce() {
-        
+
         if (this.currentRow == null) {
           this.$message.error('请先选择要执行的医嘱！')
           return false
@@ -1304,7 +1327,7 @@
                   if (response.data.data.advice.parent_id > 0) {
                     exid = response.data.data.advice.parent_id
                   }
-                
+
                   this.currentRow.execution_state = 1
                   this.currentRow.execution_staff =
                     response.data.data.advice.execution_staff
@@ -1340,7 +1363,7 @@
                 this.execTimeDialogVisible = false
                 return false
               }
-              
+
             }
           })
           .catch(() => {
@@ -1363,10 +1386,11 @@
         }
         let mode = '1'
 
+        console.log("==this.form==",this.form)
+        console.log("==this.src_type==",this.src_type)
+
        if(this.src_type == ""){
-          this.form.way = 0
-          this.form.drug_id = 0
-          this.form.drug_name_id = 0
+          this.form.way = 1
        }
 
        if(this.src_type == 2){ //自备药
@@ -1374,9 +1398,9 @@
           this.form.advice_name = arr[0]
        }
 
-        
-        CreateDoctorAdvice(this.patient.id, this.form, mode)
-          .then(response => {
+
+        CreateDoctorAdvice(this.patient.id, this.form, mode).then(response => {
+          console("保存!!!!!!!!!!!!!!!this.form",this.form)
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1393,18 +1417,15 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-
+              console.log("保存",this.form.parent_id)
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
                 for (let index = this.doctor_advices.length - 1; ; index--) {
-                  if (
-                    this.doctor_advices[index].parent_id === this.form.parent_id
-                  ) {
+                  console.log("====this.doctor_advices[index].origin====",this.doctor_advices[index].origin)
+                  if (this.doctor_advices[index].parent_id === this.form.parent_id) {
                     spliceIndex = index
                     break
-                  } else if (
-                    this.doctor_advices[index].id === this.form.parent_id
-                  ) {
+                  } else if (this.doctor_advices[index].id === this.form.parent_id) {
                     spliceIndex = index
                     break
                   }
@@ -1417,20 +1438,22 @@
                     var swapData = this.doctor_advices.splice(spliceIndex)
                     this.doctor_advices.push(response.data.data.advice)
                     for (var index in swapData) {
-                      this.doctor_advices.push(swapData[index]) 
+                      this.doctor_advices.push(swapData[index])
                     }
                   }
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
               }
-              
               return false
             }
           })
           .catch(v => {
             this.loading = false
           })
+        // location. reload()
+        this.getDialysisScheduleDetail()
+
       }
       ,
       openNewChildTwo(index, row) {
@@ -1572,7 +1595,7 @@
       ,
 
       openGroupFrom() {
-        
+
         this.$refs.addGroupForm.open()
 
         // this.title="新增医嘱";
@@ -1797,7 +1820,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-           
+
             let mode = '4'
             if (
               this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id
@@ -2038,7 +2061,9 @@
       }
       ,
       show(his_is_open,is_advice_open) {
-       
+        console.log("this.doctor_advices",this.doctor_advices)
+        console.log("++++his_is_open++++++",his_is_open)
+        console.log("++++is_advice_open++++++",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
@@ -2179,6 +2204,9 @@
       }
       ,
       getAdviceContent(row, isChild) {
+        // alert("来")
+        console.log("row",row)
+        console.log("isChild",isChild)
         let tempSingleDoseDesc = ''
         let tempDrugSpecDesc = ''
         let tempPrescribingNumberDesc = ''
@@ -2203,12 +2231,8 @@
         if (row.advice_desc) {
           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' + " " + row.remark
         }
-
-
-
         if (isChild == 1) {
           // 不是子药
-
           return (
             row.advice_name +
             tempDrugSpecDesc +
@@ -2317,7 +2341,7 @@
           if (response.data.state == 1) {
 
             var doctor_advices = response.data.data.advices
-           
+
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule
@@ -2532,14 +2556,14 @@
       },
 
      querySearch(queryString, cb) {
-      
+
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-     
+
         cb(results);
      },
 
@@ -2550,9 +2574,9 @@
      },
 
      querySearch1(queryString, cb) {
-       
+
         var restaurants = this.drugSpec;
-        
+
         restaurants.map(item => {
           item.value = item.drug_spec
         })
@@ -2560,8 +2584,27 @@
         // 调用 callback 返回建议列表的数据
         cb(results);
       },
-     handleSelect(){
-
+      //<!--li-->
+     handleSelect(val){
+        console.log("==val==",val)
+       var tmp = val.drug_specs[0]
+       console.log("==tmp==",tmp)
+       //药品规格
+       this.form.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+       this.form.drug_spec_unit = tmp.max_unit
+       //开药数量
+       this.form.prescribing_number = tmp.prescribing_number//开药数量
+       this.form.prescribing_number_unit = tmp.prescribing_number_unit
+       //单次用量
+       this.form.single_dose = tmp.single_dose//单次用量
+       this.form.single_dose_unit = tmp.drug_dose_unit
+
+       this.form.drug_id = tmp.id
+       console.log("!!!!!!!!!!!!this.form.drug_id = tmp.id")
+       console.log("tmp.id",tmp.id)
+       console.log("this.form.drug_id",this.form.drug_id)
+
+       // this.form.id = tmp.id
      }
     },
     created() {
@@ -2574,8 +2617,8 @@
       this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
-      
-    
+
+
       // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()

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

@@ -159,10 +159,33 @@
                 align="center"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.single_dose != 0"
-                    >{{ scope.row.single_dose
-                    }}{{ scope.row.single_dose_unit }}</span
-                  >
+<!--                  //从1到20-->
+                  <span v-if="scope.row.single_dose != 0" @click="lili(scope.row)">
+<!--                    {{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}-->
+                    <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
+                    <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
+                    <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
+                    <span v-else-if="scope.row.single_dose_unit == 4" >{{ scope.row.single_dose}}ml</span>
+                    <span v-else-if="scope.row.single_dose_unit == 5" >{{ scope.row.single_dose}}万U</span>
+                    <span v-else-if="scope.row.single_dose_unit == 6" >{{ scope.row.single_dose}}枚</span>
+                    <span v-else-if="scope.row.single_dose_unit == 7" >{{ scope.row.single_dose}}粒</span>
+                    <span v-else-if="scope.row.single_dose_unit == 8" >{{ scope.row.single_dose}}片</span>
+                    <span v-else-if="scope.row.single_dose_unit == 9" >{{ scope.row.single_dose}}支</span>
+                    <span v-else-if="scope.row.single_dose_unit == 10" >{{ scope.row.single_dose}}ug</span>
+                    <span v-else-if="scope.row.single_dose_unit == 11" >{{ scope.row.single_dose}}iu</span>
+                    <span v-else-if="scope.row.single_dose_unit == 12" >{{ scope.row.single_dose}}包</span>
+                    <span v-else-if="scope.row.single_dose_unit == 13" >{{ scope.row.single_dose}}袋</span>
+                    <span v-else-if="scope.row.single_dose_unit == 14" >{{ scope.row.single_dose}}万</span>
+                    <span v-else-if="scope.row.single_dose_unit == 15" >{{ scope.row.single_dose}}万iu</span>
+                    <span v-else-if="scope.row.single_dose_unit == 16" >{{ scope.row.single_dose}}丸</span>
+                    <span v-else-if="scope.row.single_dose_unit == 17" >{{ scope.row.single_dose}}盒</span>
+                    <span v-else-if="scope.row.single_dose_unit == 18" >{{ scope.row.single_dose}}瓶</span>
+                    <span v-else-if="scope.row.single_dose_unit == 19" >{{ scope.row.single_dose}}瓶(袋)</span>
+                    <span v-else-if="scope.row.single_dose_unit == 20" >{{ scope.row.single_dose}}次</span>
+                    <span v-else >{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
+                  </span>
+
+
                 </template>
               </el-table-column>
               <el-table-column
@@ -208,7 +231,7 @@
           type="primary"
           @click="submitgroupAdvice('groupForm')"
           >保 存
-        </el-button>
+        </el-button><!--bug2-->
       </div>
     </el-dialog>
 
@@ -314,7 +337,7 @@
           type="primary"
           @click="newAddTempForm()"
           >保 存
-        </el-button>
+        </el-button><!--bug1-->
       </div>
     </el-dialog>
 
@@ -369,7 +392,7 @@
       >
         <el-row>
           <el-col :span="24">
-            <el-form-item label="医嘱内容 :" required prop="advice_name">
+            <el-form-item label="医嘱内容 :" required prop="advice_name"><!--第一处-->
              <el-autocomplete
                 style="width:100%;"
                 class="inline-input"
@@ -383,16 +406,14 @@
             <!-- <div style="margin-left:120px;margin-top:-20px;font-size:12px;color:red">
                库存不足50
             </div> -->
-            
+
           </el-col>
 
         </el-row>
         <el-row>
           <el-col :span="12">
-       
             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-               
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
@@ -402,7 +423,6 @@
                   @select="handleSelect1"
                   @input="changeDrugDesc"
                 ></el-autocomplete>
-
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -466,7 +486,7 @@
                     v-for="item in unitsOption"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
+                    :value="item.id"
                   ></el-option>
                 </el-select>
               </el-col>
@@ -686,9 +706,12 @@ export default {
         return { id: 0 }
       }
     },
-   
+
   },
   methods: {
+    lili(val){
+      console.log("=3=val=3=",val)
+    },
     submitgroupAdvice(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -701,7 +724,7 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id,
             id:this.groupForm.id,
-         
+
           };
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
@@ -712,16 +735,16 @@ export default {
           }
           submitForm.adviceNames = adviceNames;
           let mode = "1";
-          
+
           if(this.private_drug_config != null&& this.private_drug_config.drug_start == 1){
-               
+
              for(let index=0;index<submitForm.adviceNames.length;index++){
                 for(let i=0;i<this.medicals.length;i++){
                    if(submitForm.adviceNames[index].children.length >0){
                       for(let y=0;y<submitForm.adviceNames[index].children.length;y++){
                           if(submitForm.adviceNames[index].children[y].drug_id == this.medicals[i].drug_name_id){
                              submitForm.adviceNames[index].children[y].drug_name_id = this.medicals[i].drug_name_id
-                             submitForm.adviceNames[index].children[y].way = 2  
+                             submitForm.adviceNames[index].children[y].way = 2
                           }
                       }
                    }
@@ -731,11 +754,11 @@ export default {
                         submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
                     }
                    }
-                   
+
                 }
              }
           }
-         
+
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -857,7 +880,7 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-      
+        console.log("forname",this.nameForm)
        if(this.src_type == ""){
           this.nameForm.way = 1
           this.nameForm.drug_id = this.drug_id
@@ -868,18 +891,18 @@ export default {
           var arr = this.nameForm.advice_name.split("(自备药)")
           this.nameForm.advice_name = arr[0]
        }
-   
-      
+
+
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
-            var ale = _this.groupForm.adviceNames.length; 
+            var ale = _this.groupForm.adviceNames.length;
             if (_this.isChild) {
               for (let index = 0; index < ale; index++) {
                 if (_this.groupSelectRow.parent_row ==_this.groupForm.adviceNames[index].row_key) {
                   var cle = _this.groupForm.adviceNames[index].children.length;
-              
+
                   var children = _this.groupForm.adviceNames[index].children;
                   for (let j = 0; j < ale; j++) {
                     if (_this.groupSelectRow.row_key == children[j].row_key) {
@@ -898,7 +921,7 @@ export default {
                       // _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
                       // _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id;
                       _this.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
-                     
+
                       );
                       break;
                     }
@@ -1064,7 +1087,7 @@ export default {
       this.selectedTemplate = selection;
     },
     selectAdvice(selection, row) {
-     
+
       var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id].DoctorAdviceTemplate;
       for (let y = 0; y < adviceArray.length; y++) {
         adviceArray[y].selection = false;
@@ -1079,7 +1102,6 @@ export default {
         }
       }
 
-      // console.log(adviceArray);
 
       if (row.children.length > 0) {
         for (const index in row.children) {
@@ -1149,7 +1171,7 @@ export default {
       }
     },
     templateTableChange(currentRow, oldCurrentRow) {
-     
+
       this.selectedTemp = { id: 0, name: "", org_id: 0, list: [], rows: [] };
       if (currentRow == null) {
         return false;
@@ -1216,7 +1238,7 @@ export default {
                 children: [],
                 parent_row: parentRow,
                 row_key: thisRowKey,
-               
+
               };
               item.children.push(child);
             }
@@ -1288,7 +1310,7 @@ export default {
                   parent_row: parentRow,
                   row_key: thisRowKey
                 };
-                
+                console.log("child",child)
                 item.children.push(child);
                 this.allSelectedTemplate.unshift(child);
               }
@@ -1503,7 +1525,7 @@ export default {
           if (minites < 10) {
             minites = '0' + minites
           }
-          
+
           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
         } else {
           var date = new Date()
@@ -1572,8 +1594,8 @@ export default {
             console.log("base_drug_list23233232322323",base_drug_list)
             var base_drug_cofig = response.data.data.base_drug_config
             var private_drug_cofig = response.data.data.private_drug_config
-       
-        
+
+
             if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
 
               for (let i = 0; i < medicalList.length; i++) {
@@ -1650,10 +1672,10 @@ export default {
 
               this.private_drug_config = response.data.data.private_drug_config
               this.medicals = medicalList
-            }   
-           
+            }
+
         })
-       
+
     },
     changeDrugName(name){
       this.current_drug_name = name
@@ -1664,10 +1686,10 @@ export default {
             this.drugSpec = this.all_drug[i].drug_specs
           }
        }
-     
+
     },
     changeDrugDesc(name) {
-       
+
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1689,20 +1711,20 @@ export default {
             }else{
               this.nameForm.drug_name_id = 0
             }
-           
+
           }
         }
       },
 
      querySearch(queryString, cb) {
-        
+        console.log("aaaaa")
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-       
+
         cb(results);
      },
 
@@ -1713,7 +1735,7 @@ export default {
      },
 
      querySearch1(queryString, cb) {
-      
+
         var restaurants = this.drugSpec;
          console.log(restaurants)
         restaurants.map(item => {
@@ -1721,15 +1743,26 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-       
+
         cb(results);
       },
 
       handleSelect(val){
         console.log("22222",val)
         this.drug_id = val.id
-        this.nameForm.way = 1 
-       
+        this.nameForm.way = 1
+        var tmp = val.drug_specs[0]
+        console.log("tmp",tmp)
+        console.log("unitsOption",this.unitsOption)
+        this.nameForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+        this.nameForm.drug_spec_unit = tmp.max_unit
+        this.nameForm.prescribing_number = tmp.prescribing_number//开药数量
+        this.nameForm.prescribing_number_unit = tmp.prescribing_number_unit
+        this.nameForm.single_dose = tmp.single_dose//单次用量
+        this.nameForm.single_dose_unit = tmp.drug_dose_unit
+        this.nameForm.delivery_way = tmp.delivery_way//给药途径
+        this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
+        this.nameForm.drug_id = tmp.id
       },
       handleSelect1(){
 
@@ -1743,7 +1776,7 @@ export default {
   created(){
     //获取自备药
     this.getSelfMedicalList()
-    
+
   }
 };
 </script>

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

@@ -394,11 +394,11 @@
                 v-model="nameForm.advice_name"
                 :fetch-suggestions="querySearch"
                 placeholder="请输入内容"
-              
+                @select="handleSelect"
                 @input="changeDrugName"
               ></el-autocomplete>
             </el-form-item>
-           
+
           </el-col>
           <el-col :span="14">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
@@ -431,7 +431,7 @@
                   v-model="nameForm.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                 
+
                   @input="changeDrugDesc"
                 ></el-autocomplete>
               </el-col>
@@ -499,7 +499,7 @@
                     v-for="item in unitsOption"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.name"
+                    :value="item.id"
                   ></el-option>
                 </el-select>
               </el-col>
@@ -715,6 +715,20 @@ export default {
     }
   },
   methods: {
+    handleSelect(val){
+      console.log("2222",val)
+      var tmp = val.drug_specs[0]
+      console.log("tmp",tmp)
+      this.nameForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+      this.nameForm.drug_spec_unit = tmp.max_unit
+      this.nameForm.prescribing_number = tmp.prescribing_number//开药数量
+      this.nameForm.prescribing_number_unit = tmp.prescribing_number_unit
+      this.nameForm.single_dose = tmp.single_dose//单次用量
+      this.nameForm.single_dose_unit = tmp.drug_dose_unit
+      this.nameForm.delivery_way = tmp.delivery_way//给药途径
+      this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
+      this.nameForm.drug_id = tmp.id
+    },
     getXuserName(id) {
       if (id <= 0) {
         return "";
@@ -877,7 +891,7 @@ export default {
           var arr = this.nameForm.advice_name.split("(自备药)")
           this.nameForm.advice_name = arr[0]
        }
-   
+
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -906,7 +920,7 @@ export default {
               drug_name_id:_this.groupForm.drug_name_id,
               drug_id:_this.groupForm.drug_id,
               way:_this.groupForm.way,
-              
+
             };
             let mode = "2";
             if (
@@ -916,7 +930,7 @@ export default {
               mode = "3";
             }
             console.log("22222",submitForm)
-          
+
             EditDoctorAdvice(
               this.patientID,
               this.groupSelectRow.id,
@@ -2392,9 +2406,9 @@ export default {
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
               }
-            }   
+            }
         })
-       
+
     },
     changeDrugName(name){
        this.current_drug_name = name
@@ -2428,14 +2442,14 @@ export default {
         return Math.floor(Math.random() * (max - min)) + min;
      },
      querySearch(queryString, cb) {
-       
+
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-     
+
         cb(results);
      },
 

src/xt_pages/dialysis/details/index.vue

@@ -946,7 +946,7 @@ export default {
               }
               if(this.is_advice_open == 1){
                 this.is_open = 1
-              } 
+              }
               this.longAdvices = totalAdvice
               this.waitUploadAdvices = waitUploadAdvices
               break
@@ -987,7 +987,7 @@ export default {
           var schedual = resp.data.schedual // 患者排班信息
           // console.log("排班22222222222",schedual)
           var prescription = resp.data.prescription // 透析处方
-        
+
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
@@ -1000,7 +1000,7 @@ export default {
                prescription.plasma_separator  = ""
             }
           }
-        
+
           var solution = resp.data.solution // 透析方案
           // console.log("透析方案22223333333333",solution)
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
@@ -1152,12 +1152,12 @@ export default {
           console.log("his_doctor_advices 2323232233232332323323232",this.his_doctor_advices)
           this.his_doctor_advices = his_doctor_advices
           this.his_is_open = resp.data.is_open_config.is_open
-          
+
           this.is_advice_open = resp.data.is_advice_open.is_advice_open
           console.log("is_advice_open 2323232233232332323323232",this.is_advice_open)
           var stockType =  resp.data.stockType
           this.stockType = stockType
-         
+
 
           var prepare = resp.data.prepare
           if(prepare!=null){
@@ -1211,7 +1211,7 @@ export default {
         } else {
           this.$message.error(resp.msg)
         }
-       
+
        // 目标超滤量是否默认上次数据
         if (this.lastDialysisPrescribe != null) {
           delete this.lastDialysisPrescribe.target_ultrafiltration
@@ -1355,7 +1355,7 @@ export default {
           //     }
           //   }
           // }
-         
+
           // console.log("hh2332223323232",schedules)
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
@@ -1785,7 +1785,7 @@ export default {
               }
           }
           this.fisrtQueueInfo = fisrtQueueInfo
-          
+
           // this.fisrtQueueInfo = res.data.fisrtQueueInfo
           let arr = res.data.patientQueueList.data
           let waitingCalledArr = []

src/xt_pages/dialysis/dialysisDrugs_print.vue

@@ -40,8 +40,8 @@
                                       <span v-if="item.anticoagulant==7">低分子肝素钠</span>
                                       <span v-if="item.anticoagulant==8">依诺肝素</span>
                                       <span v-if="item.anticoagulant==9">达肝素</span>
-                                      <span v-if="item.anticoagulant==10">体外抗凝</span> 
-                                      <span v-if="item.anticoagulant==11">那曲肝素</span> 
+                                      <span v-if="item.anticoagulant==10">体外抗凝</span>
+                                      <span v-if="item.anticoagulant==11">那曲肝素</span>
                                     </td>
                                     <td>
                                       {{item.count}}

src/xt_pages/dialysis/dialysisParameters_print.vue

@@ -56,7 +56,7 @@
                                  <span v-if="getAnticoagulant(item.patient.id) == 10">体外抗凝</span>
                                </span>
                                <span>
-              
+
                                   {{getAnticoagulantShouji(item.patient.id)?getAnticoagulantShouji(item.patient.id):''}}
                                   <span v-if="getAnticoagulant(item.patient.id) == 1 && getAnticoagulantShouji(item.patient.id)!=''">mg</span>
                                   <span v-if="getAnticoagulant(item.patient.id) == 2  && getAnticoagulantShouji(item.patient.id)!=''">iu/h</span>
@@ -203,7 +203,7 @@ export default {
           if(this.prescriptionList[i].patient_id == id){
              dialyzerPerfusionApparatus = this.prescriptionList[i].dialyzer_perfusion_apparatus
           }
-        } 
+        }
       return dialyzerPerfusionApparatus
      },
      getAnticoagulant(id){
@@ -212,7 +212,7 @@ export default {
           if(this.prescriptionList[i].patient_id == id){
              anticoagulant = this.prescriptionList[i].anticoagulant
           }
-        } 
+        }
        return anticoagulant
      },
      getAnticoagulantShouji(id){
@@ -221,7 +221,7 @@ export default {
          if(this.prescriptionList[i].patient_id == id){
             shouji = this.prescriptionList[i].anticoagulant_shouji
           }
-        } 
+        }
        return shouji
      },
      getAnticoagulantWeichi(id){
@@ -229,7 +229,7 @@ export default {
         for(let i=0;i<this.prescriptionList.length;i++){
          if(this.prescriptionList[i].patient_id == id){
             weichi = this.prescriptionList[i].anticoagulant_weichi
-        } 
+        }
        return weichi
       }
      },
@@ -239,7 +239,7 @@ export default {
          if(this.prescriptionList[i].patient_id == id){
             zongliang = this.prescriptionList[i].anticoagulant_zongliang
           }
-        } 
+        }
        return zongliang
      }
     },
@@ -264,7 +264,7 @@ export default {
           var dialysbefor = response.data.data.dialysbefor
           console.log("dialysbefor",dialysbefor)
           this.dialysisBefor = dialysbefor
-        } 
+        }
      })
    }
 }

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -66,7 +66,7 @@
                             <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
-                            <span v-if="schedule.mode_id == 24">I-HDF</span>   
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
                             </td>
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
                             {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
@@ -177,7 +177,7 @@
                             <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
-                            <span v-if="schedule.mode_id == 24">I-HDF</span>   
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
                             </td>
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
                             {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
@@ -323,7 +323,7 @@ export default {
                     })
                 }
                 if(config.is_open == 0 || config.is_open == 2){
-                
+
                    var schedulesArr = resp.data.scheduals
                    let schedules = []
                    var ids = this.$store.getters.temp_params.advice_ids
@@ -332,13 +332,13 @@ export default {
                     if(ids.indexOf(item.patient_id) > -1){
                         schedules.push(item)
                     }
-                    
+
                 })
-               
+
                 for (let i = 0; i < schedules.length; i++) {
                     schedules[i].dialysis_no = schedules[i].patient.dialysis_no
                 }
-           
+
 
                 var arr = []
                 for (let j = 0; j < schedules.length; j++) {
@@ -347,7 +347,7 @@ export default {
                 arr.sort(function (a, b) {
                     return a - b
                 })
-               
+
 
                 var arrTwo = []
                 for (let i = 0; i < arr.length; i++) {
@@ -359,17 +359,17 @@ export default {
                 }
 
                 arrTwo.map((item, index) => {
-                  
+
                     item.doctor_advice.sort(this.compare('start_time'))
                 })
-                
+
 
                 const res = new Map()
                 let a = arrTwo.filter(
                     a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
                 )
 
-               
+
 
                 schedules = a
                 var zoneMap = {}
@@ -477,11 +477,11 @@ export default {
                     maps.new_advice = advice_groups
                     }
                  }
-                
 
-                 this.scheduleMap = scheduleMap  
+
+                 this.scheduleMap = scheduleMap
                 }
-               
+
                  if(config.is_open == 1){
                    var schedulesArr = resp.data.hisAdvices
                    let schedules = []
@@ -491,13 +491,13 @@ export default {
                     if(ids.indexOf(item.patient_id) > -1){
                         schedules.push(item)
                     }
-                    
+
                 })
-               
+
                 for (let i = 0; i < schedules.length; i++) {
                     schedules[i].dialysis_no = schedules[i].patient.dialysis_no
                 }
-           
+
 
                 var arr = []
                 for (let j = 0; j < schedules.length; j++) {
@@ -506,7 +506,7 @@ export default {
                 arr.sort(function (a, b) {
                     return a - b
                 })
-               
+
 
                 var arrTwo = []
                 for (let i = 0; i < arr.length; i++) {
@@ -518,17 +518,17 @@ export default {
                 }
 
                 arrTwo.map((item, index) => {
-                  
+
                     item.doctor_advice.sort(this.compare('start_time'))
                 })
-                
+
 
                 const res = new Map()
                 let a = arrTwo.filter(
                     a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
                 )
 
-               
+
 
                 schedules = a
                 var zoneMap = {}
@@ -636,12 +636,12 @@ export default {
                     maps.new_advice = advice_groups
                     }
                  }
-                
 
-                     this.scheduleMap = scheduleMap  
+
+                     this.scheduleMap = scheduleMap
                  }
 
-                
+
                 }
             })
         },

src/xt_pages/hospitalStation/checkPrint.vue

@@ -11,7 +11,7 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
       </div>
@@ -66,16 +66,16 @@ export default {
                 scanStyles: false
             });
         },500)
-        
+
     },
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
     getAllHisPatientList(){
          const params = {
@@ -101,7 +101,7 @@ export default {
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
-            this.cal_two = cal_two   
+            this.cal_two = cal_two
          }
       })
     },
@@ -135,7 +135,7 @@ export default {
     searchAction(){
 
     }
-    
+
   },
 
   created() {
@@ -159,7 +159,7 @@ export default {
         var prescription_id = this.paramsObj.prescription_id
         this.prescription_id = prescription_id
         this.ids = this.paramsObj.ids
-        
+
       },
       deep:true
     }
@@ -332,7 +332,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;

src/xt_pages/hospitalStation/components/advice.vue

@@ -81,7 +81,7 @@
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -1,15 +1,11 @@
-<template>
-  <el-dialog
-    width="854px"
-    title="收费单"
-    class="chargeDialog"
-    :visible.sync="visibility"
-    :close-on-click-modal="isClose"
-    :close-on-press-escape="isClose"
-  >
-    <el-form :model="form" ref="formValue" label-width="100px">
-      <el-form-item label="日期：" style="width: 100%">
-        <div>{{ record_date }}</div>
+<template><!--住院收费-->
+  <el-dialog width="854px" title="收费单" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="form"  ref="formValue" label-width="100px">
+
+      <el-form-item label="日期：" style="width:100%;">
+        <div>{{record_date}}</div>
       </el-form-item>
 
       <el-form-item
@@ -104,12 +100,15 @@
           <el-form-item class="specialFormItem">
             <div style="display: flex">
               <!--            这里不要改成el-input，因为使用el-input会导致一个奇怪的bug，千万不要改！！！！！！！！！！！！！！！！！！！！-->
-              <el-input v-model="form.tmp_decimal" @onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">元</el-input>
+              <el-input v-model="form.tmp_decimal" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">
+
+              </el-input>元
             </div>
           </el-form-item>
         </span>
       </el-form-item>
 
+
       <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
         <el-input
           style="color: black"
@@ -119,6 +118,7 @@
         ></el-input>
       </el-form-item>
 
+
       <el-form-item label="付款卡号：" prop="id_card" :validate-event="is_Name">
         <el-input v-model="form.pay_card_no"></el-input>
       </el-form-item>
@@ -175,196 +175,258 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-      <el-button @click="cancel('formValue')">取 消</el-button>
-      <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
-    </span>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+<!--      <el-button @click="init">调试</el-button>-->
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
+  </span>
   </el-dialog>
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-const moment = require("moment");
-export default {
-  name: "chargeDialog",
-
-  data() {
-    return {
-      record_date: "",
-      form: {
-        medical_insurance_price: 0,
-        private_price: "",
-        pay_way: "",
-        pay_price: "",
-        pay_card_no: "",
-        discount_price: "",
-        preferential_price: "",
-        reality_price: "",
-        found_price: "",
-        total: 0,
-        fapiao_code: "",
-        fapiao_number: "",
-        order: null,
-        acct_pay: "",
-        psn_pay: "",
+  import { uParseTime } from '@/utils/tools'
+  import {
+    idtobalance
+  }from "@/api/deposit";
+  const moment = require('moment')
+  export default {
+    name: 'chargeDialog',
+
+    data() {
+
+      return {
+        tmp_pay: "",
+        isshow: false,
+        id: 0,
+        decimal: 0,//当前押金余额
+        record_date: '',
+        form: {
+          medical_insurance_price: 0,
+          private_price: '',//自费12
+          pay_way: '',
+          dec_way: 'false',//是否使用押金支付
+          tmp_decimal: "",//本次使用的押金
+          pay_price: '',
+          pay_card_no: '',
+          discount_price: '',
+          preferential_price: '',
+          reality_price: '',
+          found_price: '',
+          total: 0,
+          fapiao_code: "",
+          fapiao_number: "",
+          order: null,
+          acct_pay: '',
+          psn_pay: '',
+
+        },
+        payWays: [
+          { value: 1, label: '现金' },
+          // {value: 2, label: '银行卡'},
+          // {value: 3, label: '微信'},
+          // {value: 4, label: '支付宝'},
+          { value: 5, label: '医保卡' },
+
+        ],
+        total: "",
+
+        visibility: false,
+        labelPosition: "right",
+        isClose: false,
+
+        resetForm: {
+          medical_insurance_price: "",
+          private_price: "",
+          pay_way: "",
+          pay_price: "",
+          pay_card_no: "",
+          discount_price: "",
+          preferential_price: "",
+          reality_price: "",
+          found_price: "",
+          fapiao_code: "",
+          fapiao_number: "",
+          acct_pay: "",
+          psn_pay: "",
+        },
+      };
+    },
+    props: {
+      titles: {
+        type: String,
+        default: "",
       },
-      pay_way_index: "",
-      payWays: [
-        { value: 1, label: "现金" },
-        { value: 2, label: "银行卡" },
-        { value: 3, label: "微信" },
-        { value: 4, label: "支付宝" },
-        { value: 5, label: "医保卡" },
-      ],
-      total: "",
-
-      visibility: false,
-      labelPosition: "right",
-      isClose: false,
-
-      resetForm: {
-        medical_insurance_price: "",
-        private_price: "",
-        pay_way: "",
-        pay_price: "",
-        pay_card_no: "",
-        discount_price: "",
-        preferential_price: "",
-        reality_price: "",
-        found_price: "",
-        fapiao_code: "",
-        fapiao_number: "",
-        acct_pay: "",
-        psn_pay: "",
+      formValue: {
+        type: Object,
+      },
+      type: {
+        type: Number,
+        default: 1,
+      },
+      isCreated: {
+        type: Number,
+        default: 1,
       },
-    };
-  },
-  props: {
-    titles: {
-      type: String,
-      default: "",
-    },
-    formValue: {
-      type: Object,
-    },
-    type: {
-      type: Number,
-      default: 1,
-    },
-    isCreated: {
-      type: Number,
-      default: 1,
     },
-  },
-  methods: {
-    show: function (total, order) {
-      this.record_date = moment(new Date())
-        .add("year", 0)
-        .format("YYYY-MM-DD HH:mm");
-      this.form.total = total;
-      this.form.private_price = total;
-      this.form.pay_price = total;
-      this.form.total = total + this.form.medical_insurance_price;
-      this.form.discount_price = 0.0;
-      this.form.preferential_price = 0.0;
-
-      this.form.fapiao_code = "";
-      this.form.fapiao_number = "";
-      this.order = order;
-
-      if (this.order && this.order.id > 0) {
-        this.form.acct_pay = this.order.acct_pay;
-        this.form.psn_pay = this.order.psn_cash_pay;
-        this.form.total = this.order.medfee_sumamt;
-        this.form.pay_price = this.order.medfee_sumamt;
-        this.form.medical_insurance_price = this.order.fund_pay_sumamt;
-        this.form.private_price = this.order.psn_part_amt;
-      }
+      created() {
+      },
+      methods: {
+        init() {
+          console.log("====this.form.dec_way===", this.form.dec_way)
+        },
+        lilili(val) {
+          console.log("val", val)
+          if (this.form.tmp_decimal == "") {
+            this.form.pay_price = this.tmp_pay
+            return
+          }
+          if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
+            // alert("押金不得大于自费金额")
+            this.$message.error("押金不得大于自费金额");
+            this.form.tmp_decimal = ""
+            this.form.pay_price = this.tmp_pay
+            return
+          }
+          // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
-      this.visibility = true;
-    },
-    hide: function () {
-      this.form = Object.assign({}, this.resetForm);
-      this.loadingtwo = false;
-      this.visibility = false;
-    },
-    cancel: function (formName) {
-      this.$emit("cancel", this.getValue());
-      this.$refs["formValue"].resetFields();
-    },
-    confirm: function (formName) {
-      this.$refs["formValue"].validate((valid) => {
-        if (valid) {
-          let value = {};
-          value = this.getValue();
-          this.$emit("confirm", value);
-          this.loadingtwo = true;
+          this.form.pay_price = (parseFloat(this.form.private_price) * 100 - parseFloat(this.form.tmp_decimal) * 100) / 100
+        },
+        changedecimal() {
+          // console.log("this.isshow前",this.isshow)
+          this.$forceUpdate();
+          this.isshow = this.form.dec_way
+          // console.log("this.form.dec_way后",this.form.dec_way)
+          if (this.isshow == false) {
+            // this.form.private_price = parseFloat(this.form.pay_price)
+            this.form.tmp_decimal = 0
+            this.form.pay_price = this.tmp_pay
+          } else {
+            //储存临时付款
+            this.tmp_pay = this.form.pay_price
+            if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
+              this.form.tmp_decimal = 0
+              // alert("押金不得大于自费金额")
+              this.$message.error("押金不得大于自费金额");
+              return
+            }
+            // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
+            this.tmp_pay = this.form.pay_price
+            this.form.pay_price = (parseFloat(this.form.private_price) * 100 - parseFloat(this.form.tmp_decimal) * 100) / 100
+          }
+        },
+        //查询用户当前的余额
+        updateconfig() {
+          var params = {
+            his_patient_id: this.id,
+          }
+          idtobalance(params).then((res) => {
+            if (res.data.state == 1) {
+              this.decimal = res.data.data.list;
+            }
+          })
+        },
+        show(total,order,id) {
+          this.record_date = moment(new Date()).add('year', 0).format("YYYY-MM-DD HH:mm")
+          //初始化
+          this.form.tmp_decimal = 0
+          this.tmp_pay = 0
+          this.id = id
+          this.updateconfig()
+          this.form.dec_way = false
+          this.form.total = total
+          this.form.private_price = total
+          this.form.pay_price = total
+          this.form.total = total + this.form.medical_insurance_price
+          this.form.discount_price = 0.0
+          this.form.preferential_price = 0.0
+
+          this.form.fapiao_code = "";
+          this.form.fapiao_number = "";
+          this.order = order;
+
+          if (this.order && this.order.id > 0) {
+            this.form.acct_pay = this.order.acct_pay
+            this.form.psn_pay = this.order.psn_cash_pay
+            this.form.total = this.order.medfee_sumamt
+            this.form.pay_price = this.order.medfee_sumamt
+            this.form.medical_insurance_price = this.order.fund_pay_sumamt
+            this.form.private_price = this.order.psn_part_amt
+          }
+
+          this.visibility = true
+
+        },
+        hide: function() {
+          this.form = Object.assign({}, this.resetForm);
+          this.loadingtwo = false;
+          this.visibility = false
+        }, cancel: function(formName) {
+          this.form.tmp_decimal = 0
+          this.tmp_pay = 0
+          this.form.dec_way = false
+          this.$emit('cancel', this.getValue());
+          this.$refs['formValue'].resetFields()
+        },
+        confirm: function(formName) {
+          if (parseFloat(this.form.tmp_decimal) > parseFloat(this.decimal)){
+            this.$message.error("押金余额不足");
+            return
+          }
+          this.$refs['formValue'].validate((valid) => {
+            if (valid) {
+              let value = {};
+              value = this.getValue();
+              this.$emit('confirm', value);
+              this.loadingtwo = true
+            }
+          })
+        },
+        getValue: function() {
+          let form = {};
+          form = this.form;
+          return form
+        },
+        realityPrice(val) {
+          if (val < (this.form.total - this.form.discount_price - this.form.preferential_price)) {
+            this.$message.error('实收金额不能小于收费金额');
+            return
+          }
+          this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
+        },
+        changeDiscountPrice(val) {
+          if (val > this.form.total) {
+            this.$message.error('折扣金额不能超过费用总额');
+            return
+          }
+          this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
+        },
+        changePreferentialPrice(val) {
+          if (val > this.form.total) {
+            this.$message.error('优惠金额不能超过费用总额');
+            return
+          }
+          this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
         }
-      });
-    },
-    getValue: function () {
-      let form = {};
-      form = this.form;
-      return form;
-    },
-    realityPrice(val) {
-      if (
-        val <
-        this.form.total -
-          this.form.discount_price -
-          this.form.preferential_price
-      ) {
-        this.$message.error("实收金额不能小于收费金额");
-        return;
-      }
-      this.form.found_price =
-        parseInt(val) -
-        parseInt(this.form.total) +
-        parseInt(this.form.discount_price) +
-        parseInt(this.form.preferential_price);
-    },
-    changeDiscountPrice(val) {
-      if (val > this.form.total) {
-        this.$message.error("折扣金额不能超过费用总额");
-        return;
-      }
-      this.form.reality_price =
-        parseInt(this.form.total) -
-        parseInt(val) -
-        parseInt(this.form.preferential_price);
-    },
-    changePreferentialPrice(val) {
-      if (val > this.form.total) {
-        this.$message.error("优惠金额不能超过费用总额");
-        return;
+      },
+      mounted() {
+        var nowDate = new Date();
+        var nowYear = nowDate.getFullYear();
+        var nowMonth = nowDate.getMonth() + 1;
+        var nowDay = nowDate.getDate();
+
+        var nowHours = nowDate.getHours();
+        var nowMin = nowDate.getMinutes();
+        var nowSecond = nowDate.getSeconds();
+
+        this.record_date =
+          nowYear +
+          '-' +
+          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+          '-' +
+          (nowDay < 10 ? '0' + nowDay : nowDay) + " " + (nowHours < 10 ? '0' + nowHours : nowHours) + ":" + (nowMin < 10 ? '0' + nowMin : nowMin)
       }
-      this.form.reality_price =
-        parseInt(this.form.total) -
-        parseInt(val) -
-        parseInt(this.form.discount_price);
-    },
-  },
-  mounted() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
-
-    var nowHours = nowDate.getHours();
-    var nowMin = nowDate.getMinutes();
-    var nowSecond = nowDate.getSeconds();
-
-    this.record_date =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay) +
-      " " +
-      (nowHours < 10 ? "0" + nowHours : nowHours) +
-      ":" +
-      (nowMin < 10 ? "0" + nowMin : nowMin);
-  },
-};
+
+
+  }
 </script>
 
 

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -126,7 +126,7 @@
                        v-if="(this.radio == 1 &&this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
                        size="small"
                        @click="open(3)"
-                       type="primary">收费
+                       type="primary">收费<!--修改的地方-->
             </el-button>
 
 <!--            <el-button v-loading="loadingtwo"-->
@@ -1449,9 +1449,11 @@ export default {
           this.$message.error('请先到医生工作站开处方再来结算')
           return
         }
-        console.log(this.order)
-        this.$refs.charge.show(this.settle_total,this.order)
-
+        console.log("this.patientInfo.id",this.patientInfo.id)
+        console.log("this.$refs.charge.",this.$refs.charge)
+        this.$nextTick(() => {
+          this.$refs.charge.show(this.settle_total, this.order, this.patientInfo.id)
+        })
       } else if (index == 4) {
         if (this.hisPatientInfo.balance_accounts_type == 2) {
 

src/xt_pages/medicalScheduling/index.vue

@@ -313,9 +313,9 @@
                             </el-table>
                         </el-tab-pane>
                     </el-tabs>
-                 
+
                 </div>
-            </el-dialog>    
+            </el-dialog>
         </div>
 
 
@@ -927,13 +927,13 @@ export default {
                     // this.doctorlist.sort(this.compare('admin_user_id'))
                     // this.doctorlist.forEach((item, index) => {
                     //   if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                    
+
                     //   }else{
                     //     arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
                     //   }
                     // })
                     // arr.sort(this.compare('user_type'))
-                    
+
                     let arr2 = []
                     arr2.push({class_name:oneStr,schedule_week:1})
                     arr2.push({class_name:twoStr,schedule_week:2})
@@ -953,10 +953,10 @@ export default {
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
-                    
+
                     this.tableData = data
 
-              
+
                 }
             })
         },
@@ -1243,7 +1243,7 @@ export default {
                             }
                         }
                     }
-                    
+
                     let arr = [...newArr]
                     let newNurse = []
                     let newDoctor = []
@@ -1284,7 +1284,7 @@ export default {
                     newDoctorTableData.sort(this.compare('admin_user_id'))
                     newDoctorTableData.map((item,index) => {
                         if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
-                    
+
                         }else{
                             newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                         }
@@ -1296,13 +1296,13 @@ export default {
                     // this.doctorlist.sort(this.compare('admin_user_id'))
                     // this.doctorlist.forEach((item, index) => {
                     //   if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-                    
+
                     //   }else{
                     //     arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
                     //   }
                     // })
                     // arr.sort(this.compare('user_type'))
-                    
+
                     let arr2 = []
                     arr2.push({class_name:oneStr,schedule_week:1})
                     arr2.push({class_name:twoStr,schedule_week:2})
@@ -1611,13 +1611,13 @@ export default {
                         newDoctorTableData.sort(this.compare('admin_user_id'))
                         newDoctorTableData.map((item,index) => {
                             if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
-                        
+
                             }else{
                                 newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
                             }
                         })
                         newDoctor.sort(this.compare('sort'))
-                        
+
                         // let data = []
                         // data.push(...newNurse)
                         // data.push(...newDoctor)
@@ -1802,7 +1802,7 @@ export default {
                 start_time:this.getTimestamp(this.weekDayArr[0]),
                 end_time:this.getTimestamp(this.weekDayArr[6])
             }
-           
+
             copyStaffSchedule(params).then(response=>{
                 if(response.data.state == 1){
                 var msg =  response.data.data.msg
@@ -1952,25 +1952,25 @@ export default {
          }
          console.log("this.table",this.tableData)
          const tHeader = ['医护姓名', '周一'+"("+this.weekDayArr[0]+")" ,  '周二'+"("+this.weekDayArr[1]+")", '周三'+"("+this.weekDayArr[2]+")" , '周四'+"("+this.weekDayArr[3]+")" ,  '周五'+"("+this.weekDayArr[4]+")" ,  '周六'+"("+this.weekDayArr[5]+")",'周日'+"("+this.weekDayArr[6]+")"]
-         const filterVal = ['user_name', 'monday', 'tuesday','wednesday','thursday','friday','saturday','weekday'] 
-         
+         const filterVal = ['user_name', 'monday', 'tuesday','wednesday','thursday','friday','saturday','weekday']
+
          const data = this.formatJson(filterVal,this.tableData)
          console.log("data",data)
-       
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '医护排班'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
-    
-    
+
+
     },
     created(){
         //获取医护人员
@@ -2008,8 +2008,8 @@ export default {
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-     
-   
+
+
     }
 }
 </script>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -1,4 +1,4 @@
-<template>
+<template><!--门诊收费-->
   <el-dialog width="854px" title="收费单" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
@@ -8,38 +8,45 @@
         <div>{{record_date}}</div>
       </el-form-item>
 
-      <el-form-item label="总计：" prop="name" :validate-event="is_Name" style="width:33%;">
+      <el-form-item label="总计：" prop="name" :validate-event="is_Name">
         <el-input type="number" v-model="form.total" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="医保：" prop="name" :validate-event="is_Name" style="width:33%;">
+      <el-form-item label="医保：" prop="name" :validate-event="is_Name">
         <el-input type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="自费：" prop="age" :validate-event="is_Name" style="width:33%;">
+      <el-form-item label="自费：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
-      <el-form-item label="个账支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+      <el-form-item label="个账支出：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name" style="width:33%;">
+      <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
       </el-form-item>
 
 
+      <el-form-item label="个人现金支付方式：" style="width:100%;"><!--门诊-->
+        <el-checkbox  v-model="form.dec_way" @change="changedecimal">
+                    使用押金余额抵扣（当前押金余额为￥{{decimal}}）
+        </el-checkbox>
+        <span v-if="form.dec_way == true">
+        <el-form-item class="specialFormItem" >
+          <div style="display:flex;">
+<!--            这里不要改成el-input，因为使用el-input会导致一个奇怪的bug，千万不要改！！！！！！！！！！！！！！！！！！！！-->
+            <input style="" v-model="form.tmp_decimal"  onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @input="lilili"></input>元
+          </div>
+        </el-form-item>
+        </span>
+      </el-form-item>
+
+
+      <el-form-item label="" style="width:100%;">
 
-      <el-form-item label="支付方式：" style="width:100%;">
-        <!-- <el-select v-model="form.pay_way" placeholder="请选择">
-          <el-option
-            v-for="(item,index) in payWays"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select> -->
         <el-radio-group v-model="form.pay_way">
           <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
         </el-radio-group>
@@ -89,6 +96,7 @@
         </div>
       </el-form-item>
 
+
     </el-form>
 
     <span slot="footer" class="dialog-footer">
@@ -101,6 +109,9 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
+  import {
+    idtobalance
+  }from "@/api/deposit";
 
   export default {
     name: 'chargeDialog',
@@ -108,11 +119,17 @@
     data() {
 
       return {
+        tmp_pay:"",//临时付款金额
+        isshow:false,
+        id:0,
+        decimal:0,//当前押金余额
         record_date:'',
         form: {
           medical_insurance_price:0,
-          private_price:'',
+          private_price:'',//自费12
           pay_way:'',
+          dec_way:'false',//是否使用押金支付
+          tmp_decimal:"",//本次使用的押金
           pay_price:'',
           pay_card_no:'',
           discount_price:'',
@@ -125,15 +142,12 @@
           order:null,
           acct_pay:'',
           psn_pay:'',
-
-
-
         },
         payWays: [
           {value: 1, label: '现金'},
-          {value: 2, label: '银行卡'},
-          {value: 3, label: '微信'},
-          {value: 4, label: '支付宝'},
+          // {value: 2, label: '银行卡'},
+          // {value: 3, label: '微信'},
+          // {value: 4, label: '支付宝'},
           {value: 5, label: '医保卡'},
 
         ],
@@ -181,9 +195,83 @@
 
       }
     },
+    created(){
+    },
     methods: {
-      show: function (total,order) {
+      init(){
+        console.log("this.tmp_decimal",this.tmp_decimal)
+        console.log("this.tmp_decimal",this.tmp_decimal)
+        console.log("this.tmp_decimal",this.tmp_decimal)
+      },
+      lilili(val){
+        console.log("this.form.tmp_decimal",this.form.tmp_decimal)
+        //null undefined
+        if(this.form.tmp_decimal == ""){
+          this.form.pay_price = this.tmp_pay
+          return
+        }
+        console.log("val",val)
+        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)){
+          // alert("押金不得大于自费金额")
+          this.$message.error("押金不得大于自费金额");
+          this.form.tmp_decimal = ""
+          this.form.pay_price = this.tmp_pay
+          return
+        }
+        // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
+        this.form.pay_price = (parseFloat(this.form.private_price)*100 - parseFloat(this.form.tmp_decimal)*100)/100
+      },
+      changedecimal(){
+        console.log("this.form.dec_way前",this.form.dec_way)
+        this.$forceUpdate();
+        this.isshow = this.form.dec_way
+        // console.log("this.form.dec_way后",this.form.dec_way)
+        if (this.isshow == false){
+          // this.form.private_price = parseFloat(this.form.pay_price)
+          this.form.tmp_decimal = 0
+           this.form.pay_price = this.tmp_pay
+        }else {
+          //储存临时押金
+          this.tmp_pay = this.form.pay_price
+          if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)){
+            this.form.tmp_decimal = 0
+                // alert("押金不得大于自费金额")
+            this.$message.error("押金不得大于自费金额");
+            return
+          }
+          // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
+          this.tmp_pay = this.form.pay_price
+          this.form.pay_price = (parseFloat(this.form.private_price)*100 - parseFloat(this.form.tmp_decimal)*100)/100
+        }
+      },
+      //查询用户当前的余额
+      updateconfig(){
+        var params = {
+          his_patient_id: this.id,
+        }
+        idtobalance(params).then((res) => {
+          if (res.data.state == 1){
+            this.decimal = res.data.data.list;
+          }
+        })
+      },
+      show: function (total,order,id) {
+        // alert("total",total)
+        // console.log("===========")
+        // console.log(total)
+        // alert("order",orde
+        // console.log(order)
+        // alert("id",id)
+        // console.log("wwwwwwwwwwwwww")
+        // console.log(id)
+        // console.log("++++++++++++")
+        //初始化
+        this.form.tmp_decimal = 0
+        this.tmp_pay = 0
+        this.id = id
+        this.form.dec_way = false
+        this.updateconfig()
         this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total
@@ -213,10 +301,17 @@
         this.loadingtwo = false
         this.visibility = false
       }, cancel: function (formName) {
+        this.form.tmp_decimal = 0
+        this.tmp_pay = 0
+        this.form.dec_way = false
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
       confirm: function (formName) {
+        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.decimal)){
+          this.$message.error("押金余额不足");
+          return
+        }
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
             let value = {}

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -21,7 +21,7 @@
           <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
           <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
           <printSix v-if="org_id == 10217" :paramsObj="invoiceParams"></printSix>
-          
+
         </div>
     </div>
   </div>

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -357,7 +357,7 @@
                       price_arr.push(that.info.transBody.outputlist1[i].akc225);
                       total_arr.push(that.info.transBody.outputlist1[i].akc264)
                     }
-                    
+
 
                     that.info['name_arr'] = name_arr;
                     that.info['spec_arr'] = spec_arr;

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -206,7 +206,7 @@
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
-                                           type="primary">收费
+                                           type="primary">收费<!--修改的地方-->
                                 </el-button>
                               </div>
                             </div>
@@ -1450,7 +1450,6 @@ export default {
             this.$refs.charge.hide()
             this.radio = 2
             this.changeRadioAndPatient(2)
-
             this.loadingtwo = false
             this.state = '已收费'
             this.$message({ message: '收费成功', type: 'success' })
@@ -1458,6 +1457,8 @@ export default {
             this.loadingtwo = false
             this.newLoading = false
           }
+        }) .catch(function(error) {
+          this.newLoading = false
         })
 
       } else {
@@ -2855,7 +2856,6 @@ export default {
       this.other_prescriptions = prescriptions
 
       if (index == 1) {
-
       } else if (index == 2) {
         this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
       } else if (index == 3) {
@@ -2869,15 +2869,14 @@ export default {
         this.paramsObj = obj
         this.treatVisible = true
         // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
-      } else if (index == 4) {
-
+      }
+      else if (index == 4) {//收费
         var ids = []
         for (let i = 0; i < prescriptions.length; i++) {
           ids.push(prescriptions[i].id)
         }
         var ids_str = ids.join(',')
         this.temp_ids = ids_str
-
         this.currentOrder = order
         this.current_med_type = med_type
         if (this.patientInfo.id == 0) {
@@ -2903,8 +2902,8 @@ export default {
 
           }
         } else {
-          if (this.activeName == 'first') {
-            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+          if (this.activeName == 'first') {/////////////////////////押金shows
+            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           } else {
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
           }

src/xt_pages/outpatientCharges/print.vue

@@ -33,7 +33,7 @@
                     </el-table-column>
                 </el-table>
             </div>
-            
+
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
               <printOne v-bind:childResponse="childResponse"></printOne>
             </div>
@@ -255,7 +255,7 @@ export default {
         this.org_template_info.template_id == 2 ||
         this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
-        this.org_template_info.template_id == 22 
+        this.org_template_info.template_id == 22
       ) {
         printJS({
           printable: "dialysis-print-box-1-1",
@@ -299,7 +299,7 @@ export default {
         this.org_template_info.template_id == 2 ||
         this.org_template_info.template_id == 0 ||
         this.org_template_info.template_id == 5 ||
-        this.org_template_info.template_id == 22 
+        this.org_template_info.template_id == 22
       ) {
         printJS({
           printable: "dialysis-print-box-1-2",
@@ -766,7 +766,7 @@ export default {
                 arr.push(...item.schedules)
                 })
                 this.tableData = arr
-                
+
             }else{
                 this.getData()
             }
@@ -778,7 +778,7 @@ export default {
                 if (resp.state == 1) {
                 var schedules = resp.data.schedules
                 this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
-                
+
                 let newArr = []
                 this.zone_schedules.map(item => {
                     newArr.push(...item.schedules)
@@ -800,7 +800,7 @@ export default {
             //   this.date = schedual.schedule_date;
             //   // this.getScheduleDetail();
             //   // this.getLongAdvice();
-            
+
             //   var patient_id = schedual.patient_id;
             //   var date = schedual.schedule_date;
             //   this.$router.push({
@@ -903,7 +903,7 @@ export default {
                 }
                 arr2 = arr
             }
-            
+
 
             let arr3 = []
             if(this.scheduleStateVal == 0){
@@ -922,7 +922,7 @@ export default {
                 arr3 = arr
                 console.log("上午",arr)
             }
-            
+
 
             let arr4 = []
             if(this.zoneVal == 0){
@@ -1168,7 +1168,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;

src/xt_pages/outpatientCharges/treatPrint.vue

@@ -49,7 +49,7 @@ export default {
       childResponse: {},
       paramsObj:{},
       org_id:''
-      
+
 
     };
   },
@@ -88,7 +88,7 @@ export default {
           style: style,
           scanStyles: false
       });
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -107,7 +107,7 @@ export default {
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
         this.paramsObj = val
-        
+
       },
       deep:true
     }
@@ -161,7 +161,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/components/advice.vue

@@ -81,7 +81,7 @@
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1392,7 +1392,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
@@ -1778,7 +1778,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)
@@ -1812,13 +1812,13 @@ 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{
@@ -1830,7 +1830,7 @@ export default {
                 }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{
@@ -1841,16 +1841,16 @@ export default {
                 }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
@@ -2360,7 +2360,7 @@ export default {
                 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
 
@@ -2419,7 +2419,7 @@ export default {
                 }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{
@@ -2431,7 +2431,7 @@ export default {
                 }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{
@@ -2442,7 +2442,7 @@ export default {
                 }else{
                   this.case_history.special_inspection = this.case_history.special_inspection
                 }
-                 
+
                 if(this.case_history.lab_apparatus == ""){
                   this.case_history.lab_apparatus = ""
                 }else{
@@ -2883,7 +2883,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
 
@@ -2937,26 +2937,26 @@ export default {
                 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 = ""
                 }
@@ -3355,7 +3355,7 @@ export default {
           this.$refs.child.watchSign = 0
         }
       } else {
-       
+
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -3456,13 +3456,13 @@ export default {
                 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{
@@ -3474,7 +3474,7 @@ export default {
                 }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{
@@ -3485,7 +3485,7 @@ export default {
                 }else{
                   this.case_history.special_inspection = this.case_history.special_inspection
                 }
-                 
+
                 if(this.case_history.lab_apparatus == ""){
                   this.case_history.lab_apparatus = ""
                 }else{
@@ -3502,7 +3502,7 @@ export default {
                   }
                 }
 
-              
+
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
@@ -3968,7 +3968,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.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
@@ -4077,13 +4077,13 @@ 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{
@@ -4095,7 +4095,7 @@ export default {
                 }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{
@@ -4106,7 +4106,7 @@ export default {
                 }else{
                   this.case_history.special_inspection = this.case_history.special_inspection
                 }
-                 
+
                 if(this.case_history.lab_apparatus == ""){
                   this.case_history.lab_apparatus = ""
                 }else{
@@ -4479,7 +4479,7 @@ export default {
                 }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{
@@ -4491,7 +4491,7 @@ export default {
                 }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{
@@ -4502,7 +4502,7 @@ export default {
                 }else{
                   this.case_history.special_inspection = this.case_history.special_inspection
                 }
-                 
+
                 if(this.case_history.lab_apparatus == ""){
                   this.case_history.lab_apparatus = ""
                 }else{
@@ -4861,7 +4861,7 @@ export default {
             }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{
@@ -4873,7 +4873,7 @@ export default {
             }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{
@@ -4884,7 +4884,7 @@ export default {
             }else{
               this.case_history.special_inspection = this.case_history.special_inspection
             }
-              
+
             if(this.case_history.lab_apparatus == ""){
               this.case_history.lab_apparatus = ""
             }else{
@@ -4955,7 +4955,7 @@ export default {
   },
   created() {
     this.$nextTick(() => {
-      
+
     })
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.getInitData()
@@ -4975,7 +4975,7 @@ export default {
     // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
     let tableHeight = document.body.clientHeight - 263
     this.tableHeight = tableHeight
-    
+
 
   },
 

src/xt_pages/stock/cancelStockOrder.vue

@@ -23,7 +23,7 @@
               :label="option.storehouse_name"
               :value="option.id">
             </el-option>
-        </el-select> 
+        </el-select>
         <el-input
           size="small"
           style="width: 200px;"
@@ -71,7 +71,7 @@
         </div>
       </div>
 
-      
+
 
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox
@@ -88,7 +88,7 @@
       <el-row :gutter="12" style="margin-top: 10px">
         <el-table
           :data="cancelStockDate"
-          @current-change='currentChange' 
+          @current-change='currentChange'
           :class="signAndWeighBoxPatients"
           border
           highlight-current-row
@@ -218,7 +218,7 @@
               {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}
             </template>
           </el-table-column>
-        
+
           <el-table-column label="退库单价" align="center">
             <template slot-scope="scope">
               {{ scope.row.price}}
@@ -309,7 +309,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-   
+
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -403,7 +403,7 @@ export default {
           for(let i=0;i<response.data.data.houseList.length;i++){
             this.houseList.push(response.data.data.houseList[i])
           }
-        
+
         }
       });
     },
@@ -432,7 +432,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-     
+
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -507,7 +507,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-    
+
       this.$router.push({"path":"/stock/cancel/cancelstockorderedit?id="+row.id})
     },
     handleDelete: function(index, row) {
@@ -549,7 +549,7 @@ export default {
         .catch(() => {});
     },
     changeAllSelected(val) {
-     
+
       if (val) {
         this.$refs.multipleTable.toggleAllSelection();
       } else {
@@ -618,7 +618,7 @@ export default {
           this.tableList = list
           this.showTable = true
         }
-      }) 
+      })
     },
     toPrint(){
       if(this.order_id == ""){
@@ -651,7 +651,7 @@ export default {
         }
      })
     },
-   
+
     toExport(){
       if(this.order_id == ""){
         this.$message.error("请勾选退库单")
@@ -668,14 +668,14 @@ export default {
         if(this.exportList[i].manufacturer == 0){
           this.exportList[i].manufacturer = ""
         }
-      
+
         this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
         this.exportList[i].expiry_date = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
       }
       const tHeader = ['耗材名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['good_name', 'unit','count','price','number','register_account','manufacturer','product_date','expiry_date','remark']
 
-     
+
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -31,7 +31,7 @@
             :label="option.storehouse_name"
             :value="option.id">
           </el-option>
-      </el-select>  
+      </el-select>
       <el-input
         size="small"
         style="width:200px;"
@@ -47,7 +47,7 @@
         @click="search"
         >搜索</el-button
       >
-     
+
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -76,10 +76,10 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-    
+
     </div>
 
-  
+
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="cancelStockDate"
@@ -126,7 +126,7 @@
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_total == 0">{{ scope.row.CancelStock.return_time | parseTime("{y}-{m}-{d}") }}</span> 
+            <span v-if="scope.row.is_total == 0">{{ scope.row.CancelStock.return_time | parseTime("{y}-{m}-{d}") }}</span>
             <span v-if="scope.row.is_total == 1"></span>
           </template>
         </el-table-column>
@@ -156,7 +156,7 @@
 
        <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-          
+
              <!-- <span v-if="scope.row.is_total == 0">{{ (scope.row.count * scope.row.price).toFixed(2) }}</span>
             <span v-else>{{ scope.row.total }}</span> -->
             {{scope.row.total}}
@@ -218,7 +218,7 @@ export default {
       this.end_time = end_time
     }
     window.sessionStorage.removeItem('start_time_one')
-    window.sessionStorage.removeItem('end_time_one')  
+    window.sessionStorage.removeItem('end_time_one')
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -348,7 +348,7 @@ export default {
       //       this.cancelStockDate.push(obj);
       //       this.cancelStockDate.push(response.data.data.list[i])
       //     }
-         
+
       //   }
       // });
     },
@@ -371,7 +371,7 @@ export default {
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
       };
-    
+
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
@@ -387,19 +387,19 @@ export default {
           }
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
-            
+
             var obj = response.data.data.list[i];
             response.data.data.list[i].total = (response.data.data.list[i].price * response.data.data.list[i].count).toFixed(2)
             total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            
+
           }
-         
+
           this.tableDataList = response.data.data.list
-         
+
           var listgroup = response.data.data.listgroup
-        
+
 
           this.cancelStockDate.push({
             order_number: "合计",
@@ -418,7 +418,7 @@ export default {
           }
         }
         this.tableList = listgroup
-       
+
         }
       });
     },
@@ -476,7 +476,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
-       
+
         this.GetCancelStock();
       }
     },
@@ -486,7 +486,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-       
+
         this.GetCancelStock();
       }
     },
@@ -630,7 +630,7 @@ export default {
           this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
           this.tableList[i].total = this.getTotalCount(this.tableList[i].child)
           this.tableList[i].total_price = (this.tableList[i].total * this.tableList[i].price).toFixed(2)
-         
+
         }
        var obj = {"index":"合计","total_price":0}
        for(let i=0;i<this.tableList.length;i++){
@@ -642,10 +642,10 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','退库价','总价','备注']
        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','total','price','total_price','remark']
-       
+
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
-      
+
         excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -676,7 +676,7 @@ export default {
 
        const data = this.formatJson(filterVal, this.tableDataList)
        console.log("data",data)
-      
+
         excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/detail/stockInDetail.vue

@@ -8,7 +8,7 @@
       type="primary"
       >打印
     </el-button>
-   
+
     <el-button
       style="float: right;margin-right:10px"
       size="small"
@@ -34,7 +34,7 @@
             :label="option.storehouse_name"
             :value="option.id">
           </el-option>
-      </el-select>  
+      </el-select>
       <el-input
         size="small"
         style="width: 180px;"
@@ -50,7 +50,7 @@
         @click="search"
         >搜索</el-button
       >
-    
+
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -79,7 +79,7 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      
+
     </div>
 
     <el-row :gutter="12" style="margin-top: 10px">
@@ -111,18 +111,18 @@
         <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
             {{ typeNameOne(scope.row.good_id) }}
-          
+
           </template>
         </el-table-column>
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             {{ specificationName(scope.row.good_id) }}
-           
+
           </template>
         </el-table-column>
 
-    
+
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
             {{ getTime(scope.row.Warehousing.warehousing_time) }}
@@ -188,7 +188,7 @@ export default {
   name: "stockInDetail",
 
   created() {
-    
+
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -218,13 +218,13 @@ export default {
       this.end_time = end_time
     }
     window.sessionStorage.removeItem('start_time')
-    window.sessionStorage.removeItem('end_time')  
+    window.sessionStorage.removeItem('end_time')
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     this.org_id = this.$store.getters.xt_user.template_info.org_id
-   
+
     this.getGoodDetailPrintList()
   },
   data() {
@@ -271,12 +271,12 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
-     
+
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
-     
+
     },
     changeDealer: function(val) {
       this.dealer_id = val;
@@ -406,7 +406,7 @@ export default {
           }
           this.tableDataList = response.data.data.list
           console.log("表格发3223332322332332323232332233",this.cancelStockDate)
-         
+
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
@@ -448,7 +448,7 @@ export default {
           var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
-            
+
             }
           }
         }
@@ -472,9 +472,9 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
-       
+
         this.GetCancelStock();
-       
+
       }
     },
     endTimeChange(val) {
@@ -483,7 +483,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-       
+
         this.GetCancelStock();
       }
     },
@@ -656,21 +656,21 @@ export default {
        end_time:this.end_time,
        type:1,
      }
-     
+
      getPrintStockGood(params).then(response=>{
         if(response.data.state == 1){
           this.tableList = []
           var stockTotal =  response.data.data.stockTotal
-        
+
           this.stockTotal = stockTotal
           var list =  response.data.data.list
-         
+
           for(let i=0;i<list.length;i++){
             if (list[i].query_warehousing_info.length > 0) {
                this.tableList.push(list[i])
              }
           }
-      
+
         }
      })
    },
@@ -690,10 +690,10 @@ export default {
        array = stock.query_warehousing_info
         let total_price = 0.0
         for (let i = 0; i < array.length; i++) {
-         total_price = total_price + array[i].warehousing_count * array[i].price  
+         total_price = total_price + array[i].warehousing_count * array[i].price
         }
         return  Math.floor(total_price * 100) / 100
-      }, 
+      },
       calTotalPrice() {
         var amountPrice = 0
         for (let i = 0; i < this.tableList.length; i++) {
@@ -702,15 +702,15 @@ export default {
           len = obj.query_warehousing_info.length
           let total_price = 0.0
           for (let a = 0; a < len; a++) {
-           total_price = total_price + obj.query_warehousing_info[a].total_price   
+           total_price = total_price + obj.query_warehousing_info[a].total_price
           }
 
           amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
         }
         return Math.floor(amountPrice* 100) / 100
-      }, 
+      },
       getStockCount(id){
-        
+
         var count = ""
         for(let i=0;i<this.stockTotal.length;i++){
             if(id == this.stockTotal[i].good_id){
@@ -744,22 +744,22 @@ export default {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
       },
-    
+
       exportList(){
-  
+
         for(let i=0;i<this.tableInfo.length;i++){
-          this.tableInfo[i].index = i+1  
-          this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2) 
+          this.tableInfo[i].index = i+1
+          this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2)
         }
 
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
 
-        
+
         const data = this.formatJson(filterVal, this.tableInfo)
 
-      
+
           excel.export_json_to_excel({
             header: tHeader,
             data,
@@ -769,7 +769,7 @@ export default {
         })
       },
       exportListDetal(){
-       
+
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){
@@ -787,11 +787,11 @@ export default {
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
         const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
-       
-      
+
+
         const data = this.formatJson(filterVal, this.tableDataList)
-       
-       
+
+
           excel.export_json_to_excel({
             header: tHeader,
             data,

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -14,7 +14,7 @@
     </div>
 
     <div class="app-container">
-      
+
       <div class="cell clearfix">
         <label class="title"><span class="name">仓库</span> :</label>
         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
@@ -24,7 +24,7 @@
               :label="option.storehouse_name"
               :value="option.id">
             </el-option>
-        </el-select> 
+        </el-select>
         <el-input
           size="small"
           style="width: 200px;"
@@ -72,7 +72,7 @@
         </div>
       </div>
 
-      
+
 
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox
@@ -179,7 +179,7 @@
             border
             highlight-current-row
             ref="multipleTableOne"
-           
+
             @selection-change="select"
             :row-style="{ color: '#303133' }"
             :header-cell-style="{
@@ -193,7 +193,7 @@
                 {{ scope.row.BaseDrugLib.drug_name}}
               </template>
             </el-table-column>
-            
+
           <el-table-column label="规格&单位" align="center">
               <template slot-scope="scope">
                 {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
@@ -227,7 +227,7 @@
             <el-table-column label="退库单价" align="center">
               <template slot-scope="scope">
                 {{ scope.row.price}}
-              </template> 
+              </template>
             </el-table-column>
 
             <!-- <el-table-column label="批次" align="center">
@@ -259,25 +259,25 @@
                 {{scope.row.expiry_date}}
               </template>
             </el-table-column>
-          
+
             <el-table-column label="经销商" align="center">
               <template slot-scope="scope">
                 {{scope.row.dealer}}
               </template>
             </el-table-column>
-          
+
             <el-table-column label="退库原因" align="center">
               <template slot-scope="scope">
                 {{scope.row.remark}}
               </template>
             </el-table-column>
 
-          
+
           </el-table>
       </div>
     </div>
 
-    
+
   </div>
 </template>
 
@@ -318,7 +318,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-   
+
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -401,8 +401,8 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-         
-          
+
+
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
@@ -441,7 +441,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-      
+
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -516,7 +516,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-    
+
       this.$router.push({path:"/drugstock/cancel/edit?id="+row.id+"&type="+this.type})
     },
     handleDelete: function(index, row) {
@@ -671,7 +671,7 @@ export default {
         return
       }
      import('@/vendor/Export2Excel').then(excel => {
-     
+
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
         this.exportList[i].drug_name = this.exportList[i].BaseDrugLib.drug_name
@@ -682,14 +682,14 @@ export default {
         if(this.exportList[i].manufacturer == 0){
           this.exportList[i].manufacturer = ""
         }
-      
+
         this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
         this.exportList[i].expiry_date = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
       }
       const tHeader = ['药品名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['drug_name', 'unit','count','price','batch_number','register_account','manufacturer','product_date','expiry_date','remark']
       // console.log("table",this.exportList)
-    
+
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

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

@@ -189,7 +189,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    
+
     var start = window.sessionStorage.getItem('start_cancel_time')
     if(start!=null){
      this.start_time = start
@@ -198,7 +198,7 @@ export default {
       var end =  window.sessionStorage.getItem('end_cancel_time')
       this.end_time = end
     }
-    
+
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.getlist()
@@ -262,14 +262,14 @@ export default {
 
       return name;
     },
-   
-  
+
+
     search() {
       this.getlist()
     },
-  
-   
-   
+
+
+
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
         console.log(response);
@@ -328,11 +328,11 @@ export default {
         }
       });
     },
-  
-  
-   
+
+
+
     select(selection) {
-     
+
     },
     getlist(){
        var params = {
@@ -377,7 +377,7 @@ export default {
            this.tableList = order
            var total = response.data.data.total
            this.total = total
-         } 
+         }
       })
     },
 
@@ -420,7 +420,7 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量','退库价','总价']
         const filterVal = ['index','order_number','drug_name', 'specification_name', 'drug_type','ctime','user_name','total_count','price','total_price']
-        
+
         const data = this.formatJson(filterVal, this.tableDataList)
 
         excel.export_json_to_excel({
@@ -437,7 +437,7 @@ export default {
     exportListOne(){
       // let obj = {'index':'合计','total_price':0}
       console.log("@332322323232332",this.tableList)
-      
+
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
@@ -452,7 +452,7 @@ export default {
           }
           this.tableList[i].time = this.getTime(this.tableList[i].ctime)
           this.tableList[i].user_name = this.getAdminUser(this.tableList[i].creater)
-          
+
           //this.tableList[i].total_price = this.tableList[i].count * this.tableList[i].price
           //  obj.total_price += this.tableList[i].count * this.tableList[i].price
         }
@@ -464,9 +464,9 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','操作时间','制单人','退货价','数量','总价']
        const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name', 'time','user_name','price','count','total_price']
-       
+
        const data = this.formatJson(filterVal, this.tableList)
-       
+
        excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -492,7 +492,7 @@ export default {
         }
       }
       return name
-    } 
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -40,14 +40,14 @@
                 <span v-if="org_id == 9671 || org_id == 9919 ">{{item.max_unit}}</span>
                 <span v-else>{{item.min_unit}}</span>
               </td>
-            
+
               <td style="line-height: 50px">
-                <span v-if="org_id == 9671 || org_id == 9919">{{getCountSix(item.drug_id,item.child)}}</span>  
+                <span v-if="org_id == 9671 || org_id == 9919">{{getCountSix(item.drug_id,item.child)}}</span>
                 <span v-else>{{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
               </td>
               <td style="line-height:50px">
                   <span v-if="org_id ==9671 || org_id == 9919">{{item.price}}</span>
-                  <span v-else>{{item.min_price}}</span> 
+                  <span v-else>{{item.min_price}}</span>
               </td>
               <td style="line-height:50px">
                 <span v-if="org_id ==9671 || org_id == 9919">{{(getCountSenven(item.drug_id,item.child,item.price))}}</span>
@@ -107,7 +107,7 @@
           { path: false, name: '打印单' }
         ],
         loading: false,
-        orgname: '',   
+        orgname: '',
         totalPrice: 0,
         stockDatas: [],
         goodUnit: [],
@@ -151,7 +151,7 @@
           scanStyles: false
         })
       },
-   
+
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
@@ -279,7 +279,7 @@
         return str + min_str
       },
       getCountOne(arr,max_unit,min_unit,min_number){
-       
+
         var total = 0
         var str = ""
         var min_str = ""
@@ -295,11 +295,11 @@
         for(let i=0;i<arr.length;i++){
           total+= parseInt(arr[i].total_count)
         }
-     
+
         return total
       },
       getTotalPrice(arr,max_unit,min_number,min_price){
-        
+
         var total = 0
         for(let i=0;i<arr.length;i++){
           arr[i].all_count = 0
@@ -308,7 +308,7 @@
           }else{
             arr[i].all_count = parseInt(arr[i].count)
           }
-        }  
+        }
         for(let j=0;j<arr.length;j++){
           total += parseInt(arr[j].all_count)
         }
@@ -317,14 +317,14 @@
       },
       getCountSix(drug_id,val){
         console.log("val233232",val)
-        var count = 0 
+        var count = 0
         for(let i=0;i<val.length;i++){
           count+= val[i].count
         }
         return count
       },
       getCountSenven(drug_id,val,price){
-        var count = 0 
+        var count = 0
         for(let i=0;i<val.length;i++){
           count+= val[i].count
         }

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -268,7 +268,7 @@
         }
         return name
       },
-      
+
       getManufacturer(id){
         let name = ""
         for(let i=0;i<this.manufacturerList.length;i++){
@@ -364,7 +364,7 @@
         return count
       },
        getDeatl(id){
-       
+
         var dealer_name = ""
         for(let i=0;i<this.dealer.length;i++){
           if(id == this.dealer[i].id){

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -21,7 +21,7 @@
               :label="option.storehouse_name"
               :value="option.id">
             </el-option>
-        </el-select> 
+        </el-select>
         <el-input
           size="small"
           style="width: 200px;"
@@ -146,7 +146,7 @@
           </template>
         </el-table-column>
 
-  
+
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
 
@@ -243,7 +243,7 @@
           </el-table-column>
           <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
-              <span>{{getXuserName(scope.row.admin_user_id)}} </span>  
+              <span>{{getXuserName(scope.row.admin_user_id)}} </span>
             </template>
           </el-table-column>
           <el-table-column label="单价" align="center">
@@ -990,13 +990,13 @@ export default {
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
-        
+
          if (is_sys == 1){
            if(drugFlowList.length >0){
             for(let i=0;i<drugFlowList.length;i++){
                 if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.max_unit){
                     drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
-                   
+
 
                 }
                 if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
@@ -1005,7 +1005,7 @@ export default {
 
             }
            }
-        
+
           this.drugFlowList = drugFlowList
          }
          if(is_sys == 0 || is_sys == 12){
@@ -1288,7 +1288,7 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
       getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number,is_sys){
-        
+
         var total = 0
         var all_price = 0
         for(let i=0;i<this.drugFlowList.length;i++){

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -10,7 +10,7 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-               
+
                 <table class="printTable" border="1">
                     <tr>
                         <td>序号</td>
@@ -33,11 +33,11 @@
                         <td>{{getTime(item.expiry_date)}}</td>
                         <td>{{getManufacturerName(item.manufacturer)}}</td>
                         <td>{{item.number}}</td>
-                        <td>{{item.max_unit}}</td>  
-                        <td></td>     
+                        <td>{{item.max_unit}}</td>
+                        <td></td>
                     </tr>
                 </table>
-              
+
             </div>
         </div>
     </div>
@@ -100,7 +100,7 @@ export default {
          }
       },
       getManufacturerName(id){
-       
+
            var name = ""
            for(let i=0;i<this.manufacturerList.length;i++){
               if(id == this.manufacturerList[i].id){
@@ -109,8 +109,8 @@ export default {
            }
            return name
         }
-      
-      
+
+
      },
     created(){
       this.getlist()

src/xt_pages/stock/drugs/query.vue

@@ -43,7 +43,7 @@
             </el-option>
           </el-select>
           <span>药品名称:</span>
-          <el-select v-model="drug_id" style="width:200px;margin-right:10px;" placeholder="请选择" 
+          <el-select v-model="drug_id" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeDrugName">
             <el-option
@@ -52,7 +52,7 @@
               :label="item.drug_name"
               :value="item.id">
             </el-option>
-          </el-select> 
+          </el-select>
         </div>
          <!-- <el-select v-model="drug_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
@@ -103,7 +103,7 @@
       </div>
 
        <el-table :data="tableList" border style="width: 100%"   :cell-class-name="cellStyle">
- 
+
         <el-table-column prop="drug_type" label="药品类型" width="100" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
@@ -178,7 +178,7 @@
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -230,7 +230,7 @@ import { min } from 'moment'
     created() {
       var start_time =  window.sessionStorage.getItem('start_time')
       var end_time =  window.sessionStorage.getItem('end_time')
-     
+
       if(start_time !=null){
         this.start_time = start_time
       }
@@ -319,16 +319,16 @@ import { min } from 'moment'
         }
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
-            
+
              var list = response.data.data.list
-           
+
              for(let i=0;i<list.length;i++){
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
                  if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
                     list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
                     list[i].drug_warehouse_info[j].warehousing_count = list[i].min_number * list[i].drug_warehouse_info[j].warehousing_count
                  }
-                
+
                }
                for(let y=0;y<list[i].drug_warehouse_out.length;y++){
                   if(list[i].drug_warehouse_out[y].count_unit == list[i].max_unit){
@@ -344,7 +344,7 @@ import { min } from 'moment'
             var arr = []
              for(let i=0;i<list.length;i++){
                if(list[i].drug_warehouse_info.length > 0){
-                  arr.push(list[i]) 
+                  arr.push(list[i])
                }
              }
              this.tableList = arr
@@ -376,7 +376,7 @@ import { min } from 'moment'
               response.data.data.medicalList[i].drug_name = response.data.data.medicalList[i].drug_name +response.data.data.medicalList[i].dose + response.data.data.medicalList[i].dose_unit + "*" + response.data.data.medicalList[i].min_number +  response.data.data.medicalList[i].min_unit+ "/"+ response.data.data.medicalList[i].max_unit +  " " +response.data.data.medicalList[i].manufacturer
                this.medicalList.push(response.data.data.medicalList[i])
              }
-             
+
            }
         })
       },
@@ -494,7 +494,7 @@ import { min } from 'moment'
           this.getlist()
           this.getDrugCountList()
         }
-       
+
       }
 
     },
@@ -550,7 +550,7 @@ import { min } from 'moment'
              this.tableList[i].outCount = this.getOutCount(this.tableList[i].id)+ this.getAutoCount(this.tableList[i].id)
              this.tableList[i].overplusCount  = this.getWarehoseInfo(this.tableList[i].drug_warehouse_info) - this.getOutCount(this.tableList[i].id) - this.getAutoCount(this.tableList[i].id)
 
-          }   
+          }
          }
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','国家编码','进货单价','厂家','入库数量','出库数量','剩余库存量']
@@ -620,7 +620,7 @@ import { min } from 'moment'
         this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.id+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&over_plus="+over_plus})
         window.sessionStorage.setItem('start_time',this.start_time)
         window.sessionStorage.setItem('end_time',this.end_time)
-        
+
       },
       handleBatch(val){
         console.log("val322332323232",val)
@@ -632,7 +632,7 @@ import { min } from 'moment'
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
         var over_plus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
-       
+
         window.sessionStorage.setItem('start_time',this.start_time)
         window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.id+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&over_plus="+over_plus})
@@ -822,7 +822,7 @@ import { min } from 'moment'
         }
         return max_str + min_str
       },
-      
+
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
 
          var max_str=  ""
@@ -941,16 +941,16 @@ import { min } from 'moment'
         for(let i=0;i<info.length;i++){
            total += info[i].warehousing_count
         }
-        
+
         for(let j=0;j<info.length;j++){
            out_count += (info[j].stock_max_number + info[j].stock_min_number)
         }
-       
+
         // for(let z=0;z<cancel_info.length;z++){
         //    cancel_count += cancel_info[z].count
         // }
        // over_count = total - out_count + cancel_count
-         over_count = total - out_count 
+         over_count = total - out_count
         if(parseInt(over_count/min_number)!=0){
             str = parseInt(over_count/min_number)+ max_unit
          }
@@ -976,7 +976,7 @@ import { min } from 'moment'
           for(let i=0;i<arr.length;i++){
             if(arr[i].storehouse_id == storehouse_id){
               total += parseInt(arr[i].warehousing_count)
-            } 
+            }
           }
         }
         if (total < min_number){
@@ -997,7 +997,7 @@ import { min } from 'moment'
         }
         return max_str + min_str
       },
-           
+
       getOverFlushInfoEight(arr,max_unit,min_unit,min_number,storehouse_id){
 
          var max_str=  ""
@@ -1042,21 +1042,21 @@ import { min } from 'moment'
           if(info[i].storehouse_id == storehouse_id){
             total += info[i].warehousing_count
           }
-          
+
         }
-        
+
         for(let j=0;j<info.length;j++){
           if(info[j].storehouse_id == storehouse_id){
             out_count += (info[j].stock_max_number + info[j].stock_min_number)
           }
-          
+
         }
-       
+
         // for(let z=0;z<cancel_info.length;z++){
         //    cancel_count += cancel_info[z].count
         // }
        // over_count = total - out_count + cancel_count
-         over_count = total - out_count 
+         over_count = total - out_count
         if(parseInt(over_count/min_number)!=0){
             str = parseInt(over_count/min_number)+ max_unit
          }

src/xt_pages/stock/inventoryPrint.vue

@@ -10,7 +10,7 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-              
+
                 <table class="printTable" border="1">
                     <tr>
                         <td>序号</td>
@@ -37,7 +37,7 @@
                         <td></td>
                     </tr>
                 </table>
-               
+
             </div>
         </div>
     </div>
@@ -96,7 +96,7 @@ export default {
          })
         },
         getManufacturerName(id){
-       
+
            var name = ""
            for(let i=0;i<this.manufacturerList.length;i++){
               if(id == this.manufacturerList[i].id){

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -142,9 +142,9 @@ export default {
          for(let i=0;i<this.tableData.length;i++){
             this.tableData[i].margin = (this.tableData[i].Total?this.tableData[i].Total:0) - this.tableData[i].Count
          }
-        
+
          const data = this.formatJson(filterVal, this.tableData)
-      
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -167,7 +167,7 @@ export default {
       getAllMedicalList(){
         getAllMedicalList().then(response=>{
           if(response.data.state == 1){
-             var drugName =  response.data.data.drugName  
+             var drugName =  response.data.data.drugName
              var obj = {
                id:0,
                drug_name:"全部"
@@ -177,7 +177,7 @@ export default {
              arr.push(...drugName)
              console.log("arrr",arr)
              this.drugName = arr
-     
+
              this.getlist()
           }
         })
@@ -199,7 +199,7 @@ export default {
              console.log("rulleName",arr)
              this.rulleName = arr
            }
-        })  
+        })
       },
       searchAction(){
         this.getlist()
@@ -216,7 +216,7 @@ export default {
             }
           }
           this.drug_name = drug_name
-          this.getRulleName(id)  
+          this.getRulleName(id)
         }
         this.getlist()
       },
@@ -253,7 +253,7 @@ export default {
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
-              
+
               for(let i=0;i<stocklist.length;i++){
                  stocklist[i].index = i+1
                  stocklist[i].Count = 0
@@ -275,14 +275,14 @@ export default {
                           outStockList[i].Total = 0
                        }
                       outStockList[i].Total = stocklist[j].Total
-                   } 
+                   }
                  }
               }
 
               console.log("outStockList",outStockList)
               this.tableData = outStockList
             }
-        })   
+        })
       }
     },
     created(){
@@ -291,7 +291,7 @@ export default {
 
 
 
-      
+
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/queryPrint.vue

@@ -118,13 +118,13 @@ export default {
                  for(let j=0;j<stocklist.length;j++){
                      if(outStockList[i].patient_id == stocklist[j].patient_id &&outStockList[i].drug_name == stocklist[j].drug_name && outStockList[i].drug_spec == stocklist[j].drug_spec){
                       outStockList[i].Total = stocklist[j].Total
-                   } 
+                   }
                  }
               }
               console.log("stocklist99999",outStockList)
               this.tableData = outStockList
             }
-        })   
+        })
       }
     },
     created(){
@@ -167,7 +167,7 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
-      
+
 
       thead {
         tr {

src/xt_pages/stock/selfPreparedMedicine/stockquery.vue

@@ -62,7 +62,7 @@
           <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         </div>
       </div>
-      
+
 
       <el-table
         :row-style="{ color: '#303133' }"
@@ -109,7 +109,7 @@
             <span>{{scope.row.total?scope.row.total:""}}</span>
           </template>
         </el-table-column>
-       
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -169,7 +169,7 @@ export default {
     };
   },
   methods: {
-     
+
      getlist(){
          var params ={
            type_name:this.type_name,
@@ -209,10 +209,10 @@ export default {
       this.page = val;
       this.getlist()
     },
-  
+
     startTimeChange: function(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
-      
+
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
@@ -228,9 +228,9 @@ export default {
       } else {
         this.getlist()
       }
-     
+
     },
-   
+
 
     search: function() {
       this.getlist()
@@ -239,9 +239,9 @@ export default {
     exportList(){
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['药品名称', '规格名称', '入库数量','实际入库','出库数量','实际出库','剩余库存']
-         const filterVal = ['drug_name', 'drug_spec', 'Count','Count','outCount','outCount','total'] 
+         const filterVal = ['drug_name', 'drug_spec', 'Count','Count','outCount','outCount','total']
          const data = this.formatJson(filterVal, this.tableData)
-      
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -258,10 +258,10 @@ export default {
       },
       toPrint(){
         this.$router.push("/stock/selfstockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
-        
+
       },
 
-     
+
       getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/selfStockPrint.vue

@@ -154,7 +154,7 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
-      
+
 
       thead {
         tr {

src/xt_pages/stock/stockInOrder.vue

@@ -15,7 +15,7 @@
     </div>
 
     <div class="app-container">
-      
+
       <div class="cell clearfix">
         <label class="title"><span class="name">仓库</span> :</label>
         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
@@ -73,7 +73,7 @@
         </div>
       </div>
 
-      
+
 
       <div class="cell clearfix">
         <el-checkbox
@@ -287,7 +287,7 @@
     </div>
 
 
-   
+
 
 
     <el-dialog
@@ -432,7 +432,7 @@
       width="80%"
     >
       <span>
-       
+
         <div style="margin-bottom:10px">
           <label class="title"><span class="name">入库时间</span> : </label>
           <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
@@ -564,7 +564,7 @@
 
           <el-table-column label="生产日期" width="250" align="center">
             <template slot-scope="scope">
-            
+
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -578,7 +578,7 @@
           </el-table-column>
           <el-table-column label="有效日期" width="250" align="center">
             <template slot-scope="scope">
-             
+
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -590,7 +590,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -698,14 +698,14 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-     
+
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.GetAllGoodType()
     this.GetAllGoodInfo()
 
-    
+
   },
   data() {
 
@@ -772,7 +772,7 @@ export default {
       form: {
         manufacturer:0,
         dealer:0
-      }, 
+      },
       warehousing_time: '',
       warehouse:{},
       propForm: {
@@ -807,8 +807,8 @@ export default {
       list:[],
       storehouse_id:0,
     };
-    
-  
+
+
   },
   methods: {
      changeCheck() {
@@ -839,7 +839,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
-        
+
         }
       });
     },
@@ -871,7 +871,7 @@ export default {
           for(let i=0;i<response.data.data.houselist.length;i++){
             this.list.push(response.data.data.houselist[i])
           }
-          
+
         }
       });
     },
@@ -976,7 +976,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
+
           for (let i = 0; i < response.data.data.goodType.length; i++) {
             this.goodType.push(response.data.data.goodType[i]);
           }
@@ -989,7 +989,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
+
           for (let i = 0; i < response.data.data.goodInfo.length; i++) {
 
             this.goodInfo.push(response.data.data.goodInfo[i]);
@@ -1114,7 +1114,7 @@ export default {
       const params = {
         ids: idStr
       };
-     
+
       this.$confirm("确认删除入库单记录?", "删除入库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1144,7 +1144,7 @@ export default {
         })
         .catch(() => {});
     },
-   
+
     select(selection) {
       var ids= []
       for(let i=0;i<selection.length;i++){
@@ -1177,7 +1177,7 @@ export default {
           return false
         }
       }
-    
+
       const idStr = ids.join(",");
       const params = {
         ids: idStr
@@ -1223,7 +1223,7 @@ export default {
     handleSearch(val){
       this.tableList= []
       this.GetOrderDetail(val.id)
-      this.drug_id = val.id 
+      this.drug_id = val.id
 
     },
 
@@ -1249,14 +1249,14 @@ export default {
            this.warehousing_time = this.getTime(this.warehouse.warehousing_time,"{y}-{m}-{d}");
 
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
-         
+
         }
       });
     },
 
      editRecord: function() {
-     
-     
+
+
       this.editDialogVisible = true
     },
 
@@ -1264,7 +1264,7 @@ export default {
       const ids = [];
       ids.push(this.WarehouseInfo.warehouse.id);
       const idStr = ids.join(",");
-     
+
       const params = {
         ids: idStr
       };
@@ -1295,7 +1295,7 @@ export default {
     },
 
      typeName: function(good_type_id) {
-     
+
       let name = "";
       for (let i = 0; i < this.goodType.length; i++) {
         if (this.goodType[i].id == good_type_id) {
@@ -1362,7 +1362,7 @@ export default {
     },
 
     specificationName: function(drug_id) {
-     
+
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -1370,7 +1370,7 @@ export default {
           }
         }
         return name;
-    }, 
+    },
 
      submit() {
       this.$refs["tableForm"].validate(valid => {
@@ -1406,7 +1406,7 @@ export default {
               this.$message.success("入库成功");
               this.dialogVisible = false
               this.editDialogVisible = false
-             
+
             }
           });
         } else {
@@ -1417,13 +1417,13 @@ export default {
 
       changeManufacturer(val) {
 
-      }, 
+      },
       changeDealer(val) {
 
       },
 
      DeleteWarehouseInfoItem: function(index, row) {
-       
+
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -1525,11 +1525,11 @@ export default {
         end_time:this.end_time,
         storehouse_id:this.storehouse_id,
       }
-     
+
       getExportStockList(params).then(response=>{
         if(response.data.state == 1){
            var list = response.data.data.list
-          
+
            for(let i=0;i<this.goodType.length;i++){
              for(let j=0;j<list.length;j++){
                if(this.goodType[i].id == list[j].good_type_id){
@@ -1579,12 +1579,12 @@ export default {
           this.exportList[i].good_type_id = ""
         }
       }
-    
+
       const tHeader = ['耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
       const filterVal = ['good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
 
 
-     
+
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -124,7 +124,7 @@
     created() {
       const order_id = this.$route.query.id
       const warehouse_out_time = this.$route.query.warehouse_out_time
-     
+
       this.GetConfigInfo()
       this.GetOrderDetail(order_id)
       this.GetTotalCount(warehouse_out_time)
@@ -211,7 +211,7 @@
             return this.dealer[i].dealer_name
           }
         }
-      }, 
+      },
       calculate: function(val) {
         if (val == 0) {
           return ''
@@ -224,7 +224,7 @@
         }
         getWarehouseOutInfo(params).then(response => {
           if (response.data.state == 0) {
- 
+
             this.$message.error(response.data.msg)
             return false
           } else {
@@ -233,8 +233,8 @@
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
-          
-          
+
+
             this.handleSpanTempArr()
           }
         })
@@ -339,7 +339,7 @@
       },
 
       getOutStockCount(id){
-         var count = 0 
+         var count = 0
          for(let i=0;i<this.stockCount.length;i++){
             if(id == this.stockCount[i].good_id){
               count = this.stockCount[i].count

src/xt_pages/stock/stockQuery.vue

@@ -18,7 +18,7 @@
             </el-option>
           </el-select>
           <span>耗材名称:</span>
-          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择" 
+          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodName">
             <el-option
@@ -138,7 +138,7 @@
         </el-table-column>
        <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-          
+
             <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
                {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
@@ -158,10 +158,10 @@
          </span>
          </template>
        </el-table-column>
-      
+
         <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583"> 
+           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">
              {{
               getWareInfo(scope.row.xt_warehouse_info) -
               getAutoCount(scope.row.id) -
@@ -194,7 +194,7 @@
            </span>
          </template>
        </el-table-column>
-        
+
       <el-table-column label="总库存量" align="center" v-if="showTwo">
          <template slot-scope="scope">
           <span>{{getWareInfoCountTwo(scope.row.xt_warehouse_info)}} </span>
@@ -463,11 +463,11 @@ export default {
 
           if(this.end_time == ""){
             if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191 || this.org_id == 9919  || this.org_id == 10265 || this.org_id ==10164 || this.org_id == 10290){
-              this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
+              this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info)
             }else{
               this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
             }
-            
+
             if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191 || this.org_id == 9919 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10290){
                 this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
             }else{
@@ -477,7 +477,7 @@ export default {
             this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
           }
-          
+
 
          }
          const data = this.formatJson(filterVal, this.tableList)
@@ -546,7 +546,7 @@ export default {
             }
           }
          this.tableList = arr
-        
+
           var total = response.data.data.total
           this.total = total
           var manufacturerList = response.data.data.manufacturerList
@@ -603,10 +603,10 @@ export default {
            var outlist = response.data.data.outList
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-        
+
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-         
+
            this.cancelCountList = totalCount
          }
       })
@@ -699,7 +699,7 @@ export default {
      return total
    },
    getCancelSotckInfo(arr){
-    
+
      var cancle_toal = 0
      if(arr.length >0){
       for(let z=0;z<arr.length;z++){
@@ -759,12 +759,12 @@ export default {
      }else{
        return ""
      }
-   }, 
+   },
    getWareInfoCountTwo(val,storehouse_id){
      var count = 0
      if(val.length > 0){
        for(let i=0;i<val.length;i++){
-         count +=val[i].stock_count   
+         count +=val[i].stock_count
        }
      }
      if(count > 0){

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -915,7 +915,7 @@ export default {
                 orderInfo[i].supply_total = orderInfo[i].supply_total
               }
               this.recordInfo.tableList = orderInfo;
-            
+
               this.$message.success("保存成功!");
             }
           });
@@ -936,7 +936,7 @@ export default {
       return total_price.toFixed(2);
     },
 
-    
+
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /

src/xt_pages/supply/components/editGoodOrder.vue

@@ -46,7 +46,7 @@
 
           <span>单据编码:{{ good_number }}</span>
         </div>
-      
+
          <div style="display: flex;" >
            <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
           <el-button
@@ -267,7 +267,7 @@
             </template>
           </el-table-column>
 
-      
+
 
           <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
@@ -727,7 +727,7 @@ export default {
           this.recordInfo.tableList[i].supply_type = val.supply_type;
           this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
-          this.recordInfo.tableList[i].min_price = val.min_price  
+          this.recordInfo.tableList[i].min_price = val.min_price
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
           } else {
@@ -863,7 +863,7 @@ export default {
       }else{
         return ""
       }
-      
+
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -975,11 +975,11 @@ export default {
           }else{
             this.arrearage = ""
           }
-          
+
           this.number = out.number;
           this.good_number = out.good_number;
           this.return_remark = out.return_remake;
-          
+
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.list;
 
@@ -1122,7 +1122,7 @@ export default {
           console.log("changed111111",this.tableDataList.length)
            console.log("changed111111",this.recordInfo.tableList.length)
           if(this.tableDataList.length > this.recordInfo.tableList.length){
-            
+
              for(let i=0;i<this.recordInfo.tableList.length;i++){
               this.recordInfo.tableList[i].warehousing_id = 0
               this.recordInfo.tableList[i].warehouse_info_id = 0
@@ -1131,7 +1131,7 @@ export default {
              }
           }
           console.log("param23322332323",params)
-         
+
           updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then((response) => {
             if (response.data.state == 1) {
               this.loading = false;
@@ -1384,7 +1384,7 @@ export default {
         warehousing_id: warehousing_id,
       };
       console.log("return2332232333",params)
-    
+
       MofyGoodOrder(params).then((response) => {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -242,7 +242,7 @@
             </template>
           </el-table-column>
 
-         
+
           <el-table-column label="折扣率(%)" align="center" width="120px">
             <template slot-scope="scope">
                <el-input
@@ -260,14 +260,14 @@
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-         
+
           <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
              {{ calculate(scope.row.supply_count * scope.row.supply_price - (scope.row.supply_count * scope.row.supply_price * (scope.row.deposit_rate/100)))}}
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-           
+
           <el-table-column label="生产厂家" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
@@ -575,7 +575,7 @@ export default {
               drugList[i].min_unit,
               drugList[i].min_number
             );
-            
+
             drugList[i].supply_count = "";
             drugList[i].supply_total_price = "";
             drugList[i].supply_manufacturer = drugList[i].manufacturer;
@@ -661,7 +661,7 @@ export default {
       this.currentIndex = val;
     },
     changeName(val) {
-    
+
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
         if (this.currentIndex == i) {
           this.recordInfo.tableList[i].project_id = val.id;
@@ -694,7 +694,7 @@ export default {
           this.recordInfo.tableList[i].unitList = val.unitList;
           this.recordInfo.tableList[i].count = val.count
           this.recordInfo.tableList[i].sum_count = val.sum_count
-          
+
           if(val.type == 1){
             this.recordInfo.tableList[i].min_number = val.min_number
             this.recordInfo.tableList[i].max_unit = val.max_unit
@@ -704,8 +704,8 @@ export default {
              this.recordInfo.tableList[i].min_unit = ""
              this.recordInfo.tableList[i].min_number = ""
           }
-          
-         
+
+
         }
       }
     },
@@ -783,7 +783,7 @@ export default {
             })
           }).catch(() => {
         })
-   
+
       }
     },
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
@@ -824,7 +824,7 @@ export default {
           if(supply_warehouse_detail_info == arr[i].supply_warehouse_detail_info){
              newArr.push(arr[i])
           }
-         
+
         }
       }
       if(newArr.length >0){
@@ -868,7 +868,7 @@ export default {
       }else{
         return ""
       }
-    
+
     },
     getTotalStockCountTwo(arr) {
       var total_count = 0;
@@ -876,7 +876,7 @@ export default {
         total_count += arr[i].stock_count;
       }
       return total_count
-    
+
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -964,7 +964,7 @@ export default {
       }else{
         return ""
       }
-     
+
     },
 
      addressChange() {
@@ -982,7 +982,7 @@ export default {
 
     count_discount() {
       this.rate_of_concession = (this.discount_amount /(this.total_price * 0.01)).toFixed(2);
-      
+
       if(this.payment > 0) this.count_payment()
     },
 
@@ -1006,7 +1006,7 @@ export default {
     getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
       console.log("sum_count2323232",sum_count)
       var total_count = 0
-      
+
       if(type == 1){
        if(supply_unit == max_unit){
           total_count = supply_count * min_number
@@ -1031,7 +1031,7 @@ export default {
           }
          }
       }
-       
+
       if(type == 2){
          if(supply_count > sum_count){
           this.$message.error("数量不能大于可退数量!")
@@ -1048,7 +1048,7 @@ export default {
           }
          }
       }
-    
+
     },
     getGoodReturnDetail() {
       var id = this.$route.query.id;
@@ -1056,7 +1056,7 @@ export default {
         if (response.data.state == 1) {
           var out = response.data.data.cancelDetail;
           console.log("out23322323232323", out);
-        
+
           this.warehouse_out_id = out.warehouse_out_id;
           this.number = out.number;
           this.is_check = out.is_check;
@@ -1067,7 +1067,7 @@ export default {
           }else{
              this.rate_of_concession = ""
           }
-          
+
           if(out.discount_amount > 0){
            this.discount_amount = out.discount_amount;
           }else{
@@ -1079,15 +1079,15 @@ export default {
           }else{
             this.payment = ""
           }
-          
+
           if(out.arrearage>0){
             this.arrearage = out.arrearage;
           }else{
              this.arrearage = ""
           }
-          
-          
-         
+
+
+
           this.return_remark = out.return_remark
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.orderCancelDetail;
@@ -1139,16 +1139,16 @@ export default {
                   orderInfo[i].min_number =  drugList[j].min_number
                   orderInfo[i].max_unit =drugList[j].max_unit
                   orderInfo[i].min_unit =drugList[j].min_unit
-                 
+
                   orderInfo[i].sum_count = this.getWarehoseInfoTwo(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number)
                   // orderInfo[i].count = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
                  // orderInfo[i].supply_total = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
                 }
-                
+
               }
-             orderInfo[i].count = orderInfo[i].count 
+             orderInfo[i].count = orderInfo[i].count
              orderInfo[i].supply_total = orderInfo[i].supply_total
-             
+
             }
             if (orderInfo[i].is_source == 2) {
               for (let j = 0; j < goodList.length; j++) {
@@ -1163,7 +1163,7 @@ export default {
               orderInfo[i].min_number = 0
               orderInfo[i].count = orderInfo[i].count;
               orderInfo[i].supply_total = orderInfo[i].supply_total
-             
+
               orderInfo[i].max_unit =""
               orderInfo[i].min_unit =""
             }
@@ -1221,7 +1221,7 @@ export default {
             return_marke: this.return_remark,
           };
           console.log("parms32322332",params)
-          
+
           updateGoodReturn(
             params,
             warehouse_out_id,
@@ -1254,13 +1254,13 @@ export default {
         if (response.data.state == 1) {
           this.loading = false;
           var msg = response.data.data.msg;
-         
+
           if(msg == 1){
            this.$message.success("审核成功!");
            this.is_check = 1
            this.Reviewed = true
            this.disabled = true
-          
+
           }
           if(msg == 2){
             var good_name = response.data.data.good_name

src/xt_pages/user/coursePrint.vue

@@ -57,7 +57,7 @@
 
             <div class="inline_block" style="width:100%;">
               <div v-html="item.content" class="printP">
-                 
+
               </div>
             </div>
           </div>
@@ -108,16 +108,16 @@
         ids:ids,
         patient_id:patient_id,
       }
-   
+
       GetCoursePrintData(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.record = resp.data.record
-         
+
           // for(let i=0;i<this.record.length;i++){
           //   this.record[i].content = this.record[i].content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
           // }
-  
+
           this.patient = resp.data.patient
 
           this.loading = false

src/xt_pages/user/doctorAdvice.vue

@@ -671,7 +671,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="开药数量"
+                  label="开药数量!"
                   min-width="80"
                   property="prescribing_number"
                   align="center"
@@ -948,7 +948,7 @@
         >
           <el-row>
             <el-col :span="10">
-              <el-form-item label="医嘱内容:" required prop="advice_name">
+              <el-form-item label="医嘱内容:" required prop="advice_name"><!--第二处-->
                <el-autocomplete
                 style="width:100%;"
                 class="inline-input"
@@ -1019,7 +1019,7 @@
                       v-for="item in unitsOption"
                       :key="item.id"
                       :label="item.name"
-                      :value="item.name"
+                      :value="item.id"
                     >
                     </el-option>
                   </el-select>
@@ -4617,6 +4617,17 @@ export default {
         this.nameForm.drug_id = val.drug_id
         this.nameForm.way = 1
         this.nameForm.drug_name_id = val.drug_id
+        var tmp = val.drug_specs[0]
+        console.log("tmp",tmp)
+        this.nameForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+        this.nameForm.drug_spec_unit = tmp.max_unit
+        this.nameForm.prescribing_number = tmp.prescribing_number//开药数量
+        this.nameForm.prescribing_number_unit = tmp.prescribing_number_unit
+        this.nameForm.single_dose = tmp.single_dose//单次用量
+        this.nameForm.single_dose_unit = tmp.drug_dose_unit
+        this.nameForm.delivery_way = tmp.delivery_way//给药途径
+        this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
+        this.nameForm.drug_id = tmp.id
       }
   },
   watch: {