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

src/api/his/his_tools.js

@@ -30,3 +30,11 @@ export function GetDetailPatients(params) {
     params: params
   })
 }
+
+export function getHisOrderList(params) {
+  return request({
+    url: '/api/his/gethisorderlist',
+    method: 'Get',
+    params: params
+  })
+}

src/router/modules/hisTool.js

@@ -108,5 +108,11 @@ export default {
       is_menu: false,
       meta: { title: 'gatherPrint', noCache: true }
     }
+    // {
+    //   path: '/hisTool/export',
+    //   component: () => import('@/xt_pages/outpatientTool/export'),
+    //   name: 'export',
+    //   meta: { title: 'export', noCache: true }
+    // }
   ]
 }

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

@@ -220,7 +220,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
-                           
+
 
                           </div>
 
@@ -246,14 +246,14 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-                          
+
                             <el-form-item v-else :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-                            
+
                         </div>
 
                     </el-col>
@@ -412,7 +412,7 @@
                     </el-col>
                     <el-col
                             :span="8"
-                            v-if="anticoagulant.gaijiliang != -1 && isShows('钙剂量')"
+                            v-if="isShows('钙剂量')"
                     >
                         <el-form-item label="钙剂量(ml) : ">
                             <el-input
@@ -1662,7 +1662,7 @@
         this.isVisibility = true
       },
       handleAdviceCommit() {
-       
+
           let results = []
           for (let i = 0; i < this.targetAdvices.length; i++) {
             for (let a = 0; a < this.checkedCities.length; a++) {
@@ -1680,7 +1680,7 @@
           var date = new Date()
           var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
           var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-         
+
           if (results.length > 0) {
             if(!this.isLoading){
               if (this.is_pre == 1) {
@@ -1691,10 +1691,10 @@
                 }
 
                 var arr = this.dialysisPrescription
-               
+
 
                 const ParamsQuery = arr
-                
+
 
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
@@ -1729,7 +1729,7 @@
                       duration: 2000
                     })
                     var date = new Date()
-                    
+
                     const params = {
                       advices: results,
                       advice_date: this.start_time.split(' ')[0],
@@ -1745,7 +1745,7 @@
                     }else{
                       patient_id = this.$route.query.patient_id
                     }
-                  
+
                     CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
@@ -1775,9 +1775,9 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                
+
                 const ParamsQuery = arr
-              
+
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = 1
@@ -1940,7 +1940,7 @@
 
           this.isShowRemindAdvice = false
           this.isVisibility = true
-        
+
       },
       handleAdviceCancle() {
         this.isShowRemindAdvice = false
@@ -1950,7 +1950,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre, schedual, last, his_is_open,is_advice_open) {
-        
+
         if (pre != undefined) {
           if (pre.oxygen_uptake == 1) {
             this.oxygenShow = true
@@ -2106,7 +2106,7 @@
         console.log("last2323232323232332",last)
         if (this.predialysis == null || this.predialysis.id == 0) {
           if (last != null) {
-            
+
             this.dialysisPrescription.niprocart = last.niprocart
             this.dialysisPrescription.jms = last.jms
             this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
@@ -2181,7 +2181,7 @@
           this.dialysisPrescription.anticoagulant_zongliang = ""
           this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
         }
-     
+
 
       },
 
@@ -2224,7 +2224,7 @@
               const ParamsQuery = arr
               // console.log('night', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
-             
+
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
               ParamsQuery['patient_id'] = this.patient.id
@@ -2320,7 +2320,7 @@
                 ParamsQuery['mode'] = '1'
                 ParamsQuery['patient_id'] = this.patient.id
                 console.log('第三')
-              
+
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2599,7 +2599,7 @@
                   ParamsQuery['mode'] = '1'
                   ParamsQuery['patient_id'] = this.patient.id
                   console.log('第八')
-                  
+
                   postPrescription(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)
@@ -2639,7 +2639,7 @@
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '2'
               ParamsQuery['patient_id'] = this.patient.id
-            
+
               if (
                 this.$store.getters.xt_user.user.id !=
                 this.dialysisPrescription.creater
@@ -3192,7 +3192,7 @@
       isShows(name) {
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
-         
+
           if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
 
             return true
@@ -3572,7 +3572,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-       
+
         if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
          this.dialysisPrescription.anticoagulant_zongliang = ""
          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1451,8 +1451,7 @@ export default {
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51 ||
-        this.org_template_info.template_id == 54
+        this.org_template_info.template_id == 51
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -113,7 +113,7 @@
                 prescription.displace_liqui_value
                   ? prescription.displace_liqui_value
                   : "/"
-              }}ml  )
+              }}L  )
               <label-box
                 :isChecked="prescription.mode_id == 32 ? true : false"
                 showValue="HDP"
@@ -247,7 +247,7 @@
                   prescription.dialysate_flow ? prescription.dialysate_flow : ""
                 }}
               </span>
-              ml/h;
+              ml/min;
             </td>
             <td width="200" style="padding-left: 10px">
               医师签名：
@@ -276,7 +276,7 @@
                     {{
                       prescription.calcium ? prescription.calcium : ""
                     }} </span
-                  >mmol/L&nbsp; 碳酸氢根：
+                  >mmol/L&nbsp; 碳酸氢盐：
                   <span style="width: 50px; display: inline-block">
                     {{
                       prescription.bicarbonate ? prescription.bicarbonate : ""
@@ -1339,7 +1339,6 @@ export default {
           }
 
           var tableAdvice = this.advices;
-          // console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -46,7 +46,7 @@
           <div class="inline_block" style="margin-left: 10px">
             年龄：
             <div class="under_line" style="width: 30px; text-align: center">
-              {{ getAge(patientInfo) }}
+              {{ getAge(patientInfo) -  getoldAge()}}
             </div>
             岁
           </div>
@@ -2694,6 +2694,17 @@ export default {
     };
   },
   methods: {
+    // 获取当前年份，用于年龄计算
+    getoldAge(){
+      let date = new Date()
+      let year = date.getFullYear()
+      let year_d = year-this.xtdate.split('-')[0]
+      return year_d
+    },
+
+
+
+
     checkData() {
       if (this.receiverTreatmentAccess.way == 0) {
         this.$message.error("入科方式未填");

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -15,13 +15,20 @@
       <div class="dialysisPage">
         <printOne
           v-if="
-            org_id != 10215 && org_id != 10265 && org_id != 4 && org_id != 0 && org_id != 9675
+            org_id != 10215 &&
+            org_id != 10265 &&
+            org_id != 4 &&
+            org_id != 0 &&
+            org_id != 9675
           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215 " :paramsObj="invoiceParams"></printTwo>
+        <printTwo
+          v-if="org_id == 10215 || org_id == 0"
+          :paramsObj="invoiceParams"
+        ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 ||  org_id == 0"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/summary.vue

@@ -306,6 +306,7 @@
       width="1200px"
       title="打印"
       :visible.sync="invoiceVisible"
+      destroy-on-close
     >
       <invoicePrint ref="print" :invoiceParams="invoiceParams"></invoicePrint>
     </el-dialog>
@@ -1122,6 +1123,7 @@ export default {
         setl_time: obj.setl_time,
       };
       this.invoiceParams = paramsObj;
+      
       const loading = this.$loading({
           lock: true,
           text: '正在加载中...',
@@ -1129,8 +1131,8 @@ export default {
           background: 'rgba(0, 0, 0, 0.7)'
         });
         setTimeout(() => {
-          loading.close();
           this.invoiceVisible = true;
+          loading.close();
         }, 1000);
     },
     shouJuPrint(obj) {

src/xt_pages/outpatientTool/export.vue

@@ -0,0 +1,631 @@
+<template>
+  <div class="main-contain new-main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div
+      class="app-container"
+      style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+    >
+      <div class="mainLeft">
+        <div>
+          <div
+            style="
+              margin: 10px 0;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
+            <el-input
+              size="small"
+              style="width: 130px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入患者名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :row-class-name="tableRowClassName"
+            @row-click="onRowClick"
+            :data="patientTableData"
+            :height="tableHeight"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            highlight-current-row
+            ref="singleTable"
+            @current-change="handleCurrentChange"
+          >
+            <el-table-column align="center" prop="name" label="姓名" wdith="89">
+              <template slot-scope="scope">{{ scope.row.name }}</template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="mainRight">
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+        <el-table
+        :data="tableList"
+         border
+        style="width: 100%">
+         <el-table-column prop="date" label="姓名"  width="100" align="center">
+           <template slot-scope="scope" >
+            {{ scope.row.name }}
+           </template>
+        </el-table-column>
+        <el-table-column  prop="date"  label="身份证"  width="200" align="center">
+           <template slot-scope="scope" >
+            {{ scope.row.id_card_no }}
+           </template> 
+        </el-table-column>
+        <el-table-column prop="name"  label="医保类型" width="100" align="center">
+          <template slot-scope="scope" >
+            <span v-if="scope.row.insutype == 0">居民</span>
+            <span v-if="scope.row.insutype == 310">职工</span>
+            <span v-if="scope.row.insutype == 390">居民</span>
+           </template>  
+        </el-table-column>
+        <el-table-column  prop="address" label="年"  width="50" align="center">
+          <template slot-scope="scope" >
+            {{getTime(scope.row.settle_accounts_date)}}
+         </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="月"  width="50"  align="center">
+          <template slot-scope="scope">
+            {{getTimeOne(scope.row.settle_accounts_date)}}
+           </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="收费项目"  width="100" align="center">
+           <template slot-scope="scope" >
+            <!-- {{getTime(scope.row.settle_accounts_date)}} -->
+            <span v-if="scope.row.med_chrgitm_type == '01'">床位费</span>
+            <span v-if="scope.row.med_chrgitm_type == '02'">诊察费</span>
+            <span v-if="scope.row.med_chrgitm_type == '03'">检查费</span>
+            <span v-if="scope.row.med_chrgitm_type == '04'">化验费</span>
+            <span v-if="scope.row.med_chrgitm_type == '05'">治疗费</span>
+            <span v-if="scope.row.med_chrgitm_type == '06'">手术费</span>
+            <span v-if="scope.row.med_chrgitm_type == '08'">材料费</span>
+            <span v-if="scope.row.med_chrgitm_type == '09'">西药费</span>
+            <span v-if="scope.row.med_chrgitm_type == '11'">中成费</span>
+            <span v-if="scope.row.med_chrgitm_type == '14'">其他费</span>
+           </template>  
+        </el-table-column>
+         <el-table-column prop="address" label="数量"  width="100" align="center">
+           <template slot-scope="scope" >
+            {{getCount(scope.row.child)}}
+           </template>  
+          </el-table-column>
+       
+         <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <template slot-scope="scope" >
+            {{getAllPrice(scope.row.child)}}
+           </template>  
+        </el-table-column>
+         </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { GetDetailPatients,getHisOrderList } from "@/api/his/his_tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+const moment = require("moment");
+import { uParseTime } from '@/utils/tools'
+export default {
+  components: {
+    BreadCrumb,
+  },
+  data() {
+    return {
+      currentRowIndex: 0,
+      patientTableData: [],
+      tableHeight: 400,
+      crumbs: [
+        { path: false, name: "His工具" },
+        { path: false, name: "明细汇总统计" },
+      ],
+      titleType: "明细",
+      patient_id: 0,
+      keywords: "",
+      tableList:[],
+     chargeDate: [
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+        moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      ],
+      start_time:"",
+      end_time:""
+    };
+  },
+
+  // beforeRouteEnter(to, from, next){
+  //     if(from.path == '/hisTool/detailPrint'){
+  //       next((vm) => {
+  //         vm.titleType = "明细"
+  //       })
+  //     }else if(from.path == '/hisTool/gatherPrint'){
+  //       vm.titleType = "汇总"
+  //       next((vm) => {
+  //         vm.titleType = "汇总"
+  //       })
+  //     }else{
+  //       next()
+  //     }
+  // },
+
+  //判断列表页是否刷新
+  beforeRouteLeave(to, from, next) {
+    console.log(to, "beforeRouteEnter");
+    if (to.path != "/hisTool/detailPrint"&&to.path != "/hisTool/gatherPrint") {
+      this.$store.getters.pagedata.list.table_id = 0
+      next()
+    } else {
+     next()
+    }
+  },
+
+  watch:{
+    'titleType':{
+      handler(val){
+        this.$store.commit('SET_PAGENAME',val)
+      }
+    }
+  },
+
+  methods: {
+    getPatientList() {
+      var params = {
+        keyword: this.keywords,
+      };
+      GetDetailPatients(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.patientTableData = response.data.data.patient;
+          this.patient_id = this.patientTableData[0].id;
+          if (this.$store.getters.pagedata.list.table_id == 0) {
+            this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
+          } else {
+            this.$refs.singleTable.setCurrentRow(
+              this.patientTableData[
+                this.$store.getters.pagedata.list.table_id
+              ]
+            );
+          }
+        }
+      });
+    },
+
+    tableRowClassName({ row, rowIndex }) {
+      row.row_index = rowIndex;
+    },
+
+    onRowClick(row, event, column) {
+      this.currentRowIndex = row.row_index;
+      this.$store.commit("SET_PAGEDATA", {
+        table_id: this.currentRowIndex,
+      });
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
+    },
+    searchAction() {
+      this.getPatientList();
+    },
+    handleCurrentChange(row) {
+      this.patient_id = row.id;
+      this.tableList = []
+      this.getHisOrderList(row.id)
+    },
+    getHisOrderList(id){
+       var params = {
+        patient_id:id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+       } 
+     console.log("params223332233232",params)
+     getHisOrderList(params).then(response=>{
+       if(response.data.state == 1){
+        //  var list = response.data.data.list
+        //  console.log("list23232232323",list)
+         var groupList = response.data.data.groupList
+          
+         var arr = []
+         for(let i=0;i<groupList.length;i++){
+            //已经结算
+           if(groupList[i].order.order_status == 2){
+              arr.push(groupList[i])
+           }
+         }
+         console.log("已结算数据",arr)
+         if(arr.length > 0){
+         let objInfo = {};
+          if(arr.length > 0) {
+             arr.forEach((item, index) => {
+              let { med_chrgitm_type } = item;
+              if (!objInfo[med_chrgitm_type]) {
+                objInfo[med_chrgitm_type] = {
+                  med_chrgitm_type:item.med_chrgitm_type,
+                  child: [],
+                  count: item.cnt,
+                  pric:item.pric,
+                  order_id:item.order_id,
+                  name:item.patient.name,
+                  id_card_no:item.patient.id_card_no,
+                  insutype:item.order.insutype,
+                  settle_accounts_date:item.order.settle_accounts_date,
+                  det_item_fee_sumamt:item.det_item_fee_sumamt,
+                };
+              }
+            });
+
+            let newArr = Object.values(objInfo);
+            console.log("newAR23232323232323323",newArr.length)
+
+            if(newArr.length > 0){
+             console.log("尽力33232233232",newArr)
+              for(let i=0;i<newArr.length;i++){
+                for(let j=0;j<arr.length;j++){
+                   if(newArr[i].med_chrgitm_type == arr[j].med_chrgitm_type){
+                      newArr[i].child.push(arr[j])
+                   }
+                }
+              }
+            }
+            console.log("分类后的数据",newArr)
+            this.tableList = newArr
+          }
+          
+         }
+
+         //console.log("grouplist2323322",groupList)
+         
+       }
+     })
+    },
+    changeDate(){
+      this.start_time = this.chargeDate[0];
+      this.end_time = this.chargeDate[1];  
+      this.getHisOrderList(this.patient_id) 
+    },
+   getTime(val) {
+     if(val < 0){
+       return ""
+      }
+     if(val == ""){
+       return ""
+      }else {
+      return uParseTime(val, '{y}')
+      }
+    },
+   getTimeOne(val) {
+     if(val < 0){
+       return ""
+      }
+     if(val == ""){
+       return ""
+      }else {
+      return uParseTime(val, '{m}')
+      }
+    },
+    getCount(val){
+      console.log("valr233232323",val)
+      var count = 0
+      for(let i=0;i<val.length;i++){
+        count +=val[i].cnt
+      }
+      if(count >0){
+        return count
+      }else{
+        return ""
+      }
+    },
+    getAllPrice(val){
+      var total_price = 0
+      for(let i=0;i<val.length;i++){
+        total_price +=val[i].cnt * val[i].pric
+      }
+      if(total_price >0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    }
+  },
+  created() {
+
+    let type = this.$store.getters.pagedata.pagestate
+    if(type == ""){
+      this.titleType = "明细"
+    }else{
+      this.titleType = type
+    }
+    const tableHeight = document.body.clientHeight - 290;
+    this.tableHeight = tableHeight;
+    this.start_time = moment(new Date()).add("year", 0).format("YYYY-MM-DD")
+    this.end_time = moment(new Date()).add("year", 0).format("YYYY-MM-DD")
+    this.getPatientList();
+    
+  },
+
+  mounted() {}
+};
+</script>
+
+<style lang="scss" scoped>
+.new-main-contain {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.app-container {
+  height: 100%;
+}
+
+.mainCell {
+  height: 36px;
+  display: flex;
+  align-items: center;
+}
+
+.mainLeft {
+  width: 200px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .el-radio {
+    margin-right: 5px;
+  }
+}
+.mainRight {
+  margin-left: 10px;
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+
+  .cellSpan {
+    min-width: 80px;
+    display: inline-block;
+    margin-right: 10px;
+  }
+}
+.mainCenter {
+  display: flex;
+  flex: 1;
+}
+
+.centerLeft {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+
+  .el-form-item {
+    width: 32%;
+    margin-right: 1%;
+    float: left;
+  }
+
+  .el-form-item__label {
+    text-align: left;
+  }
+}
+.backColor {
+  background: #f6f8f9;
+  height: 5px;
+  margin-bottom: 5px;
+}
+
+.tabsBox {
+  position: relative;
+  height: 76%;
+  overflow-y: auto;
+  margin-bottom: 60px;
+
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+}
+.preTabs {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+  }
+}
+
+.costBox {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+}
+
+.addTab {
+  position: absolute;
+  right: 0;
+  top: 14px;
+  z-index: 20;
+}
+
+.centerRight {
+  width: 300px;
+  margin-left: 10px;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.rightTab {
+  height: 40px;
+  width: 100%;
+  border: 1px solid #d2d2d2;
+  box-sizing: border-box;
+
+  p {
+    width: 50%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #eee;
+    float: left;
+  }
+
+  > p:last-child {
+    border-left: 1px solid #d2d2d2;
+    float: right;
+  }
+
+  .activeP {
+    background: #409eff;
+    color: #fff;
+  }
+}
+.comfirmBox {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.mainHeader {
+  width: 100%;
+  background: #fff;
+  position: fixed;
+  z-index: 100;
+  height: 36px;
+}
+
+.titleBox {
+  position: fixed;
+  z-index: 99;
+  background: #fff;
+}
+
+.fixedCell {
+  position: fixed;
+  z-index: 99;
+  right: 30px;
+  background: #fff;
+  width: 300px;
+  display: flex;
+  justify-content: space-between;
+}
+</style>
+
+<style lang="scss">
+.centerLeft {
+  .el-form-item__label {
+    text-align: left;
+  }
+}
+.tabsBox {
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom
+    .el-tabs--left
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom
+    .el-tabs--right
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--bottom.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:last-child,
+  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:last-child,
+  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+    padding: 0 10px;
+  }
+
+  .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+    padding: 0 10px;
+  }
+}
+.centerRight {
+  .el-tabs__nav-scroll {
+    display: flex;
+  }
+
+  .el-tabs__nav {
+    margin: 0 auto;
+  }
+
+  .el-table th .cell,
+  .el-table td .cell {
+    padding: 0 2px;
+  }
+}
+.preTabs {
+  .el-tabs__content {
+  }
+}
+.rightTabs {
+  height: 100%;
+
+  .el-tabs__content {
+  }
+}
+.centerDialog {
+  .el-dialog__body {
+    max-height: calc(100vh - 100px) !important;
+    padding: 0 20px;
+  }
+}
+</style>

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

@@ -22,7 +22,7 @@
       type="primary"
       >汇总导出
     </el-button>
-   
+
     <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="changeHouseList">
@@ -32,7 +32,7 @@
             :label="option.storehouse_name"
             :value="option.id">
           </el-option>
-      </el-select>  
+      </el-select>
       <el-input
         size="small"
         style="width: 200px;"
@@ -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="tableData"
@@ -122,7 +122,7 @@
           </template>
         </el-table-column>
 
-       
+
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
            <span>{{getTime(scope.row.ctime)}}</span>
@@ -140,7 +140,7 @@
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-           <span v-if="org_id == 9919">{{scope.row.last_price}} </span> 
+           <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
            <span v-else>
              <span v-if="scope.row.price >0"> {{scope.row.price}}</span>
             <span v-if="scope.row.price  == 0"> {{getPrice(scope.row.drug_id)}}</span>
@@ -149,20 +149,20 @@
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            {{scope.row.count}} 
+            {{scope.row.count}}
           </template>
         </el-table-column>
          <el-table-column label="单位" align="center">
           <template slot-scope="scope">
-            {{scope.row.count_unit}} 
+            {{scope.row.count_unit}}
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total !=1">
-              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
-              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
-              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span>
+              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
+              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
               <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
                  {{scope.row.total_price}}
                </span>
@@ -200,7 +200,7 @@ export default {
 
   created() {
     this.org_id = this.$store.getters.xt_user.org.id
-   
+
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -224,19 +224,19 @@ export default {
     var start_time = window.sessionStorage.getItem('start_out_time')
      var end_time =  window.sessionStorage.getItem('end_out_time')
     if(start_time!=null){
-       this.start_time = start_time   
+       this.start_time = start_time
     }
     if(end_time!=null){
-     
+
       this.end_time = end_time
     }
-    
+
     this.getDrugOutOrderPrint()
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.getlist()
     this.getBaseDrugLibList()
- 
+
   },
   data() {
     return {
@@ -327,7 +327,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-       
+
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
         }
@@ -384,7 +384,7 @@ export default {
         }
       });
     },
-   
+
     getTime: function(val) {
       if (val == 0) {
         return "";
@@ -407,7 +407,7 @@ export default {
          page:this.page,
          limit:this.limit,
          storehouse_id:this.storehouse_id,
-      }  
+      }
       getDrugOutDetail(params).then(response=>{
         this.tableData = []
         this.tableList = []
@@ -443,29 +443,29 @@ export default {
                  }
 
                 total_price += order[i].total_price
-                
+
                }
 
                if(order[i].price ==0 ){
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                     order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                  
+
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
-                
+
                 if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
-                     order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) 
+                     order[i].total_price += order[i].count * this.getPrice(order[i].drug_id)
                    }else{
                      order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
                    }
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
                 total_price +=order[i].total_price
-               } 
-               
+               }
+
              }
-            
+
           }
            console.log("toal_p3232332332233232",total_price)
            order.push({
@@ -475,11 +475,11 @@ export default {
             ctime:"",
             total_price:total_price,
           });
-         
+
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
-       
+
           console.log("233223322323322332232323",order)
           this.tableData = order
 
@@ -523,10 +523,10 @@ export default {
                 }
               }
              }
-            
+
           })
           let list = Object.values(objInfo);
-          
+
           for(let i=0;i<order.length;i++){
             list.map(item=>{
               if(order[i].drug_id == item.drug_id){
@@ -534,8 +534,8 @@ export default {
               }
             })
           }
-          
-         
+
+
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].child.length;j++){
               if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
@@ -547,16 +547,16 @@ export default {
            for(let i=0;i<list.length;i++){
               list[i].total_price = list[i].count * list[i].price
             }
-          
-          this.tableList = list 
+
+          this.tableList = list
           var total = response.data.data.total
           this.total = total
-        } 
-      }) 
+        }
+      })
     },
 
    select(){
-       
+
    },
 
     getAdminUser(id){
@@ -570,13 +570,13 @@ export default {
     },
 
      exportList(){
-    
+
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919){
-           
+
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
              this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
@@ -585,11 +585,11 @@ export default {
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price) 
+              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
            }
         }
-  
-       
+
+
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
@@ -600,8 +600,8 @@ export default {
        obj.total_price = obj.total_price.toFixed(2)
        this.tablePrint.push(obj)
        const data = this.formatJson(filterVal, this.tablePrint)
-  
-       
+
+
        excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -610,7 +610,7 @@ export default {
           this.downloadLoading = false
         })
        },
-      
+
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
@@ -641,28 +641,31 @@ export default {
               }else{
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
               }
-              
+
             }else{
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
               if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
               }
-              if(this.tableData[i].count_unit == this.tableData[i].max_unit){
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+              }
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
               }
             }
          }
        }
        const data = this.formatJson(filterVal, this.tableData)
-  
-     
+
+
        excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '药品出库明细'
          })
           this.downloadLoading = false
-      }) 
+      })
     },
 
     getBaseDrugLibList() {
@@ -685,7 +688,7 @@ export default {
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.drugList.push(response.data.data.list[i])
             }
- 
+
           }
         })
       },
@@ -694,7 +697,7 @@ export default {
          start_time:this.start_time,
          end_time:this.end_time,
          order_type:2,
-      }  
+      }
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
@@ -744,7 +747,7 @@ export default {
               }
             })
             }
-           
+
             let newArr = Object.values(objInfo);
             for(let i=0;i<newArr.length;i++){
               for(let j=0;j<list.length;j++){
@@ -754,7 +757,7 @@ export default {
               }
             }
            this.tablePrint = newArr
-          
+
         }
      })
     },
@@ -793,11 +796,11 @@ export default {
           }else{
             arr[i].count = arr[i].count
           }
-        }  
+        }
         for(let j=0;j<arr.length;j++){
           total +=arr[j].count
         }
-        
+
         return (total*min_price).toFixed(2)
       },
 
@@ -809,30 +812,30 @@ export default {
           }else{
             arr[i].count = arr[i].count
           }
-        }  
+        }
         for(let j=0;j<arr.length;j++){
           total +=arr[j].count
         }
-     
+
         return total*min_price
       },
       getCountSix(drug_id,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
         }
         return (count*price).toFixed(2)
       },
       getCountSenvenOne(drug_id,val,price){
-        var count = 0 
+        var count = 0
         for(let i=0;i<val.length;i++){
           count+= val[i].count
         }
@@ -872,7 +875,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.getlist()
-     } 
+     }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -77,6 +77,23 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
+        <div style="margin-left: 10px">
+          <span>审核状态:</span>
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
+            <el-option
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
 
       <div class="cell clearfix">
@@ -469,6 +486,7 @@ export default {
         loading: false,
         warehouseInfoDate: [],
       },
+      check_id: 0,
 
       startTime: "",
       dialogVisible: false,
@@ -484,6 +502,29 @@ export default {
   },
 
   methods: {
+    changeTypeName() {
+      this.getlist();
+    },
+    getlist() {
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableList = list;
+          var total = response.data.data.total;
+          this.total = total;
+          this.houseList = response.data.data.houseList;
+          this.doctorList = response.data.data.doctorList;
+        }
+      });
+    },
     search: function () {
       const Params = {
         page: this.page,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -76,6 +76,23 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
+         <div style="margin-left: 10px">
+          <span>审核状态:</span>
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
+            <el-option
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
 
       <div class="cell clearfix">
@@ -530,6 +547,7 @@ export default {
       ],
       page: 1,
       limit: 5,
+      check_id: 0,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -591,6 +609,30 @@ export default {
     };
   },
   methods: {
+      changeTypeName() {
+      this.getlist();
+    },
+    getlist() {
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableList = list;
+          var total = response.data.data.total;
+          this.total = total;
+          this.houseList = response.data.data.houseList;
+          this.doctorList = response.data.data.doctorList;
+        }
+      });
+    },
+
     search: function () {
       const Params = {
         page: this.page,

src/xt_pages/stock/stockInOrder.vue

@@ -71,6 +71,24 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
+        <div style="margin-left: 10px">
+          <span>审核状态:</span>
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
+            <el-option
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+ 
       </div>
 
 
@@ -811,11 +829,35 @@ export default {
       checkAllStatus:false,
       list:[],
       storehouse_id:0,
+      check_id: 0,
     };
 
 
   },
   methods: {
+          changeTypeName() {
+      this.getlist();
+    },
+    getlist() {
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableList = list;
+          var total = response.data.data.total;
+          this.total = total;
+          this.houseList = response.data.data.houseList;
+          this.doctorList = response.data.data.doctorList;
+        }
+      });
+    },
      changeCheck() {
       this.$refs.multipleTable.clearSelection();
       if (this.checkAllStatus) {

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -48,7 +48,7 @@
                             <tbody>
                                 <tr v-for='(item,index) in it.child' :key="index">
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td style="line-height:18px;">{{ item.license_number }}</td>
+                                    <td style="line-height:18px;">{{item.register_number}} <span v-if="item.license_number !=''">/</span> {{item.license_number}}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
                                     <td style="line-height:18px;">{{ getDeatl(item.dealer) }}</td>
@@ -215,6 +215,7 @@ export default {
                 }
               }
              }
+             
              this.warehousingInfo = warehousing
           
             }

src/xt_pages/stock/testOrderQuery.vue

@@ -1,494 +1,492 @@
-<template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div
-        style="
-          justify-content: space-between;
-          margin: 0px 0 12px 0;
-          display: flex;
-          align-items: center;
-        "
-      >
-        <div>
-          <el-date-picker
-            size="small"
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="startTimeChange"
-          ></el-date-picker
-          >-
-          <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="endTimeChange"
-          ></el-date-picker>
-          <span>审核状态:</span>
-          <el-select
-            v-model="check_id"
-            style="width: 140px; margin-right: 10px"
-            placeholder="请选择"
-            @change="changeTypeName"
-          >
-            <el-option
-              v-for="item in checkList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-          <el-input
-            size="small"
-            style="width: 200px; margin-left: 10px"
-            class="filter-item"
-            v-model.trim="keywords"
-            placeholder="单据编号，仓库名称"
-          />
-          <el-button
-            size="small"
-            class="filter-item"
-            type="primary"
-            icon="el-icon-search"
-            @click="search"
-            >搜索</el-button
-          >
-        </div>
-        <div>
-          <el-button size="small" type="primary" @click="toAdd">新增</el-button>
-        </div>
-      </div>
+// <template>
+//   <div class="main-contain">
+//     <div class="position">
+//       <bread-crumb :crumbs="crumbs"></bread-crumb>
+//     </div>
+//     <div class="app-container">
+//       <div
+//         style="
+//           justify-content: space-between;
+//           margin: 0px 0 12px 0;
+//           display: flex;
+//           align-items: center;
+//         "
+//       >
+//         <div>
+//           <el-date-picker
+//             size="small"
+//             v-model="start_time"
+//             prefix-icon="el-icon-date"
+//             :editable="false"
+//             style="width: 196px"
+//             type="date"
+//             placeholder="选择日期时间"
+//             align="right"
+//             format="yyyy-MM-dd"
+//             value-format="yyyy-MM-dd"
+//             @change="startTimeChange"
+//           ></el-date-picker
+//           >-
+//           <el-date-picker
+//             size="small"
+//             v-model="end_time"
+//             prefix-icon="el-icon-date"
+//             :editable="false"
+//             style="width: 196px"
+//             type="date"
+//             placeholder="选择日期时间"
+//             align="right"
+//             format="yyyy-MM-dd"
+//             value-format="yyyy-MM-dd"
+//             @change="endTimeChange"
+//           ></el-date-picker>
+//           <span>审核状态:</span>
+//           <el-select
+//             v-model="check_id"
+//             style="width: 140px; margin-right: 10px"
+//             placeholder="请选择"
+//             @change="changeTypeName"
+//           >
+//             <el-option
+//               v-for="item in checkList"
+//               :key="item.id"
+//               :label="item.name"
+//               :value="item.id"
+//             >
+//             </el-option>
+//           </el-select>
+//           <el-input
+//             size="small"
+//             style="width: 200px; margin-left: 10px"
+//             class="filter-item"
+//             v-model.trim="keywords"
+//             placeholder="单据编号，仓库名称"
+//           />
+//           <el-button
+//             size="small"
+//             class="filter-item"
+//             type="primary"
+//             icon="el-icon-search"
+//             @click="search"
+//             >搜索</el-button
+//           >
+//         </div>
+//         <div>
+//           <el-button size="small" type="primary" @click="toAdd">新增</el-button>
+//         </div>
+//       </div>
 
-      <el-table
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266',
-        }"
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        border
-      >
-        <el-table-column label="单据编号" align="center">
-          <template slot-scope="scope">
-            {{scope.row.second_order_number}}
-          </template>
-        </el-table-column>
-        <el-table-column label="单据日期" align="center">
-          <template slot-scope="scope">
-            {{getTime(scope.row.record_date)}}
-          </template>
-        </el-table-column>
+//       <el-table
+//         :row-style="{ color: '#303133' }"
+//         :header-cell-style="{
+//           backgroundColor: 'rgb(245, 247, 250)',
+//           color: '#606266',
+//         }"
+//         :data="tableList"
+//         :class="signAndWeighBoxPatients"
+//         border
+//       >
+//         <el-table-column label="单据编号" align="center">
+//           <template slot-scope="scope">
+//             {{scope.row.second_order_number}}
+//           </template>
+//         </el-table-column>
+//         <el-table-column label="单据日期" align="center">
+//           <template slot-scope="scope">
+//             {{getTime(scope.row.record_date)}}
+//           </template>
+//         </el-table-column>
        
-        <el-table-column label="调出仓库" align="center" width="150">
-          <template slot-scope="scope">
-            {{getHouseName(scope.row.storehouse_out_id)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="调入仓库" align="center">
-          <template slot-scope="scope">
-            {{getHouseName(scope.row.storehouse_in_id)}}
-          </template>
-        </el-table-column>
+//         <el-table-column label="调出仓库" align="center" width="150">
+//           <template slot-scope="scope">
+//             {{getHouseName(scope.row.storehouse_out_id)}}
+//           </template>
+//         </el-table-column>
+//         <el-table-column label="调入仓库" align="center">
+//           <template slot-scope="scope">
+//             {{getHouseName(scope.row.storehouse_in_id)}}
+//           </template>
+//         </el-table-column>
 
-        <el-table-column label="制单人" align="center">
-          <template slot-scope="scope">
-            {{getDocName(scope.row.creater)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="审核人" align="center">
-          <template slot-scope="scope">
-           {{getDocName(scope.row.checker)}}
-          </template>
-        </el-table-column>
+//         <el-table-column label="制单人" align="center">
+//           <template slot-scope="scope">
+//             {{getDocName(scope.row.creater)}}
+//           </template>
+//         </el-table-column>
+//         <el-table-column label="审核人" align="center">
+//           <template slot-scope="scope">
+//            {{getDocName(scope.row.checker)}}
+//           </template>
+//         </el-table-column>
 
-        <el-table-column label="审核时间" align="center">
-          <template slot-scope="scope">
-          {{getTime(scope.row.checker)}}
-          </template>
-        </el-table-column>
+//         <el-table-column label="审核时间" align="center">
+//           <template slot-scope="scope">
+//           {{getTime(scope.row.checker)}}
+//           </template>
+//         </el-table-column>
 
     
-        <el-table-column label="操作" align="center" width="300px">
-          <template slot-scope="scope">
-            <el-button
-              icon="el-icon-edit-outline"
-              size="small"
-              type="primary"
-              @click="toClick(scope.row.id)"
-              >编辑
-            </el-button>
-             <el-button
-              icon="el-icon-edit-outline"
-              size="small"
-              type="primary"
-              @click="toDetail(scope.row.id)"
-              >详情
-            </el-button>
-            <el-button
-              icon="el-icon-delete"
-              size="small"
-              type="danger"
-              @click="toDelete(scope.row, scope.$index)"
-              >删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100, 200, 500, 1000]"
-        :page-size="10"
-        background
-        align="right"
-        style="margin-top: 20px"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
+//         <el-table-column label="操作" align="center" width="300px">
+//           <template slot-scope="scope">
+//             <el-button
+//               icon="el-icon-edit-outline"
+//               size="small"
+//               type="primary"
+//               @click="toClick(scope.row.id)"
+//               >编辑
+//             </el-button>
+//              <el-button
+//               icon="el-icon-edit-outline"
+//               size="small"
+//               type="primary"
+//               @click="toDetail(scope.row.id)"
+//               >详情
+//             </el-button>
+//             <el-button
+//               icon="el-icon-delete"
+//               size="small"
+//               type="danger"
+//               @click="toDelete(scope.row, scope.$index)"
+//               >删除
+//             </el-button>
+//           </template>
+//         </el-table-column>
+//       </el-table>
+//       <el-pagination
+//         @size-change="handleSizeChange"
+//         @current-change="handleCurrentChange"
+//         :page-sizes="[10, 50, 100, 200, 500, 1000]"
+//         :page-size="10"
+//         background
+//         align="right"
+//         style="margin-top: 20px"
+//         layout="total, sizes, prev, pager, next, jumper"
+//         :total="total"
+//       >
+//       </el-pagination>
+//     </div>
+//   </div>
+// </template>
 
-<script>
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
+// <script>
+// import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {
-  getAllSecondOrderList
-} from "@/api/seconde";
-import { uParseTime } from "@/utils/tools";
-export default {
-  name: "stockIn",
-  components: {},
-  components: {
-    BreadCrumb,
-  },
-  data() {
-    return {
-      isActive: false,
-      Color_txt: true,
-      crumbs: [
-        { path: false, name: "采购管理" },
-        { path: "/supply/query", name: "采购订单" },
-      ],
-      keywords: "",
-      total: 0,
-      multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
-      end_time: "",
-      page: 1,
-      limit: 10,
-      goodType: [],
-      goodInfo: [],
-      org_id: 0,
-      types: [],
-      tableList: [{}],
-      type_name: "",
-      checkList: [
-        { id: 0, name: "请选择" },
-        { id: 1, name: "已审核" },
-        { id: 2, name: "未审核" },
-      ],
-      supplyList: [],
-      check_id: 0,
-      doctorList: [],
-      houseList:[],
-    };
-  },
-  methods: {
-    toAdd() {
-      this.$router.push({ path: "/purchase/order/add" });
-    },
-    changeTypeName() {
-      this.getlist();
-    },
-    startTimeChange() {
-      this.getlist();
-    },
-    endTimeChange() {
-      this.getlist();
-    },
-    search() {
-      this.getlist();
-    },
-    handleSizeChange(val) {
-      this.limit = val;
-      this.getlist();
-    },
-    handleCurrentChange(val) {
-      this.page = val;
-      this.getlist();
-    },
-    getTimes(time) {
-      if (time === "") {
-        return "";
-      }
-      return uParseTime(time, "{y}-{m}-{d}");
-    },
-    getlist() {
-      var params = {
-        check_id: this.check_id,
-        start_time: this.start_time,
-        end_time: this.end_time,
-        keyword: this.keywords,
-        page: this.page,
-        limit: this.limit,
-      };
-      console.log("params2332232332", params);
-      getAllSecondOrderList(params).then((response) => {
-        if (response.data.state == 1) {
-          var list = response.data.data.list;
-          console.log("list2323322332323232232323",list)
-          this.tableList = list;
-          var total = response.data.data.total;
-          this.total = total;
-          this.houseList = response.data.data.houseList
-          this.doctorList = response.data.data.doctorList
-        }
-      });
-    },
-    getName(id) {
-      var name = "";
-      for (let i = 0; i < this.supplyList.length; i++) {
-        if (id == this.supplyList[i].id) {
-          name = this.supplyList[i].supplier_name;
-        }
-      }
-      return name;
-    },
-    getDocName(id) {
-      var user_name = "";
-      for (let i = 0; i < this.doctorList.length; i++) {
-        if (id == this.doctorList[i].admin_user_id) {
-          user_name = this.doctorList[i].user_name;
-        }
-      }
-      return user_name;
-    },
-    getAllBuyPrice(arr) {
-      var buy_price = 0;
-      if (arr != undefined && arr.length > 0) {
-        for (let i = 0; i < arr.length; i++) {
-          buy_price += arr[i].count * arr[i].price;
-        }
-      }
-      return buy_price.toFixed(2);
-    },
-    getAllCount(arr) {
-      var count = 0;
-      if (arr != undefined && arr.length > 0) {
-        for (let i = 0; i < arr.length; i++) {
-          count += parseInt(arr[i].count);
-        }
-      }
-      if (count == 0) {
-        return "";
-      }
-      if (count > 0) {
-        return count;
-      }
-    },
-    toClick(id) {
-      window.sessionStorage.setItem('purchase_start_time',this.start_time)
-      window.sessionStorage.setItem('purchase_end_time',this.end_time)
-      this.$router.push({ path: "/stock/in/test/edit?id=" + id });
-    },
-    toDetail(id){
-      this.$router.push({ path: "/stock/in/test/detail?id=" + id });
-    },
-    toDelete(val, index) {
-      if (val.is_check == 1) {
-        this.$message.error("已审核单据，不能删除!");
-        return false;
-      }
-      if (val.orderOut.length > 0) {
-        this.$message.error("已关联单据，不能删除!");
-        return false;
-      }
-      this.$confirm("确认删除吗?", "删除", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
-      }) .then(() => {
-          deletePurchaseOrder(val.id).then((response) => {
-            if (response.data.state == 1) {
-              var msg = response.data.data.msg;
-              this.tableList.splice(index, 1);
-              this.getlist()
-              this.$message.success("删除成功");
-            } else {
-              this.$message.error("删除失败");
-            }
-          });
-        }).catch(() => {});
-    },
-    // 动态改变表格样式
-    Color_Change() {
-      this.Color_txt = true;
-      console.log(this.Color_txt, "op");
-    },
+// import {
+//   getAllSecondOrderList
+// } from "@/api/seconde";
+// import { uParseTime } from "@/utils/tools";
+// export default {
+//   name: "stockIn",
+//   components: {},
+//   components: {
+//     BreadCrumb,
+//   },
+//   data() {
+//     return {
+//       isActive: false,
+//       Color_txt: true,
+//       crumbs: [
+//         { path: false, name: "采购管理" },
+//         { path: "/supply/query", name: "采购订单" },
+//       ],
+//       keywords: "",
+//       total: 0,
+//       multipleSelection: [],
+//       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+//       start_time: "",
+//       end_time: "",
+//       page: 1,
+//       limit: 10,
+//       goodType: [],
+//       goodInfo: [],
+//       org_id: 0,
+//       types: [],
+//       tableList: [{}],
+//       type_name: "",
+//       checkList: [
+//         { id: 0, name: "请选择" },
+//         { id: 1, name: "已审核" },
+//         { id: 2, name: "未审核" },
+//       ],
+//       supplyList: [],
+//       check_id: 0,
+//       doctorList: [],
+//       houseList:[],
+//     };
+//   },
+//   methods: {
+//     toAdd() {
+//       this.$router.push({ path: "/purchase/order/add" });
+//     },
+//     changeTypeName() {
+//       this.getlist();
+//     },
+//     startTimeChange() {
+//       this.getlist();
+//     },
+//     endTimeChange() {
+//       this.getlist();
+//     },
+//     search() {
+//       this.getlist();
+//     },
+//     handleSizeChange(val) {
+//       this.limit = val;
+//       this.getlist();
+//     },
+//     handleCurrentChange(val) {
+//       this.page = val;
+//       this.getlist();
+//     },
+//     getTimes(time) {
+//       if (time === "") {
+//         return "";
+//       }
+//       return uParseTime(time, "{y}-{m}-{d}");
+//     },
+//     getlist() {
+//       var params = {
+//         check_id: this.check_id,
+//         start_time: this.start_time,
+//         end_time: this.end_time,
+//         keyword: this.keywords,
+//         page: this.page,
+//         limit: this.limit,
+//       };
+//       getAllSecondOrderList(params).then((response) => {
+//         if (response.data.state == 1) {
+//           var list = response.data.data.list;
+//           this.tableList = list;
+//           var total = response.data.data.total;
+//           this.total = total;
+//           this.houseList = response.data.data.houseList
+//           this.doctorList = response.data.data.doctorList
+//         }
+//       });
+//     },
+//     getName(id) {
+//       var name = "";
+//       for (let i = 0; i < this.supplyList.length; i++) {
+//         if (id == this.supplyList[i].id) {
+//           name = this.supplyList[i].supplier_name;
+//         }
+//       }
+//       return name;
+//     },
+//     getDocName(id) {
+//       var user_name = "";
+//       for (let i = 0; i < this.doctorList.length; i++) {
+//         if (id == this.doctorList[i].admin_user_id) {
+//           user_name = this.doctorList[i].user_name;
+//         }
+//       }
+//       return user_name;
+//     },
+//     getAllBuyPrice(arr) {
+//       var buy_price = 0;
+//       if (arr != undefined && arr.length > 0) {
+//         for (let i = 0; i < arr.length; i++) {
+//           buy_price += arr[i].count * arr[i].price;
+//         }
+//       }
+//       return buy_price.toFixed(2);
+//     },
+//     getAllCount(arr) {
+//       var count = 0;
+//       if (arr != undefined && arr.length > 0) {
+//         for (let i = 0; i < arr.length; i++) {
+//           count += parseInt(arr[i].count);
+//         }
+//       }
+//       if (count == 0) {
+//         return "";
+//       }
+//       if (count > 0) {
+//         return count;
+//       }
+//     },
+//     toClick(id) {
+//       window.sessionStorage.setItem('purchase_start_time',this.start_time)
+//       window.sessionStorage.setItem('purchase_end_time',this.end_time)
+//       this.$router.push({ path: "/stock/in/test/edit?id=" + id });
+//     },
+//     toDetail(id){
+//       this.$router.push({ path: "/stock/in/test/detail?id=" + id });
+//     },
+//     toDelete(val, index) {
+//       if (val.is_check == 1) {
+//         this.$message.error("已审核单据，不能删除!");
+//         return false;
+//       }
+//       if (val.orderOut.length > 0) {
+//         this.$message.error("已关联单据，不能删除!");
+//         return false;
+//       }
+//       this.$confirm("确认删除吗?", "删除", {
+//         confirmButtonText: "确 定",
+//         cancelButtonText: "取 消",
+//         type: "warning",
+//       }) .then(() => {
+//           deletePurchaseOrder(val.id).then((response) => {
+//             if (response.data.state == 1) {
+//               var msg = response.data.data.msg;
+//               this.tableList.splice(index, 1);
+//               this.getlist()
+//               this.$message.success("删除成功");
+//             } else {
+//               this.$message.error("删除失败");
+//             }
+//           });
+//         }).catch(() => {});
+//     },
+//     // 动态改变表格样式
+//     Color_Change() {
+//       this.Color_txt = true;
+//       console.log(this.Color_txt, "op");
+//     },
 
-    Color_Changeleave() {
-      this.Color_txt = false;
-      console.log(this.Color_txt, "false");
-    },
-    getTime(time) {
-      if (time === '') {
-      return ''
-      }
-      return uParseTime(time, '{y}-{m}-{d}')
-     },
-    getHouseName(id){
-      var storehouse_name = ""
-      for(let i=0;i<this.houseList.length;i++){
-         if(id == this.houseList[i].id){
-           storehouse_name = this.houseList[i].storehouse_name
-         }
-      }
-      return storehouse_name
-    },
-   getDocName(id){
-      var user_name = ""
-      for(let i=0;i<this.doctorList.length;i++){
-        if(id == this.doctorList[i].admin_user_id){
-          user_name = this.doctorList[i].user_name
-        }
-      }
-      return user_name
-     },
-  },
-  created() {
+//     Color_Changeleave() {
+//       this.Color_txt = false;
+//       console.log(this.Color_txt, "false");
+//     },
+//     getTime(time) {
+//       if (time === '') {
+//       return ''
+//       }
+//       return uParseTime(time, '{y}-{m}-{d}')
+//      },
+//     getHouseName(id){
+//       var storehouse_name = ""
+//       for(let i=0;i<this.houseList.length;i++){
+//          if(id == this.houseList[i].id){
+//            storehouse_name = this.houseList[i].storehouse_name
+//          }
+//       }
+//       return storehouse_name
+//     },
+//    getDocName(id){
+//       var user_name = ""
+//       for(let i=0;i<this.doctorList.length;i++){
+//         if(id == this.doctorList[i].admin_user_id){
+//           user_name = this.doctorList[i].user_name
+//         }
+//       }
+//       return user_name
+//      },
+//   },
+//   created() {
  
-    var now = new Date(); //当前日期
-    var nowMonth = now.getMonth(); //当前月
-    var nowYear = now.getFullYear(); //当前年
-    //本月的开始时间
-    var monthStartDate = new Date(nowYear, nowMonth, 1);
-    this.start_time = this.getTimes(monthStartDate);
-    this.end_time = this.getTimes(new Date());
+//     var now = new Date(); //当前日期
+//     var nowMonth = now.getMonth(); //当前月
+//     var nowYear = now.getFullYear(); //当前年
+//     //本月的开始时间
+//     var monthStartDate = new Date(nowYear, nowMonth, 1);
+//     this.start_time = this.getTimes(monthStartDate);
+//     this.end_time = this.getTimes(new Date());
 
-    this.org_id = this.$store.getters.xt_user.org_id;
-    var start_time =  window.sessionStorage.getItem('purchase_start_time')
+//     this.org_id = this.$store.getters.xt_user.org_id;
+//     var start_time =  window.sessionStorage.getItem('purchase_start_time')
     
-    var end_time =  window.sessionStorage.getItem('purchase_end_time')
+//     var end_time =  window.sessionStorage.getItem('purchase_end_time')
    
-    if(start_time !=null){
-      this.start_time = ""
-      this.start_time = start_time
-    }
-    if(end_time!=null){
-      this.end_time = ""
-      this.end_time = end_time
-    }
-    window.sessionStorage.removeItem('purchase_start_time')
-    window.sessionStorage.removeItem('purchase_end_time')
+//     if(start_time !=null){
+//       this.start_time = ""
+//       this.start_time = start_time
+//     }
+//     if(end_time!=null){
+//       this.end_time = ""
+//       this.end_time = end_time
+//     }
+//     window.sessionStorage.removeItem('purchase_start_time')
+//     window.sessionStorage.removeItem('purchase_end_time')
    
 
-    this.getlist();
+//     this.getlist();
    
-  },
-};
-</script>
-<style lang="scss">
-.cluster-rs {
-  text-align: center;
-}
-.annotation-rs {
-  width: 100%;
-  height: 100%;
-  border: none;
-  td {
-    width: 155px;
-    padding: 5px;
-    border-right: none;
-    text-align: center;
-    vertical-align: middle;
-  }
-}
-tr:last-child {
-  td {
-    border-bottom: none;
-  }
-}
-</style>
+//   },
+// };
+// </script>
+// <style lang="scss" scoped>
+// .cluster-rs {
+//   text-align: center;
+// }
+// .annotation-rs {
+//   width: 100%;
+//   height: 100%;
+//   border: none;
+//   td {
+//     width: 155px;
+//     padding: 5px;
+//     border-right: none;
+//     text-align: center;
+//     vertical-align: middle;
+//   }
+// }
+// tr:last-child {
+//   td {
+//     border-bottom: none;
+//   }
+// }
+// </style>
 
-<style rel="stylesheet/css" lang="scss" scoped>
-.information {
-  border: 1px #dcdfe6 solid;
-  padding: 30px 20px 30px 20px;
+// <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;
-  }
-}
+//   .border {
+//     border-bottom: 1px #dcdfe6 solid;
+//     margin: 0px 0 20px 0;
+//   }
+// }
 
-.title {
-  background: #409eff;
-  height: 44px;
-  line-height: 44px;
-  padding: 0 0 0 10px;
-  color: #fff;
-  margin: 0 0 10px 0;
-}
+// .title {
+//   background: #409eff;
+//   height: 44px;
+//   line-height: 44px;
+//   padding: 0 0 0 10px;
+//   color: #fff;
+//   margin: 0 0 10px 0;
+// }
 
-.edit_separater {
-  border-top: 1px solid rgb(233, 233, 233);
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-/deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-</style>
+// .edit_separater {
+//   border-top: 1px solid rgb(233, 233, 233);
+//   margin-top: 15px;
+//   margin-bottom: 15px;
+// }
+// /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+//   width: 10px;
+//   height: 10px;
+// }
+// </style>
 
-<style>
-.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-  font-size: 12px;
-}
+// <style scoped>
+// .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;
-}
+// .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;
-}
+// .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;
+// }
 
-.color {
-  background: none !important;
-  display: flex;
-  flex-direction: column;
-}
-</style>
+// .color {
+//   background: none !important;
+//   display: flex;
+//   flex-direction: column;
+// }
+// </style>