Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/otherPrescriptionTable.vue

@@ -0,0 +1,443 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table
+      v-if="prescription.type == 1"
+      :data="prescription.advices"
+      border
+      ref="multipleTable"
+      height="370"
+      style="width: 99%"
+      :row-style="changColor"
+      :header-cell-style="{
+        color: '#606266',
+      }"
+      highlight-current-row
+
+    >
+      <el-table-column
+        fixed
+        align="center"
+        type="index"
+        width="50"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        fixed
+        align="center"
+        prop="name"
+        width="300"
+        label="名称"
+      >
+        <template slot-scope="scope"
+        ><span :title="scope.row.drug_name">{{
+            scope.row.drug_name
+          }}</span></template
+        >
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
+        <template slot-scope="scope">
+          <div>{{ scope.row.spec }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="80" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.delivery_way }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="频率">
+        <template slot-scope="scope">
+          <div>{{ scope.row.execution_frequency }}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="80" label="天数">
+        <template slot-scope="scope">{{ scope.row.day }}天</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="总量">
+        <template slot-scope="scope">{{ scope.row.prescribing_number }}{{scope.row.prescribing_number_unit}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="单价">
+        <template slot-scope="scope">
+          <div>{{ scope.row.retail_price }}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
+        <template slot-scope="scope">
+          <div>{{ scope.row.code }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.det_item_fee_sumamt }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="120" label="生产厂家">
+        <template slot-scope="scope">
+          <div>{{ getName(scope.row.name_id) }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="全自费金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="超限价金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.overlmt_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="先行自付金额"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.preselfpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="130"
+        label="符合正常范围金额"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.inscp_scp_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div>{{ scope.row.remark }}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table
+      v-if="prescription.type == 2"
+      :data="prescription.project"
+      border
+      height="370"
+      ref="multipleTable"
+      style="width: 99%"
+      :row-style="changColor"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266',
+      }"
+      highlight-current-row
+    >
+      <el-table-column
+        fixed
+        align="center"
+        type="index"
+        width="50"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        fixed
+        align="center"
+        prop="project_name"
+        width="280"
+        label="名称"
+      >
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="statistical_classification"
+        width="80"
+        label="组"
+      >
+        <template slot-scope="scope">{{
+            scope.row.type == 2
+              ? getGroup(scope.row.statistical_classification)
+              : "耗材"
+          }}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
+        <template slot-scope="scope">
+          <div>{{ scope.row.spec }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="single_dose"
+        width="80"
+        label="单次用量"
+      >
+        <template slot-scope="scope"
+        >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
+        >
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="delivery_way"
+        width="80"
+        label="用法"
+      >
+        <template slot-scope="scope">{{ scope.row.delivery_way }}</template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="execution_frequency"
+        width="80"
+        label="频率"
+      >
+        <template slot-scope="scope">{{
+            scope.row.execution_frequency
+          }}</template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="number_days"
+        width="50"
+        label="天数"
+      >
+        <template slot-scope="scope">{{ scope.row.number_days }}天</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div>{{ scope.row.total }} {{ scope.row.unit }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">{{ scope.row.price }}元</template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
+        <template slot-scope="scope">
+          <div>{{ scope.row.medical_code }}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.det_item_fee_sumamt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="120" label="生产厂家">
+        <template slot-scope="scope">
+          <div>{{ getName(scope.row.name_id) }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="全自费金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="超限价金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.overlmt_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="先行自付金额"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.preselfpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="130"
+        label="符合正常范围金额"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.inscp_scp_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">{{ scope.row.remark }}</template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div
+        class="additionalOne"
+        v-for="(item, index) in prescription.addition"
+        :key="index"
+      >
+        <span :title="item.item_name">{{ item.item_name }}</span>
+        <el-input
+          v-model="item.price"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
+        共
+        <el-input
+          v-model="item.count"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
+        次
+        <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInitData } from "@/api/his/his";
+import { getDictionaryDataConfig } from "@/utils/data";
+
+export default {
+  props: {
+    prescription: Object,
+    his_patient: Object,
+    schedule: Object,
+    manufacturers: Array,
+  },
+  data() {
+    return {
+      drugways: [],
+      efs: [],
+    };
+  },
+  mounted() {
+    // getInitData().then(response => {
+    //   if (response.data.state == 0) {
+    //     this.$message.error(response.data.msg)
+    //     return false
+    //   } else {
+    //     this.drugways = response.data.data.drugways
+    //     this.efs = response.data.data.efs
+    //   }
+    // })
+  },
+  methods: {
+    changColor({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        // 变颜色的条件
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133", // 这个return的就是样式 可以是color 也可以是backgroundColor
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+
+    getName(id) {
+      let name = "";
+      for (let i = 0; i < this.manufacturers.length; i++) {
+        if (id == this.manufacturers[i].id) {
+          name = this.manufacturers[i].manufacturer_name;
+        }
+      }
+      return name;
+    },
+    getGroup(id) {
+      var name = "";
+      var statistics_category = getDictionaryDataConfig(
+        "system",
+        "statistics_category"
+      );
+      // console.log("2235", statistics_category);
+      for (let i = 0; i < statistics_category.length; i++) {
+        if (id == statistics_category[i].id) {
+          name = statistics_category[i].name;
+        }
+      }
+      return name;
+    },
+  },
+  watch:{
+    prescription:function(){
+      this.$nextTick(() => {
+        this.$refs.multipleTable.doLayout();
+        // table加ref="multipleTable"
+      })
+    }
+  },
+  created(){
+    console.log('prescription',this.prescription);
+  }
+};
+</script>
+
+
+<style lang="scss">
+.prescriptionTable {
+.additionalBox {
+  margin-top: 20px;
+  display: flex;
+  flex-wrap: wrap;
+.additionalOne {
+  margin-right: 20px;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+> span {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 80px;
+  display: inline-block;
+  font-size: 14px;
+}
+}
+.deleteIcon {
+  color: red;
+  margin-left: 5px;
+}
+}
+.el-table th .cell,
+.el-table td .cell {
+  padding: 0 2px;
+  white-space: pre-line;
+}
+.el-icon-delete {
+  color: red;
+}
+}
+</style>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,8 +14,8 @@
     </template>
 
     <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 && org_id != 0"
         :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 || org_id == 0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -101,7 +101,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            if(this.org_id == 10265){
+            if(this.org_id == 10265 || this.org_id == 0){
               this.order = response.data.data.order
               this.patient = response.data.data.patient
               this.admin = response.data.data.admin_info
@@ -380,7 +380,7 @@
         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 = {

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -13,7 +13,7 @@
             ><TD colspan="4" align="center" style="font-size: 20px"
               >{{ $store.getters.xt_user.org.org_name }}费用清单</TD
             ></TR>
-          
+
           <TR>
             <TD colspan="2">个人编码:{{ order.psn_no }}</TD>
             <TD colspan="2">住院号：{{ order.mdtrt_id }}</TD>
@@ -33,7 +33,21 @@
             <TD v-if="order && order.insutype == '310'">
               费别：职工基本医疗保险
             </TD>
-            <TD></TD>
+            <TD> 结算类型：{{order.is_medicine_insurance == 1 ? "医保" : "自费"}} </TD>
+          </TR>
+          <TR>
+            <TD> 就诊流水号：{{ order.mdtrt_id }} </TD>
+            <TD>
+              透析号：{{patient.dialysis_no}}
+            </TD>
+            <TD> 总金额：{{ order.medfee_sumamt }} </TD>
+            <TD> 个人支付金额：{{ order.psn_part_amt }}</TD>
+          </TR>
+          <TR>
+            <TD>
+              基金支付金额：{{ order.fund_pay_sumamt}}
+            </TD>
+            <TD>收费日期：{{getTimes(order.ctime)}}</TD>
           </TR>
         </THEAD>
         <TBODY style="text-align: center">
@@ -58,7 +72,7 @@
                   <TD width="80">单价(元)</TD>
                   <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">{{
@@ -76,10 +90,10 @@
                   <TD>{{
                     (subItem.price * subItem.count).toFixed(2)
                   }}</TD>
-                  <td>
-                    {{(subItem.selfpay_prop)*100}}
-                    <span v-if="subItem.selfpay_prop !=''">%</span>
-                  </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/outpatientChargesManagement.vue

@@ -28,7 +28,7 @@
           <el-radio-group v-model="radio" @change="changeRadio">
             <el-radio :label=1>未收费<span
               style="color: red;margin-bottom:10px;display: inline-block;">{{ cal_one }}</span>人
-            </el-radio>
+            </el-radio>,
             <el-radio :label=2>已收费<span
               style="color: red;margin-bottom:10px;display: inline-block;">{{ cal_two }}</span>人
             </el-radio>
@@ -729,9 +729,12 @@
                           </el-tab-pane>
 
 
-                          <prescription-table ref="prescription_tables"
+                          <prescription-table v-if="activeName == 'first' || activeName == 'second'"  ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
                                               :manufacturers="manufacturers"></prescription-table>
+                          <other-prescription-table v-if="activeName == 'third'" ref="prescription_tables"
+                                                    :prescription="items.curPrescriptions"
+                                                    :manufacturers="manufacturers"></other-prescription-table>
                           <!--</el-radio-group>-->
                         </el-tabs>
                       </div>
@@ -1022,10 +1025,12 @@ import cryptoJs from 'crypto-js'
 import NewStatementPrintThree from './newStatementPrintThree.vue'
 import CallUnAssociationPrescription from './components/callUnAssociationPrescription.vue'
 import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
+import OtherPrescriptionTable from './components/otherPrescriptionTable.vue'
 
 const moment = require('moment')
 export default {
   components: {
+    OtherPrescriptionTable,
     CallUnAssociationPrescription,
     NewStatementPrintThree,
     RegisterDialog9504,
@@ -1725,7 +1730,7 @@ export default {
           this.newLoading = false
         })
       } else {
-        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111")) {
+        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111") || (this.org_id == 0 && this.other_prescriptions[0].med_type == "1111") || (this.org_id == 0 && this.other_prescriptions[0].med_type == "1112")) {
           upload(form).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1748,7 +1753,6 @@ export default {
             this.newLoading = false
           })
         }else{
-
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -3386,7 +3390,14 @@ export default {
 
       } else if (index == 5) {
         var that = this
-        if (that.hisPatientInfo.balance_accounts_type == 2) {
+        var balance_accounts_type = that.hisPatientInfo.balance_accounts_type
+        if(that.order.is_medicine_insurance == 1){
+          balance_accounts_type = 1
+        }else{
+          balance_accounts_type = 2
+        }
+
+        if (balance_accounts_type == 2) {
           let params = {
             'order_id': that.order.id,
             'number': that.order.number,
@@ -3696,6 +3707,11 @@ export default {
             end_time: this.order.settle_end_time,
             balance_accounts_type: this.hisPatientInfo.balance_accounts_type
           }
+          if (this.order.is_medicine_insurance == 1){
+            obj.balance_accounts_type = 1
+          }else{
+            obj.balance_accounts_type = 2
+          }
           this.orderObj = obj
 
         }

src/xt_pages/outpatientCharges/summary.vue

@@ -119,7 +119,10 @@
 
                     </el-popover> -->
           <el-button
-            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 || $store.getters.xt_user.org_id == 10610"
+            size="small" type="primary" @click="query">查询
+          </el-button>
+          <el-button
+            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 || $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0 "
             size="small" type="primary" @click="batch_print_settlte">批量打印结算单
           </el-button>
           <el-button size="small" type="primary" @click="export_detail"
@@ -281,10 +284,10 @@
 
         <el-table-column align="center" width="90" prop="name" label="收费类型">
           <template slot-scope="scope">
-            <div v-if="scope.row.his_patient.balance_accounts_type != 2">
+            <div v-if="scope.row.is_medicine_insurance == 1">
               医保
             </div>
-            <div v-if="scope.row.his_patient.balance_accounts_type == 2">
+            <div v-if="scope.row.is_medicine_insurance != 1">
               自费
             </div>
           </template>
@@ -817,6 +820,9 @@ export default {
   },
 
   methods: {
+    query(){
+      this.getHisOrderList()
+    },
     getAge(UUserCard) {
       if (UUserCard != null && UUserCard != '') {
         //获取年龄
@@ -1436,13 +1442,21 @@ export default {
       //   }
       //
       // } else {
+      var balance_accounts_type = row.his_patient.balance_accounts_type
+      if (row.is_medicine_insurance == 1){
+        balance_accounts_type = 1
+      }else{
+        balance_accounts_type = 2
+
+      }
+
       this.statementVisible = true
       let obj = {
         order_id: row.id,
         settle_type: row.settle_type,
         start_time: row.settle_start_time,
         end_time: row.settle_end_time,
-        balance_accounts_type: row.his_patient.balance_accounts_type
+        balance_accounts_type:balance_accounts_type
       }
       this.orderObj = obj
     },
@@ -3639,12 +3653,12 @@ export default {
     changeSortType() {
       this.page = 1
       this.keywords = ''
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     changeDoctor() {
       this.page = 1
       this.keywords = ''
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     handleSizeChange(limit) {
       this.limit = limit
@@ -3657,12 +3671,12 @@ export default {
     handleStartTimeChange() {
       this.page = 1
       this.keywords = ''
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     handleEndTimeChange() {
       this.page = 1
       this.keywords = ''
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     setMonthPrescription(month_prescriptions) {
       console.log(month_prescriptions)
@@ -3950,7 +3964,7 @@ export default {
       //   }
       //   this.tableData = arr
       // }
-      this.getHisOrderList()
+      // this.getHisOrderList()
     },
     getTimes(time) {
       return uParseTime(time, '{y}-{m}-{d}')

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintThree.vue

@@ -205,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> -->

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/drugInventory.vue

@@ -26,9 +26,9 @@
           <drug-damaged ref="childOne"></drug-damaged>
         </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>
   </div>

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