打印单

src/api/drug/drug_stock.js

@@ -385,9 +385,41 @@ export function getDrugStockAutomaticReduceConfig() {
 }
 
 
+export function getDrugIndetail(params){
+  return request({
+    url:"/api/drugstock/getdrugindetail",
+    method:"Get",
+    params:params
+  })
+}
+
+
+export function getDrugCancelOrder(params){
+  
+   return request({
+     url:"/api/drugstock/getdrugcancelorder",
+     method:"get",
+     params:params
+   })
+}
 
+export function getDrugOutDetail(params){
+  
+  return request({
+    url:"/api/drugstock/getdrugoutdetail",
+    method:"get",
+    params:params
+  })
+}
 
+export function getDrugCancelDetail(params){
 
+  return request({
+    url:"/api/drugstock/getdrugcanceldetail",
+    method:"Get",
+    params:params
+  })
+}
 
 
 

src/router/modules/drugs.js

@@ -42,6 +42,12 @@ export default {
         name: 'drugsStockCancel',
         meta: { title: 'drugsStockCancel', noCache: true }
     },
+    {
+      path:'/stock/drugs/stock/detail',
+      component:()=>import('@/xt_pages/stock/drugs/drugIndex'),
+      name:'drugDetail',
+      meta:{title:'明细查询',noCache:true}
+    },
     // {
     //     path: '/stock/drugs/stock/adjustPrice',
     //     component: () => import('@/xt_pages/stock/drugs/adjustPrice'),

src/router/modules/stock.js

@@ -189,5 +189,17 @@ export default {
       is_menu: false,
       meta: { title: 'user_detail', noCache: true }
     },
+
+    {
+      path: '/stock/drugprint',
+      component: () => import('@/xt_pages/stock/drugs/drugPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
   ]
 }

src/utils/tools.js

@@ -155,7 +155,7 @@ export function uParseTime(time, cFormat) {
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   console.log('类型',type)
   console.log('首剂', shouji)
-  console.log('总量', shichang)
+  console.log('时长', shichang)
   console.log('维持', weichi)
 
   var t = 0.5
@@ -172,7 +172,7 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0
   }
-  // console.log((shouji + (shichang - t) * weichi).toFixed(1))
+ console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
 

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

@@ -3244,15 +3244,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        // this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-        //  1,
-        //   this.dialysisPrescription.anticoagulant_shouji,
-        //  duration,
-        //  this.dialysisPrescription.anticoagulant_weichi
-        // );
-        //  if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
-        //    this.dialysisPrescription.anticoagulant_zongliang = "";
-        //  }
+       
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0
@@ -3284,15 +3276,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        //  this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-        //   1,
-        //    this.dialysisPrescription.anticoagulant_shouji,
-        //    duration,
-        //    this.dialysisPrescription.anticoagulant_weichi
-        //  );
-        // if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
-        //    this.dialysisPrescription.anticoagulant_zongliang = "";
-        // }
+        
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3319,15 +3303,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
-        // this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
-        //   1,
-        //  this.dialysisPrescription.anticoagulant_shouji,
-        //   duration,
-        //   this.dialysisPrescription.anticoagulant_weichi
-        // );
-        // if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
-        //   this.dialysisPrescription.anticoagulant_zongliang = "";
-        // }
+      
       },
       'prescription.id': {
         immediate: true,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -711,7 +711,6 @@
                 'record_time': this.record_date,
                 'admin_user_id':this.$store.getters.xt_user.user.id
 
-
               }
               axios.get('http://127.0.0.1:9532/api/refund/post', {
                 params: params

src/xt_pages/stock/detail/print.vue

@@ -52,7 +52,10 @@
               <!-- <td style="line-height: 50px">
                 <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
               </td> -->
-              <td style="line-height: 50px">{{calCount(stock)}}</td>
+              <td style="line-height: 50px">
+                <span v-if="type == 3">{{getStockCount(stock.id)}}</span>
+                 <span v-else>{{calCount(stock)}}</span> 
+              </td>
               <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
               <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">{{stock.query_warehouseout_info[0].price}}</td>
               <td style="line-height: 50px" v-if="type == 1 || type == 3">{{calTotal(stock)}}</td>
@@ -111,7 +114,7 @@
         type: this.$route.query.type,
         start_time: this.$route.query.start_time,
         end_time: this.$route.query.end_time,
-
+        stockTotal:[]
       }
     },
     methods: {
@@ -155,6 +158,9 @@
         this.loading = true
         getPrintStockGood(this.queryParams).then(response => {
           if (response.data.state == 1) {
+            var stockTotal = response.data.data.stockTotal
+            console.log("stocktOTl",stockTotal)
+            this.stockTotal = stockTotal
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (this.type == 1) {
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {
@@ -167,10 +173,12 @@
                 }
 
               } else if (this.type == 3) {
+              
                 if (response.data.data.list[i].query_warehouseout_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
                 }
-
+              
+                
               } else if (this.type == 4) {
                 if (response.data.data.list[i].query_cancel_stock_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
@@ -197,6 +205,7 @@
           }
         })
       }, calCount(stock) {
+      
         let total = 0
         var array = []
         if (this.type == 1) {
@@ -292,7 +301,18 @@
           }
         }
         return name
-      }
+      },
+
+     getStockCount(id){
+       
+       var count = ""
+       for(let i=0;i<this.stockTotal.length;i++){
+          if(id == this.stockTotal[i].good_id){
+             count = this.stockTotal[i].count
+          }
+       }
+       return count
+     }
     },
     created() {
       var xtuser = this.$store.getters.xt_user

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -310,6 +310,7 @@ 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++) {
             var obj = response.data.data.list[i];
@@ -351,6 +352,7 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
+         
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;

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

@@ -0,0 +1,428 @@
+<template>
+  <div>
+    <!-- <el-button
+      style="float: right"
+      size="small"
+      icon="el-icon-printer"
+      @click="PrintAction"
+      type="primary"
+      >打印
+    </el-button> -->
+    <div class="cell clearfix">
+      <el-input
+        size="small"
+        style="width: 400px;"
+        class="filter-item"
+        v-model.trim="searchKey"
+        placeholder="单据编码/制单人/规格名称"
+      />
+      <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="search"
+        >搜索</el-button
+      >
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+      ></el-date-picker>
+      <span class="cellLine"> - </span>
+      <el-date-picker
+        size="small"
+        v-model="end_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="endTimeChange"
+      ></el-date-picker>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">单据类型</span> : </label>
+      <el-select
+        size="small"
+        v-model="order_type"
+        clearable
+        placeholder="单据类型"
+        @change="changeType"
+      >
+        <el-option
+          v-for="item in orderTypeArr"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">其它</span> : </label>
+      <el-select
+        size="small"
+        v-model="manufacturer_id"
+        clearable
+        placeholder="厂商"
+        @change="changeManufacturer"
+      >
+        <el-option
+          v-for="item in manufacturer"
+          :key="item.id"
+          :label="item.manufacturer_name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column label="单据编号" align="center" width="200">
+          <template slot-scope="scope">
+            {{scope.row.order_number}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.drug_type == 1">西药</span>
+            <span v-if="scope.row.drug_type == 2">草药</span>
+            <span v-if="scope.row.drug_type == 3">成药</span>
+          </template>
+        </el-table-column>
+
+         <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+             <span>{{scope.row.drug_name}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.drug_spec}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type == 1">药品退库单</span>
+            <span v-if="scope.row.type == 2">其他</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作时间" align="center">
+          <template slot-scope="scope">
+            <span>{{getTime(scope.row.ctime)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+          {{getAdminUser(scope.row.creater)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+            {{scope.row.count}}
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers} from "@/api/doctor";
+import {  GetAllConfig} from "@/api/stock";
+import { getDrugCancelDetail } from "@/api/drug/drug_stock";
+export default {
+  name: "cancelStockDetail",
+
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+  
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+    this.getlist()
+  },
+  data() {
+    return {
+      orderTypeArr: [
+        { value: 1, label: "药品退库单" },
+        { value: 2, label: "其他入库单" }
+      ],
+      manufacturer_id: "",
+      dealer_id: "",
+      order_type: "",
+      searchKey: "",
+      type: 4,
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: [],
+      tableData:[]
+    };
+  },
+  methods: {
+    PrintAction: function() {
+      this.$router.push({
+        path: "/stock/print",
+        query: {
+          type: 4,
+          start_time: this.start_time,
+          end_time: this.end_time
+        }
+      });
+    },
+    changeType: function(val) {
+      this.order_type = val;
+      this.getlist()
+    },
+    changeManufacturer: function(val) {
+      this.manufacturer_id = val;
+      this.getlist()
+    },
+    getTypeName: function(row) {
+      let name = "";
+      const name2 = "";
+      if (row.type == 1) {
+        name = "药品退库单";
+      } else if (row.type == 2) {
+        name = "其他退库单";
+      }
+
+      return name;
+    },
+   
+  
+    search() {
+      this.getlist()
+    },
+  
+   
+   
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+      this.getlist()
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.getlist()
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
+          this.goodType = response.data.data.goodType;
+        }
+      });
+    },
+  
+  
+   
+    select(selection) {
+     
+    },
+    getlist(){
+       var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+       }
+      getDrugCancelDetail(params).then(response=>{
+         if(response.data.state == 1){
+           var order =  response.data.data.order
+           console.log("退库详细",order)
+           this.tableData = order
+           var total = response.data.data.total
+           this.total = total
+         } 
+      })
+    },
+
+     getAdminUser(id){
+      var name = ""
+      for(let i=0;i<this.adminUserOptions.length;i++){
+          if(id == this.adminUserOptions[i].id){
+             name = this.adminUserOptions[i].name
+          }
+      }
+      return name
+    },
+
+      getTime: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

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

@@ -0,0 +1,463 @@
+<template>
+  <div>
+    <!-- <el-button
+      style="float: right"
+      size="small"
+      icon="el-icon-printer"
+      @click="PrintAction"
+      type="primary"
+      >打印
+    </el-button> -->
+    <div class="cell clearfix">
+      <el-input
+        size="small"
+        style="width: 400px;"
+        class="filter-item"
+        v-model="searchKey"
+        placeholder="单据编码/制单人/规格名称"
+      />
+      <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="search"
+        >搜索</el-button
+      >
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+      ></el-date-picker>
+      <span class="cellLine"> - </span>
+      <el-date-picker
+        size="small"
+        v-model="end_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="endTimeChange"
+      ></el-date-picker>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">单据类型</span> : </label>
+      <el-select
+        size="small"
+        v-model="order_type"
+        clearable
+        placeholder="单据类型"
+        @change="changeType"
+      >
+        <el-option
+          v-for="item in orderTypeArr"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">其它</span> : </label>
+      <el-select
+        size="small"
+        v-model="manufacturer_id"
+        clearable
+        placeholder="厂商"
+        @change="changeManufacturer"
+      >
+        <el-option
+          v-for="item in manufacturer"
+          :key="item.id"
+          :label="item.manufacturer_name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column label="单据编号" align="center" width="200">
+          <template slot-scope="scope">
+             {{scope.row.order_number}} 
+          </template>
+        </el-table-column>
+
+        
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.drug_type == 1">西药</span>
+            <span v-if="scope.row.drug_type == 2">草药</span>
+            <span v-if="scope.row.drug_type == 3">成药</span>
+          </template>
+        </el-table-column>
+
+         <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.drug_name}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
+          <template slot-scope="scope">
+             <span>{{scope.row.drug_spec}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据类型" align="center">
+          <template slot-scope="scope">
+           <span v-if="scope.row.type == 1">药品退货单</span>
+            <span v-if="scope.row.type == 2">其他</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作时间" align="center">
+          <template slot-scope="scope">
+            <span>{{getTime(scope.row.ctime)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+             <span>{{getAdminUser(scope.row.creater)}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+             <span>{{scope.row.count}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { getDrugCancelOrder } from "@/api/drug/drug_stock"
+import { GetAllConfig } from "@/api/stock";
+export default {
+  name: "salesReturnDetail",
+
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+    this.getlist()
+  },
+  data() {
+    return {
+      orderTypeArr: [
+        { value: 1, label: "药品退货单" },
+        { value: 2, label: "其他入库单" }
+      ],
+      manufacturer_id: "",
+      dealer_id: "",
+      order_type: "",
+      searchKey: "",
+      type: 3,
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: [],
+      tableData:[]
+    };
+  },
+  methods: {
+    changeType: function(val) {
+      this.order_type = val;
+      this.getlist()
+    },
+    changeManufacturer: function(val) {
+      this.manufacturer_id = val;
+      this.getlist()
+    },
+    getTypeName: function(row) {
+      let name = "";
+      if (row.type == 1) {
+        name = "耗材退货单";
+      } else if (row.type == 2) {
+        name = "其他退货单";
+      }
+
+      return name;
+    },
+    typeName: function(good_type_id) {
+      let name = "";
+      for (let i = 0; i < this.goodType.length; i++) {
+        if (this.goodType[i].id == good_type_id) {
+          name = this.goodType[i].type_name;
+        }
+      }
+      return name;
+    },
+    typeNameOne:function(good_id){
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name
+    },
+    specificationName: function(good_info_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].specification_name;
+        }
+      }
+      return name;
+    },
+    search(){
+      this.getlist()
+    },
+  
+    PrintAction: function() {
+    
+    },
+  
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.getlist() 
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
+          this.goodType = response.data.data.goodType;
+        }
+      });
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+
+    getlist(){
+     const params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+      }
+      getDrugCancelOrder(params).then(response=>{
+        if(response.data.state == 1){
+          var order = response.data.data.order
+          console.log("order",order)
+          this.tableData = order
+          var total =  response.data.data.total
+          this.total = total
+        }
+      }) 
+    },
+
+   getAdminUser(id){
+      var name = ""
+      for(let i=0;i<this.adminUserOptions.length;i++){
+          if(id == this.adminUserOptions[i].id){
+             name = this.adminUserOptions[i].name
+          }
+      }
+      return name
+    },
+   getTime: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

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

@@ -0,0 +1,424 @@
+<template>
+  <div>
+    <el-button
+      style="float: right"
+      size="small"
+      icon="el-icon-printer"
+      @click="PrintAction"
+      type="primary"
+      >打印
+    </el-button>
+
+    <div class="cell clearfix">
+      <el-input
+        size="small"
+        style="width: 400px;"
+        class="filter-item"
+        v-model.trim="searchKey"
+        placeholder="单据编码/制单人/规格名称"
+      />
+      <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="search"
+        >搜索</el-button
+      >
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+      ></el-date-picker>
+      <span class="cellLine"> - </span>
+      <el-date-picker
+        size="small"
+        v-model="end_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="endTimeChange"
+      ></el-date-picker>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">单据类型</span> : </label>
+      <el-select
+        size="small"
+        v-model="order_type"
+        clearable
+        placeholder="单据类型"
+        @change="changeType"
+      >
+        <el-option
+          v-for="item in orderTypeArr"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">其它</span> : </label>
+      <el-select
+        size="small"
+        v-model="manufacturer_id"
+        clearable
+        placeholder="厂商"
+        @change="changeManufacturer"
+      >
+        <el-option
+          v-for="item in manufacturer"
+          :key="item.id"
+          :label="item.manufacturer_name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="cancelStockDate"
+        :class="signAndWeighBoxPatients"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column label="单据编号" align="center" width="200">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_order}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.drug_type == 1">西药</span>
+            <span v-if="scope.row.drug_type == 2">草药</span>
+            <span v-if="scope.row.drug_type == 3">成药</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+            {{scope.row.drug_name}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
+          <template slot-scope="scope">
+           {{scope.row.drug_spec}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type == 1">药品入库单</span>
+            <span v-if="scope.row.type == 2">其他</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作时间" align="center">
+          <template slot-scope="scope">
+            <span>{{getTime(scope.row.ctime)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+           {{getAdminUser(scope.row.creater)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="进货价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.price}}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_count}}
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.total_price}}
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers } from "@/api/doctor";
+import { GetAllConfig } from "@/api/stock";
+import { getDrugIndetail} from "@/api/drug/drug_stock"
+export default {
+  name: "stockInDetail",
+
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
+    //获取入库单数据
+    this.getlist()
+  },
+  data() {
+    return {
+      orderTypeArr: [
+        { value: 1, label: "药品入库单" },
+        { value: 2, label: "其他入库单" }
+      ],
+      newDate: [{ name: "合计", num: "111111" }],
+
+      searchKey: "",
+      type: 1,
+      page: 1,
+      limit: 10,
+      manufacturer_id: "",
+      dealer_id: "",
+      order_type: "",
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: []
+    };
+  },
+  methods: {
+    changeType: function(val) {
+      this.order_type = val;
+     
+    },
+    changeManufacturer: function(val) {
+      this.manufacturer_id = val;
+      
+    },
+    changeDealer: function(val) {
+      this.dealer_id = val;
+     
+    },
+    search: function() {
+      this.getlist()
+    },
+    getTime: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    AddNewOrder: function() {
+   
+    },
+  
+   
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          console.log("医生护士",this.adminUserOptions)
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+     
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.getlist();
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+
+     GetConfigInfo(){
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
+          this.goodType = response.data.data.goodType;
+        }
+      });
+    },
+
+   
+    getlist(){
+       var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+       }
+      getDrugIndetail(params).then(response=>{
+        if(response.data.state == 1){
+          var drugInOrder = response.data.data.detail
+          console.log("drug3434444",drugInOrder)
+          this.cancelStockDate = drugInOrder
+          var total = response.data.data.total
+          this.total = total
+        }
+      })
+    },
+    PrintAction(){
+      this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+    },
+    select(){
+
+    },
+    getAdminUser(id){
+      var name = ""
+      for(let i=0;i<this.adminUserOptions.length;i++){
+          if(id == this.adminUserOptions[i].id){
+             name = this.adminUserOptions[i].name
+          }
+      }
+      return name
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

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

@@ -0,0 +1,446 @@
+<template>
+  <div>
+    <!-- <el-button
+      style="float: right"
+      size="small"
+      icon="el-icon-printer"
+      @click="PrintAction"
+      type="primary"
+      >打印
+    </el-button> -->
+    <div class="cell clearfix">
+      <el-input
+        size="small"
+        style="width: 400px;"
+        class="filter-item"
+        v-model.trim="searchKey"
+        placeholder="单据编码/制单人/规格名称"
+      />
+      <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="search"
+        >搜索</el-button
+      >
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+      ></el-date-picker>
+      <span class="cellLine"> - </span>
+      <el-date-picker
+        size="small"
+        v-model="end_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="endTimeChange"
+      ></el-date-picker>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">单据类型</span> : </label>
+      <el-select
+        size="small"
+        v-model="order_type"
+        clearable
+        placeholder="单据类型"
+        @change="changeType"
+      >
+        <el-option
+          v-for="item in orderTypeArr"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"><span class="name">其它</span> : </label>
+      <el-select
+        size="small"
+        v-model="manufacturer_id"
+        clearable
+        placeholder="厂商"
+        @change="changeManufacturer"
+      >
+        <el-option
+          v-for="item in manufacturer"
+          :key="item.id"
+          :label="item.manufacturer_name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table
+        :data="tableData"
+        :class="signAndWeighBoxPatients"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column label="单据编号" align="center" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.warehouse_out_order_number }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.drug_type == 1">西药</span>
+            <span v-if="scope.row.drug_type == 2">草药</span>
+            <span v-if="scope.row.drug_type == 3">成药</span>
+          </template>
+        </el-table-column>
+
+         <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+            {{scope.row.drug_name}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
+          <template slot-scope="scope">
+           {{scope.row.drug_spec}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据类型" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type == 1">药品出库单</span>
+            <span v-if="scope.row.type == 2">其他</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作时间" align="center">
+          <template slot-scope="scope">
+           <span>{{getTime(scope.row.ctime)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+           {{getAdminUser(scope.row.creater)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="出货价" align="center">
+          <template slot-scope="scope">
+           {{scope.row.price}}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+            {{scope.row.count}}
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.total_price}}
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers } from "@/api/doctor";
+import {GetAllConfig } from "@/api/stock";
+import {getDrugOutDetail } from "@/api/drug/drug_stock"
+export default {
+  name: "stockOutDetail",
+
+  created() {
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+    this.getlist()
+  },
+  data() {
+    return {
+      orderTypeArr: [
+        { value: 1, label: "药品出库单" },
+        { value: 2, label: "其他入库单" }
+      ],
+      manufacturer_id: "",
+      dealer_id: "",
+      order_type: "",
+
+      searchKey: "",
+      type: 2,
+      page: 1,
+      limit: 10,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: [],
+      tableData:[]
+    };
+  },
+  methods: {
+    changeType: function(val) {
+      this.order_type = val;
+      this.getlist()
+    },
+    changeManufacturer: function(val) {
+      this.manufacturer_id = val;
+      this.getlist()
+    },
+    getTypeName: function(row) {
+      let name = "";
+      const name2 = "";
+      if (row.type == 1) {
+        name = "药品出库单";
+      } else if (row.type == 2) {
+        name = "其他出库单";
+      }
+
+      return name;
+    },
+    search: function() {
+      this.getlist()
+    },
+
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+        }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+         this.getlist()
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
+          this.goodType = response.data.data.goodType;
+        }
+      });
+    },
+   
+    getTime: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    PrintAction: function() {
+      
+    },
+    getlist(){
+      var params = {
+         start_time:this.start_time,
+         end_time:this.end_time,
+         order_type:this.order_type,
+         manufacturer_id:this.manufacturer_id,
+         keyword:this.searchKey,
+         page:this.page,
+         limit:this.limit,
+      }  
+      getDrugOutDetail(params).then(response=>{
+        if(response.data.state == 1){
+          var order = response.data.data.order
+          console.log("出库数据",order)
+          this.tableData = order
+          var total = response.data.data.total
+          this.total = total
+        } 
+      }) 
+    },
+
+   select(){
+       
+   },
+
+    getAdminUser(id){
+      var name = ""
+      for(let i=0;i<this.adminUserOptions.length;i++){
+          if(id == this.adminUserOptions[i].id){
+             name = this.adminUserOptions[i].name
+          }
+      }
+      return name
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/drugs/drugIndex.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="入库明细" name="first">
+            <drug-in-order></drug-in-order>
+          </el-tab-pane>
+          <el-tab-pane label="退货明细">
+            <drug-cancel-order></drug-cancel-order>
+          </el-tab-pane>
+          <el-tab-pane label="出库明细">
+            <drug-out-detail></drug-out-detail>
+          </el-tab-pane>
+          <el-tab-pane label="退库明细">
+            <drug-cancel-detail></drug-cancel-detail>
+          </el-tab-pane>
+
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import DrugInOrder from '@/xt_pages/stock/drugs/components/drugInOrder'
+import DrugCancelOrder from '@/xt_pages/stock/drugs/components/drugCancelOrder'
+import DrugOutDetail from '@/xt_pages/stock/drugs/components/drugOutDetail'
+import DrugCancelDetail from '@/xt_pages/stock/drugs/components/drugCancelDetail'
+export default {
+  components: {
+    BreadCrumb,
+    DrugInOrder,
+    DrugCancelOrder,
+    DrugOutDetail,
+    DrugCancelDetail
+  },
+   data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/detail', name: '出入库明细查询' }
+        ],
+        activeName: 'first'
+
+      }
+    },
+}
+</script>

src/xt_pages/stock/drugs/drugPrint.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height: 50px" width="">备 注</td>
+            </tr>
+
+            <tr v-for="(item,index) in cancelStockDate" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_spec}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.min_unit}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  {{item.warehousing_count}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+              <td style="line-height: 50px">
+                 {{item.remark}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1" v-if="type == 1 || type == 3">
+            <tbody>
+            <tr>
+              <td width="633" style="line-height: 50px">合计</td>
+              <td width="80" style="line-height: 50px">{{calTotalPrice()}}</td>
+              <td></td>
+            </tr>
+
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import { getDrugIndetail} from "@/api/drug/drug_stock"
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',   
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        order_type:this.$route.query.order_type,
+        manufacturer_id:this.$route.query.manufacturer_id,
+        keyword:this.$route.query.keyword,
+        limit:this.$route.query.limit,
+        page:this.$route.query.page,
+        cancelStockDate:[],
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+      getlist(){
+        var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+       }
+      getDrugIndetail(params).then(response=>{
+        if(response.data.state == 1){
+          var drugInOrder = response.data.data.detail
+          console.log("drug3434444",drugInOrder)
+          this.cancelStockDate = drugInOrder
+          var total = response.data.data.total
+          this.total = total
+        }
+      })  
+      }
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.getlist()
+
+      
+
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/user/dialysisSolution.vue

@@ -199,43 +199,12 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col   :span="8">
-            <el-form-item label="透析器:" prop="dialyzer">
-                <el-select v-model="addPlan.dialyzer" placeholder="" >
-                  <el-option v-for="item in deviceList"  :label="item.name" :key="item.id" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col   :span="8">
-            <el-form-item label="透析器:" prop="hemodialysis_machine">
-                <el-select v-model="addPlan.hemodialysis_machine" placeholder="" >
-                  <el-option v-for="item in hemodialysis_machines"  :label="item.name" :key="item.id" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col   :span="8">
-            <el-form-item label="灌流器:" prop="perfusion_apparatus">
-                <el-select v-model="addPlan.perfusion_apparatus" placeholder="" >
-                  <el-option v-for="item in perfusion_apparatus"  :label="item.name" :key="item.id" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8" v-if="isShows('血流量')">
             <el-form-item label="血流量(ml/min):" prop="blood_flow_volume">
               <el-input v-model="addPlan.blood_flow_volume"></el-input>
             </el-form-item>
           </el-col>
-          <!--<el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id == 6">-->
-          <!--<el-form-item label="目标超滤量(ml) : ">-->
-          <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id != 6">-->
-          <!--<el-form-item label="目标超滤量(L) : ">-->
-          <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
+       
 
           <el-col :span="8" v-if="isShows('透析液配方')">
             <el-form-item label="透析液配方:">
@@ -249,23 +218,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col  :span="12">
-            <el-form-item label="脱水量(L):" prop="dewater">
-              <el-input v-model="addPlan.dewater" ></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col  :span="12">
-            <el-form-item label="置换液(L):" prop="displace_liqui">
-              <el-input v-model="addPlan.displace_liqui" ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col  :span="12">
-            <el-form-item label="置换方式:" prop="replacement_way" >
-              <el-select v-model="addPlan.replacement_way"  >
-                <el-option v-for="item in replacementWays"  :label="item.name" :key="item.id" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
+         
           <el-col :span="8" v-if="isShows('抗凝剂')">
             <el-form-item label="抗凝剂:" prop="anticoagulant">
               <el-select
@@ -852,17 +805,26 @@ export default {
     }
   },
   watch: {
+   
+   'dialysisTimeShow':function(){
+      var val = this.addPlan.dialysis_duration_hour+":"+this.addPlan.dialysis_duration_minute
+      var valTime = val.split(':')
+      this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
+      this.addPlan.dialysis_duration_hour = valTime[0]
+      this.addPlan.dialysis_duration_minute = valTime[1]
+   },
+
     'addPlan.dialysis_duration': function() {
-      this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
-        1,
+    
+      this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
       )
     },
     'addPlan.anticoagulant_shouji': function() {
-      this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
-        1,
+      
+      this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
@@ -877,6 +839,9 @@ export default {
       )
     }
   },
+
+
+  
   components: {
     MultiSelectBox,
     tableTitle,
@@ -916,9 +881,10 @@ export default {
     },
 
     selectnDialysisTime(val) {
+     
       var valTime = val.split(':')
-      this.addPlan.dialysis_duration =
-        parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
+      this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
+      console.log("透析时长",this.addPlan.dialysis_duration)
       this.addPlan.dialysis_duration_hour = valTime[0]
       this.addPlan.dialysis_duration_minute = valTime[1]
     },
@@ -1364,13 +1330,7 @@ export default {
         this.addPlan.dialysate_formulation= ""
       }
       this.addPlan.dialysate_formulation = row.dialysate_formulation
-      this.dialysisTimeShow = new Date(
-        2018,
-        1,
-        1,
-        this.addPlan.dialysis_duration_hour,
-        this.addPlan.dialysis_duration_minute
-      )
+      this.dialysisTimeShow = new Date(2018,1,1,this.addPlan.dialysis_duration_hour,this.addPlan.dialysis_duration_minute)
     },
     isShows(name) {
       var filedList = store.getters.xt_user.fileds

src/xt_pages/user/patients.vue

@@ -102,6 +102,7 @@
           <el-button size="small" type="primary" @click="toRemind">传染病检查提醒</el-button>
         </el-badge>
         <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload" v-if="isShow"></upload-excel>
+
         <el-link target="_blank" href="https://kuyi.shengws.com/patient_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
@@ -768,7 +769,6 @@
     },
 
     methods: {
-      beforeUpload(){},
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
@@ -821,6 +821,8 @@
 
       },
       handleSuccess({ results, header }) {
+        console.log("999999999")
+
         console.log(results)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
@@ -1114,6 +1116,7 @@
 
 
               if (tempExportDateOne.length < this.export_date.length){
+
                 this.phoneVisible = true
                 return
               }