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

src/xt_pages/hospitalStation/summary.vue

@@ -477,6 +477,7 @@ export default {
         { value: 2, label: "自费" },
       ],
       shouJuVisible: false,
+      org_id:0,
     };
   },
 
@@ -1320,15 +1321,27 @@ export default {
       return uParseTime(time, "{y}-{m}-{d}");
     },
     toDetail(row) {
-      this.$router.push(
-        // "/outpatientCharges/summaryDetail?patient_id=" +
-          "/hospitalCharges/summaryDetail?patient_id=" +
+      // if(this.org_id ==10265 || this.org_id ==0){
+        this.$router.push(
+          "/outpatientCharges/summaryDetail?patient_id=" +
           row.patient.id +
           "&number=" +
           row.number +
           "&id=" +
           row.id
-      );
+        );
+      // }else{
+      //   this.$router.push(
+      //   // "/outpatientCharges/summaryDetail?patient_id=" +
+      //     "/hospitalCharges/summaryDetail?patient_id=" +
+      //     row.patient.id +
+      //     "&number=" +
+      //     row.number +
+      //     "&id=" +
+      //     row.id
+      //   );
+      // }
+      
     },
     getTime(value, temp) {
       if (value != undefined) {
@@ -1412,6 +1425,7 @@ export default {
     },
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id,
     this.fetchAllAdminUsers();
     this.getDoctorList();
     this.getHisOrderList();

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -16,8 +16,8 @@
       <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644 && org_id !=0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
-      <printthree  v-if="org_id == 10489" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
-      <printFour v-if="org_id == 10644 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
+      <printthree  v-if="org_id == 10489 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
+      <printFour v-if="org_id == 10644 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
       <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>

src/xt_pages/outpatientCharges/batchStatementPrint.vue

@@ -134,13 +134,91 @@ export default {
           const style12 =
             "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 89%;}}}";
 
+          // if (this.num >= 13) {
             printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style,
-              scanStyles: false,
-            });
-
+              printable: 'prescription-print',
+              type: 'html',
+              style: style9,
+              scanStyles: false
+            })
+          // } else if (this.num == 12) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style2,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 11) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style3,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 10) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style4,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 9) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style5,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 8) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style6,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 7) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style7,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 6) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style8,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 5) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style9,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 4) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style10,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num == 3) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style11,
+          //     scanStyles: false
+          //   })
+          // } else if (this.num <= 2) {
+          //   printJS({
+          //     printable: 'prescription-print',
+          //     type: 'html',
+          //     style: style12,
+          //     scanStyles: false
+          //   })
+          // }
 
         }, 500);
       } else if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {

src/xt_pages/outpatientCharges/listPrint.vue

@@ -15,7 +15,7 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       
-      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191"
+      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191 "
         :list="list" :patient="patient" :order="order" :admin="admin">
       </listPrintforu>
       <printOne v-if="org_id == 10191" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
@@ -23,7 +23,7 @@
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
      <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
-      <print-two10265  v-if="org_id == 10265" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -379,13 +379,15 @@
       set10265NewData(details) {
         let drug_ids = []
         let project_ids = []
-
+        console.log('details12121212',details);
+        
         for (let i = 0; i < details.length; i++) {
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
             let obj = {
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
               lv: details[i].chrgitm_lv,
+              selfpay_prop:details[i].selfpay_prop
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
@@ -393,7 +395,7 @@
               id: details[i].project.project_id,
               price: details[i].project.price,
               lv: details[i].chrgitm_lv,
-
+              selfpay_prop:details[i].selfpay_prop
             }
             project_ids.push(obj)
 
@@ -402,18 +404,17 @@
         }
         //
         // console.log('old ids')
-        // console.log(drug_ids)
-        // console.log(project_ids)
+        console.log('drug_ids',drug_ids)
+        console.log('project_ids',project_ids)
         // console.log('old ids')
-
         let new_drug_ids = this.unique10265(drug_ids)
         let new_project_ids = this.unique10265(project_ids)
         let list = []
 
-        console.log('ids')
-        console.log(new_drug_ids)
-        console.log(new_project_ids)
-        console.log('ids')
+        // console.log('ids')
+        console.log('new_drug_ids',new_drug_ids)
+        console.log('new_project_ids',new_project_ids)
+        // console.log('ids')
 
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
@@ -429,6 +430,7 @@
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
+                obj['selfpay_prop'] = details[a].selfpay_prop
                 count = count + details[a].cnt
               }
             }
@@ -459,7 +461,7 @@
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
-
+                obj['selfpay_prop'] = details[a].selfpay_prop
                 count = count + details[a].cnt
               }
             }

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -7,7 +7,7 @@
             <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
             <div>身份证号：{{patient.id_card_no}}</div>
             <div>年龄：{{patient.age}}  岁</div>
-            <div>开方日期：{{getTimes(order.settle_accounts_date) }}</div>
+            <div v-if="org_id!=10489">开方日期：{{getTimes(order.settle_accounts_date) }}</div>
         </div>
         <div class="listInfo">
             <div>结算类型：{{order.is_medicine_insurance == 1 ? "医保" : "自费"}}</div>
@@ -24,9 +24,10 @@
         
         <table class="listTable" style="text-align: center;">
             <tr style="border-bottom: 1px solid black;">
-              <td style="width:25%">医保编码</td>
-              <td style="width:25%">项目名称</td>
-              <td style="width:15%">规格</td>
+              <td style="width:12%" v-if="org_id==10489">开方日期</td>
+              <td style="width:20%">医保编码</td>
+              <td style="width:20%">项目名称</td>
+              <td style="width:13%">规格</td>
               <td style="width:5%">数量</td>
               <td style="width:5%">单位</td>
               <td style="width:8%">单价(元)</td>
@@ -34,12 +35,10 @@
               <td style="width:8%">自付比例</td>
             </tr>
             <tr v-for="(item,index) in list" style="line-height: 30px;">
-                <!-- <template v-if="index == (list.length)-1">
-                    <tr style="border-bottom: 1px solid black;"></tr>
-                </template> -->
-                <td style="width:25%">{{item.code}}</td>
-                <td style="width:25%">{{item.name}}</td>
-                <td style="width:15%">{{item.spec}}</td>
+                <td style="width:12%" v-if="org_id==10489">{{getTimes(order.settle_accounts_date) }}</td>
+                <td style="width:20%">{{item.code}}</td>
+                <td style="width:20%">{{item.name}}</td>
+                <td style="width:13%">{{item.spec}}</td>
                 <td style="width:5%" >
                   <span v-if="item.code!=undefined">{{item.count}}</span>
                 </td>

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -58,6 +58,7 @@
                   <TD width="80">单价(元)</TD>
                   <TD width="80">数量</TD>
                   <TD width="80">金额(元)</TD>
+                  <td width="80">自负比例</td>
                 </TR>
                 <TR v-for="subItem in item.details" :key="subItem">
                   <TD style="white-space: nowrap">{{
@@ -75,6 +76,10 @@
                   <TD>{{
                     (subItem.price * subItem.count).toFixed(2)
                   }}</TD>
+                  <td>
+                    {{(subItem.selfpay_prop)*100}}
+                    <span v-if="subItem.selfpay_prop !=''">%</span>
+                  </td>
                 </TR>
                 <TR>
                   <TD style="white-space: nowrap"

src/xt_pages/outpatientCharges/statementTemplate/batchPrint.vue

@@ -2,7 +2,7 @@
   <div>
     <div id='prescription-print'>
         <div  class="prescription-print"
-            style="position: relative;  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; page-break-after:always"
+            style="position: relative;   page-break-after:always"
             v-for="(infos,index) in info" :key="index">
           <img style="width:100%;height:80px"
             v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10342 || $store.getters.xt_user.org_id == 10341"

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintThree.vue

@@ -91,13 +91,9 @@
 
           <div class="infoTitle">
             <div>
-              姓名：{{
-                i.name
-                  ? i.name.indexOf("（") > -1
-                  ?i.name.substring(
-                    0,
-                    i.name.indexOf("（")
-                  )
+              姓名：
+              {{ i.name ? i.name.indexOf("（") > -1
+                 ?i.name.substring(0, i.name.indexOf("（"))
                   : i.name
                   : ""
               }}
@@ -197,9 +193,10 @@
           <div style="display: flex">
             <div>
               医&nbsp;&nbsp;&nbsp;&nbsp;师：
+              
               <span
                 style="width: 100px; display: inline-block"
-                v-if="i.info.creator == 0"
+                v-if="setAdminUserES(i.info.creator)==''"
               >
                {{ i.info.doctor ? i.info.doctor : "" }}
               </span>
@@ -208,7 +205,7 @@
                 :src="setAdminUserES(i.info.creator)"
                 alt=""
                 srcset=""
-                v-else
+                 v-if="setAdminUserES(i.info.creator)!=''"
               />
             </div>
             <!-- <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}</div> -->
@@ -320,12 +317,13 @@ export default {
     // 电子签名
     setAdminUserES(id) {
       console.log(id)
-      console.log(this.operatorMaps)
+      console.log('this.operatorMaps',this.operatorMaps)
 
       if (id == 0) {
         return "";
       }
       if (id in this.operatorMaps) {
+        console.log('this.operatorMaps[id].url',this.operatorMaps[id].url);
         return this.operatorMaps[id].url;
       } else {
         return "";

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/treatBatchPrint.vue

@@ -186,7 +186,7 @@
           医    师：
           <span
             style="width: 100px; display: inline-block"
-            v-if="i.info.creator == 0"
+            v-if="setAdminUserES(item.creator) == ''"
           >
             {{ i.info.doctor ? i.info.doctor : "" }}
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -155,14 +155,17 @@
                                             <template slot-scope="scope">{{ scope.row.zuobiao_stock_num }}</template>
                                           </el-table-column>
 
-
                                           <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
                                             <template slot-scope="scope">
                                               <span>{{scope.row.drug_spec}}</span>
                                             </template>
                                           </el-table-column>
-                                            <el-table-column label="单价" width="40">
+                                          <el-table-column label="单价" width="40">
                                                 <template slot-scope="scope">{{ scope.row.retail_price }}</template>
+                                           </el-table-column>
+
+                                            <el-table-column label="库存" width="60" v-if="org_id != 10206" >
+                                              <template slot-scope="scope">{{ getSumCount(scope.row.sum_count,scope.row.min_number,scope.row.min_unit,scope.row.max_unit)}}</template>
                                             </el-table-column>
                                         </el-table>
                                     </div>
@@ -216,6 +219,8 @@
                                                 <template slot-scope="scope">{{ scope.row.type == 3?scope.row.zuobiao_stock_num :""}}</template>
                                               </el-table-column>
 
+                                           
+
 
                                                 <el-table-column label="规格" width="60">
                                                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
@@ -223,6 +228,13 @@
                                                 <el-table-column label="单价" width="40">
                                                     <template slot-scope="scope">{{ scope.row.price }}</template>
                                                 </el-table-column>
+                                               
+                                                <el-table-column label="库存" width="60" v-if="org_id != 10206" >
+                                                <template slot-scope="scope">
+                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span> 
+                                                </template>
+                                              </el-table-column>
+                                                
                                             </el-table>
                                         </div>
                                     </el-tab-pane>
@@ -818,6 +830,7 @@
             return false
           } else {
             this.drugs = response.data.data.drugs
+            console.log("drugs------------------------",this.drugs)
             if (this.org_id == 10206) {
               for (let i = 0; i < this.zuobiao_drug.length; i++) {
                 for (let b = 0; b < this.drugs.length; b++) {
@@ -2185,6 +2198,7 @@
         getHisProject().then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
+            
             for (let i = 0; i < project.length; i++) {
               let obj = {
                 id: project[i].id,
@@ -2204,7 +2218,7 @@
                 number: "",
                 bbx01:project[i].bbx01,
                 bby01:project[i].bby01,
-
+                sum_count:""
 
               }
 
@@ -2212,7 +2226,7 @@
             }
 
             var good_info = response.data.data.good_info
-
+            console.log("good_info000000000000000000000",good_info)
             for (let i = 0; i < good_info.length; i++) {
               let obj = {
                 id: good_info[i].id,
@@ -2232,7 +2246,7 @@
                 number: good_info[i].good_number,
                 bbx01:good_info[i].bbx01,
                 bby01:good_info[i].bby01,
-
+                sum_count:good_info[i].sum_count
 
               }
               this.tabProject.push(obj)
@@ -2561,6 +2575,31 @@
 
           }
         })
+      },
+      getSumCount(total,min_number,min_unit,max_unit){
+          var min_str  =""
+          var max_str = ""
+          if (total < min_number) {
+              min_str = total + min_unit;
+          }
+          if (total == 0) {
+              min_str = "";
+              max_str = "";
+          }
+          if (total >= min_number) {
+              if (parseInt(total / min_number) != 0) {
+              max_str = parseInt(total / min_number) + max_unit;
+              }
+              if (total % min_number != 0) {
+              min_str = (total % min_number) + min_unit;
+              }
+          }
+         
+          if(max_str == "" && min_str == ""){
+              return "0"
+          }else{
+          return max_str + min_str
+          }
       }
     }, created() {
       for(let key in this.$store.getters.treatment_mode){

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -60,7 +60,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
@@ -74,8 +73,16 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
+
 
     </div>
 
@@ -526,6 +533,9 @@ export default {
         this.GetCancelStock();
       }
     },
+    getAllQuery(){
+      this.GetCancelStock();
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/detail/stockInDetail.vue

@@ -63,7 +63,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
           
         ></el-date-picker>
         <span class="cellLine"> - </span>
@@ -78,9 +77,15 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
-
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="getAllQuery"
+          >查询</el-button
+        >
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
@@ -496,6 +501,9 @@ export default {
         this.GetCancelStock();
       }
     },
+    getAllQuery(){
+      this.GetCancelStock();
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -71,7 +71,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
@@ -85,9 +84,17 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
 
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
+
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
@@ -521,6 +528,9 @@ export default {
       this.GetCancelStock();
       // this.getPrintStockGood()
     },
+    getAllQuery(){
+      this.GetCancelStock();
+    },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
       if (time > 0) {

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

@@ -51,7 +51,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
@@ -65,8 +64,15 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
       </div>
     </div>
 
@@ -322,6 +328,9 @@ export default {
         this.getlist()
       }
     },
+    getAllQuery(){
+      this.getlist()
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

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

@@ -61,7 +61,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
          
         ></el-date-picker>
         <span class="cellLine"> - </span>
@@ -76,8 +75,15 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
     </div>
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
@@ -329,6 +335,10 @@ export default {
         this.getDrugWarehouseInfoPrint()
       }
     },
+    getAllQuery(){
+      this.getlist()
+      this.getDrugWarehouseInfoPrint()
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

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

@@ -77,7 +77,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="startTimeChange"
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
@@ -91,8 +90,15 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          @change="endTimeChange"
         ></el-date-picker>
+        <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="getAllQuery"
+        >查询</el-button
+      >
 
     </div>
 
@@ -395,6 +401,10 @@ export default {
         this.getDrugOutOrderPrint()
       }
     },
+    getAllQuery(){
+      this.getlist()
+      this.getDrugOutOrderPrint()
+    },
     getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -20,7 +20,6 @@
                     <tr>
                         <td align="center">药品名称</td>
                         <td align="center">规格</td>
-                     
                         <td align="center">本月入库数量</td>
                         <td align="center">本月出库数量</td>
                         <td align="center">本月剩余库存</td>
@@ -33,11 +32,11 @@
                     </tr>
 
                     <tr v-for="(item,index) in tableList" :key="index">
-                        <td align="center">{{ item.good_name }}</td>
+                        <td align="center">{{ item.drug_name }}</td>
                         <td align="center">{{ item.specification_name }}</td>
-                        <td align="center">{{ getInCount(item.good_id) }}</td>
-                        <td align="center">{{ getOutCount(item.good_id) }}</td> 
-                        <td align="center">{{ getSumCount(item.good_id) }}</td>
+                        <td align="center">{{ getInCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td>
+                        <td align="center">{{ getOutCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td> 
+                        <td align="center">{{ getSumCount(item.sum_count,item.min_number,item.min_unit,item.max_unit) }}</td>
                         <td align="center">
                             <table
                                 class="ware_table"
@@ -70,14 +69,14 @@
                                         },
                                     ]"
                                     >
-                                    {{ it.number }}
+                                    {{ it.batch_number }}
                                     </td>
                               </tr>
                             </table>
                         </td>
                        
                         <td align="center">
-                            <table
+                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                 >
@@ -114,7 +113,7 @@
                             </table>
                         </td>
                         <td align="center">
-                            <table
+                          <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                 >
@@ -148,7 +147,7 @@
                                     {{ getTime(it.expiry_date) }}
                                     </td>
                               </tr>
-                            </table>
+                            </table> 
                         </td>
                         <td align="center">
 
@@ -217,8 +216,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
        return{
         crumbs: [
             { path: false, name: '库存管理' },
-            { path: false, name: '耗材管理' },
-            { path: false, name: '耗材模版打印' },
+            { path: false, name: '药品管理' },
+            { path: false, name: '药品模版打印' },
           ],
           tableList:[],
           org_name: this.$store.getters.xt_user.org.org_name,
@@ -226,10 +225,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           end_time:"",
           manufacturerList:[],
           infoList:[],
-          outinfo:[],
-          flowProList:[],
-          flowNoProList:[],
-          goodInfo:[]
+          drugList:[],
+          outList:[]
        }
      },
      methods:{
@@ -264,19 +261,23 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
               if(response.data.state == 1){
                  var list  =  response.data.data.list
 
-                 console.log("list===============",list)
+                 console.log("list===============998",list)
 
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                   list.forEach((item, index) => {
-                  let { good_id } = item
-                  if (!dataInfo[good_id]) {
-                    dataInfo[good_id] = {
-                      good_id:item.good_id,
+                  let { drug_id } = item
+                  if (!dataInfo[drug_id]) {
+                    dataInfo[drug_id] = {
+                      drug_id:item.drug_id,
                       child: [],
                       count:0,
-                      specification_name:item.specification_name,
-                      good_name:item.good_name,
+                      specification_name:item.dose +item.dose_unit+"*"+item.min_number+item.min_unit+"/"+item.max_unit,
+                      drug_name:item.drug_name,
+                      min_number:item.min_number,
+                      min_unit:item.min_unit,
+                      max_unit:item.max_unit,
+                      sum_count:item.sum_count,
                     }
                   }
                 })
@@ -284,7 +285,7 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                 
                 for(let i=0;i<arr.length;i++){
                    for(let j=0;j<list.length;j++){
-                       if(arr[i].good_id == list[j].good_id){
+                       if(arr[i].drug_id == list[j].drug_id){
                           arr[i].child.push(list[j])
                        }
                    }
@@ -298,13 +299,10 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
 
                  this.infoList = response.data.data.infoList
 
-                 this.outinfo = response.data.data.outinfo
+                 this.outList = response.data.data.outList
 
-                 this.flowNoProList = response.data.data.flowNoProList
-
-                 this.flowProList = response.data.data.flowProList
-
-                 this.goodInfo = response.data.data.goodInfo
+              
+                 this.drugList = response.data.data.drugList
               }
           })
         },
@@ -318,78 +316,149 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
            return manufacturer_name
         },
         
-        getInCount(good_id){
+        getInCount(drug_id,min_number,min_unit,max_unit){
           
           var newArr =[]
-          var total_count =0
-          var newArrOne = []
-          var total_count_one  = 0
           var total =0
+          var min_str  =""
+          var max_str = ""
           for(let i=0;i<this.infoList.length;i++){
-            if(good_id == this.infoList[i].good_id){
+            if(drug_id == this.infoList[i].drug_id){
                newArr.push(this.infoList[i])
             }
           }
+        
+         if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+               if(newArr[i].max_unit == max_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count * min_number
+               } 
+               if(newArr[i].max_unit == min_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+               if(newArr[i].max_unit == max_unit && max_unit==min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+            }
+         }
+
+
+
+        console.log("newARR========",newArr)
           if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
-                total_count += parseInt(newArr[i].warehousing_count)
+                total += parseInt(newArr[i].last_stock_max_number)
             }
           }
 
-          for(let i=0;i<this.flowProList.length;i++){
-            if(good_id == this.flowProList[i].good_id){
-               newArrOne.push(this.flowProList[i])
+        
+          if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
             }
-          }
-          if(newArrOne!=null){
-            for(let i=0;i<newArrOne.length;i++){
-               total_count_one += newArrOne[i].count
+            if (total >= min_number) {
+                if (parseInt(total / min_number) != 0) {
+                max_str = parseInt(total / min_number) + max_unit;
+                }
+                if (total % min_number != 0) {
+                min_str = (total % min_number) + min_unit;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
             }
-          }
-          total = total_count + total_count_one
-          return total
         },
-        getOutCount(good_id){
-
+        getOutCount(drug_id,min_number,min_unit,max_unit){
+          
           var newArr =[]
-          var newArrOne = []
-          var total_count =0
-          var total_count_one  = 0
-          var total = 0
-          for(let i=0;i<this.outinfo.length;i++){
-            if(good_id == this.outinfo[i].good_id){
-               newArr.push(this.outinfo[i])
+          var total =0
+          var min_str  =""
+          var max_str = ""
+          for(let i=0;i<this.outList.length;i++){
+            if(drug_id == this.outList[i].drug_id){
+               newArr.push(this.outList[i])
             }
           }
+        
+         if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+               if(newArr[i].max_unit == max_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count * min_number
+               } 
+               if(newArr[i].max_unit == min_unit && max_unit!=min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+               if(newArr[i].max_unit == max_unit && max_unit==min_unit){
+                 newArr[i].last_stock_max_number = newArr[i].count 
+               } 
+            }
+         }
+
+
+
+        console.log("newARR========",newArr)
           if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
-              total_count += parseInt(newArr[i].count)
+                total += parseInt(newArr[i].last_stock_max_number)
             }
           }
 
-          for(let i=0;i<this.flowNoProList.length;i++){
-            if(good_id == this.flowNoProList[i].good_id){
-               newArrOne.push(this.flowNoProList[i])
+        
+          if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
             }
-          }
-          if(newArrOne!=null){
-            for(let i=0;i<newArrOne.length;i++){
-               total_count_one += newArrOne[i].count
+            if (total >= min_number) {
+                if (parseInt(total / min_number) != 0) {
+                max_str = parseInt(total / min_number) + max_unit;
+                }
+                if (total % min_number != 0) {
+                min_str = (total % min_number) + min_unit;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
             }
-          }
-
-
-          total = total_count + total_count_one
-          return total
         },
-        getSumCount(good_id){
-          var sum_count = 0
-          for(let i=0;i<this.goodInfo.length;i++){
-             if(good_id == this.goodInfo[i].id){
-                sum_count = this.goodInfo[i].sum_count
-             }
-          }
-          return sum_count
+        getSumCount(total,min_number,min_unit,max_unit){
+           var min_str  =""
+           var max_str = ""
+           if (total < min_number) {
+               min_str = total + min_unit;
+           }
+            if (total == 0) {
+                min_str = "";
+                max_str = "";
+            }
+            if (total >= min_number) {
+                if (parseInt(total / min_number) != 0) {
+                max_str = parseInt(total / min_number) + max_unit;
+                }
+                if (total % min_number != 0) {
+                min_str = (total % min_number) + min_unit;
+                }
+            }
+            console.log("max_str",max_str)
+            console.log("min_str",min_str)
+            if(max_str == "" && min_str == ""){
+                return "0"
+            }else{
+            return max_str + min_str
+            }
         }
 
         

src/xt_pages/stock/drugs/inventoryRecordPrint.vue

@@ -43,16 +43,18 @@
                         <td align="center">{{ getTime(item.expiry_date) }}</td>
                         <td align="center">{{ getHouseName(item.storehouse_id) }}</td>
                         <td align="center">
-                             {{ item.stock_max_number }}
-                           <span v-if="item.stock_max_number>0">{{ item.max_unit }}</span> 
-                             {{ item.stock_min_number }}
-                           <span v-if="item.stock_min_number>0">{{ item.min_unit }}</span> 
+                            
+                           <span v-if="item.stock_max_number>0"> {{ item.stock_max_number}}{{ item.max_unit }}</span> 
+                          
+                           <span v-if="item.stock_min_number>0"> {{ item.stock_min_number}}{{ item.min_unit }}</span> 
                         </td> 
                         <td align="center">
-                            {{ item.last_stock_max_number }}
-                           <span v-if="item.last_stock_max_number>0">{{ item.max_unit }}</span> 
-                             {{ item.last_stock_min_number }}
-                           <span v-if="item.last_stock_min_number>0">{{ item.min_unit }}</span> 
+                           
+                           <span v-if="item.last_stock_max_number>0">
+                            {{ item.last_stock_max_number }} {{ item.max_unit }}
+                            </span> 
+                            
+                           <span v-if="item.last_stock_min_number>0"> {{ item.last_stock_min_number }}{{ item.min_unit }}</span> 
                         </td>
                         <td align="center">
                             <span v-if="item.reason == 10">盘盈</span>

src/xt_pages/stock/drugs/inventory_record.vue

@@ -57,7 +57,7 @@
             </div>
             <div>
                <el-button size="small" type="primary" @click="print_1">打印</el-button>
-               <el-button size="small" type="primary" @click="print_2">盘点模版打印2</el-button>
+               <el-button size="small" type="primary" @click="print_2">盘点模版打印</el-button>
             </div>
           
         </div>
@@ -212,7 +212,7 @@ export default {
             end_time_one= moment().endOf('month').format("YYYY-MM-DD")
 
           }
-          this.$router.push({path:'/stock/drugs/drugInventoryModePrint?start_time='+"&start_time="+start_time_one+"&end_time="+end_time_one}) 
+          this.$router.push({path:'/stock/drugs/drugInventoryModePrint?start_time='+start_time_one+"&end_time="+end_time_one}) 
         },
         handleSizeChange(val){
          this.limit = val

src/xt_pages/stock/stockInventory.vue

@@ -22,9 +22,9 @@
                 <stockDamaged ref="childOne"></stockDamaged>
             </el-tab-pane>
 
-            <el-tab-pane label="盘点日志表" name="seven">
+            <!-- <el-tab-pane label="盘点日志表" name="seven">
                 <inventory-record ref="childSeven"></inventory-record>
-            </el-tab-pane>
+            </el-tab-pane> -->
         </el-tabs>
         
     </div>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))