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

package.json

@@ -80,6 +80,7 @@
     "vue-i18n": "7.3.2",
     "vue-json-excel": "^0.3.0",
     "vue-multiselect": "2.0.8",
+    "vue-pdf": "^4.3.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.1",
     "vue-splitpane": "1.0.2",

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

@@ -46,7 +46,7 @@
              衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
             </span>
 
-            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
+            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598">
               体重增长：
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1444,6 +1444,7 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">mg</span>
                     </span>
 
                     <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10460">
@@ -1458,6 +1459,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 14">mg</span>
 
                     </span>
                     </div>
@@ -1499,6 +1501,7 @@
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
                       </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -1512,6 +1515,7 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
                       </span>
                     </div>
                     <div
@@ -1580,6 +1584,7 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">mg</span>
                      </span>
                     <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471|| org_id == 10460">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1593,6 +1598,7 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
+                      <span v-if="prescription.anticoagulant == 14">mg/h</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">
@@ -1809,7 +1815,7 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
                           <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
@@ -5375,8 +5381,11 @@ export default {
         }
 
         this.jilurow = this.monitors.length + 1;
-
-        this.advice_jilurow = this.advices.length + 1;
+        
+        if(this.advices!=null && this.advices.length>0){
+          this.advice_jilurow = this.advices.length + 1;
+        }
+       
 
         var childMap = {};
         for (const index in this.advices) {

src/xt_pages/eleFaPiao/fapiao.vue

@@ -122,11 +122,11 @@
             </el-button>
             <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0"
                        @click="yulan(scope.row)">
-              预览
-            </el-button>
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">
               下载
             </el-button>
+<!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">-->
+<!--              下载-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -261,6 +261,7 @@ export default {
 
     }, yulan(row){
 
+
     },hongchong(row){
 
     },

src/xt_pages/eleFaPiao/newPrintOne.vue

@@ -175,8 +175,8 @@ export default {
       getFaPiaoData(params).then((res) => {
         console.log('res',res)
         this.list = res.data.data
-        this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal + this.list.hiliCostTotal
+        this.totalPrice = (this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal + this.list.hiliCostTotal).toFixed(2)
         if(this.totalPrice == 0){
 
           this.totalPrice = this.list.medfee_sumamt

src/xt_pages/eleFaPiao/newSettleDetail.vue

@@ -146,21 +146,29 @@
 
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
+<!--            <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"-->
+<!--                       @click="blueDailog()">-->
+<!--              开票-->
+<!--            </el-button>-->
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
                        @click="blueDailog()">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
+                       >
+              开票审核中
+            </el-button>
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2" size="mini" type="primary"
                        @click="hongchong(scope.row)">
               红冲
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0"
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2"
                        @click="yulan(scope.row)">
-              预览
-            </el-button>
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">
               下载
             </el-button>
+<!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">-->
+<!--              下载-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -359,9 +367,11 @@ export default {
       var that = this;
       axios.get('http://127.0.0.1:9532/api/fapiao/blue',{params:params}).then(function(response) {
         if (response.data.state == 0) {
+          that.settlementVisible = false
           that.$message.error(response.data.data.msg);
           return false
         } else {
+          that.settlementVisible = false
           if(response.data.data.failed_code == -10){
             that.$confirm(response.data.data.msg, '错误信息', {
               confirmButtonText: '确 定',
@@ -371,6 +381,7 @@ export default {
             }).catch(() => {
             })
           }else{
+            that.settlementVisible = false
             that.$message.success(response.data.data.msg)
             that.getHisOrderList()
           }
@@ -475,6 +486,7 @@ export default {
 
     },
     yulan(row){
+      window.open( row.result.pdf_url, "_blank");
 
     },
     getAllstaff(){

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -151,19 +151,22 @@
                         @click="blue(scope.row)">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
+                       @click="blue(scope.row)">
+              开票审核中
+            </el-button>
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2" size="mini" type="primary"
                         @click="hongchong(scope.row)">
               红冲
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0"
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2"
                        @click="yulan(scope.row)">
-              预览
-            </el-button>
-            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0">
               下载
             </el-button>
-
-
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2 && scope.row.fapiao_number == ''"
+                       @click="chaxun(scope.row)">
+              查询并同步发票号码
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -242,6 +245,22 @@
       </span>
     </el-dialog>
 
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      :visible.sync="settlementVisibletwo">
+      <div>
+        <pdf :src="pdfSrc"></pdf>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="settlementVisibletwo = false">取 消</el-button>
+        <el-button type="primary" @click="settlementVisibletwo = false">确定</el-button>
+      </span>
+    </el-dialog>
+
+
+
   </div>
 </template>
 
@@ -251,7 +270,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
 import { ModifyFapiaoCode } from '@/api/his/his_tools'
 
-
+import pdf from 'vue-pdf'
 // import NewStatementPrint from './newStatementPrint'
 import { adminMainView} from "@/api/role/admin";
 import { fetchAllAdminUsers } from '@/api/doctor'
@@ -259,10 +278,6 @@ import axios from 'axios'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import {
   getOrderFapiaoList,
-  OpenBlueFapiao,
-  OpenRedFapiao,
-  GetSMSCode,
-  SMSLogin, GetQRCode
 } from '../../api/fapiao'
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
@@ -279,12 +294,14 @@ export default {
   },
   data() {
     return {
+      pdfSrc:"",
       staff:"",
       admins:[],
       orderObj: {},
       batchOrderObj: {},
       fapiao_number:"",
       invoiceVisible: false,
+      settlementVisibletwo:false,
       med_options: [
         { id: 0, text: '全部' },
         { id: 11, text: '普通门诊' },
@@ -361,6 +378,40 @@ export default {
   },
 
   methods: {
+    chaxun(row){
+      let params = {
+        "id": row.result.id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/fapiao/query',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            this.getHisOrderList()
+            that.$confirm(response.data.data.msg, '信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }
+        }
+      }).catch(function(error) {
+      })
+    },
     loginSJ(){
       // let params = {
       //   "code":this.formLabelAlign.verify,
@@ -554,17 +605,23 @@ export default {
             })
           }else{
             if(response.data.data.cus_status == 1){
-              this.$nextTick(() =>{
-                var qrcode = new QRCode(that.$refs.qrCodeUrl, {
-                  text: response.data.data.qr_code, // 需要转换为二维码的内容
-                  width: 120,
-                  height: 120,
-                  colorDark: '#000000',
-                  colorLight: '#ffffff',
-                  correctLevel: QRCode.CorrectLevel.H
-                })
-              })
-              this.qr_dialogVisible =true
+              Vue.nextTick(() => {
+                // 确保二维码数据存在
+                if (response.data.data.qr_code) {
+                  // 生成新的二维码
+                  var qrcode = new QRCode(that.$refs.qrCodeUrl, {
+                    text: response.data.data.qr_code,
+                    width: 120,
+                    height: 120,
+                    colorDark: '#000000',
+                    colorLight: '#ffffff',
+                    correctLevel: QRCode.CorrectLevel.H
+                  });
+                  that.qr_dialogVisible = true;
+                } else {
+                  that.$message.error('二维码数据为空。');
+                }
+              });
             }else if(response.data.data.cus_status == -1){
               // this.$message.error(response.data.msg)/*  */
               that
@@ -630,7 +687,6 @@ export default {
         "order_ids": this.cur_ids,
         "admin_user_id":this.$store.getters.xt_user.user.id,
       }
-
       var that = this;
       axios.get('http://127.0.0.1:9532/api/fapiao/blue',{params:params}).then(function(response) {
         if (response.data.state == 0) {
@@ -638,6 +694,8 @@ export default {
           return false
         } else {
           if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+
             that.$confirm(response.data.data.msg, '错误信息', {
               confirmButtonText: '确 定',
               type: 'warning'
@@ -646,6 +704,7 @@ export default {
             }).catch(() => {
             })
           }else{
+            that.settlementVisible = false
             that.$message.success(response.data.data.msg)
             that.getHisOrderList()
           }
@@ -681,8 +740,10 @@ export default {
 
 
     }, yulan(row){
-
-
+      window.open( row.result.pdf_url, "_blank");
+      // this.settlementVisibletwo = true
+      // this.pdfSrc = row.result.pdf_url
+      // console.log(this.pdfSrc)
 
     },hongchong(row){
       var  id = row.result.id
@@ -707,7 +768,7 @@ export default {
             }).catch(() => {
             })
           }else{
-            that.$message.success(response.data.msg)
+            that.$message.success(response.data.data.msg)
             that.getHisOrderList()
           }
 

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -281,6 +281,11 @@
                       <p>HDF100:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
+
+                  <span v-if="item.mode_id == 'HDF1000'">
+                      <p>HDF1000:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
                   <span v-if="item.mode_id == 'HDF600'">
                       <p>HDF600:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>

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

@@ -1270,66 +1270,136 @@ export default {
        this.$router.push("/drugs/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
     },
     exportStock() {
-      console.log("tablelist23322332",this.tableList)
-   
-      if(this.tableList!=null && this.tableList.length > 0){
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i +1
-          this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
-          this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
-          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
-          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
-          this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
-          this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
-          this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-        }
+      console.log("中共人家哈哈哈哈哈哈",this.tableList)
+
+      if(this.org_id!=0&&this.org_id!=10697){
+        if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i +1
+            this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
+            this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+            this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
+            this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+            this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          }
+       }
+ 
+        import("@/vendor/Export2Excel").then((excel) => {
+          const tHeader = [
+            "序号",
+            "药品类型",
+            "药品名称",
+            "规格&单位",
+            "生产厂商",
+            "经销商",
+            "批准文号",
+            "国家编码",
+            "入库数量",
+            "出库数量",
+            "退库数量",
+            "实际出库",
+            "剩余库存",
+            "总库存",
+          ];
+          const filterVal = [
+            "index",
+            "drug_type_name",
+            "drug_name",
+            "specification_name",
+            "manufacturer_name",
+            "dealer_name",
+            "number",
+            "medical_insurance_number",
+            "stock_in_count",
+            "stock_out_count",
+            "cancle_out_count",
+            "act_cout",
+            "over_count",
+            "sum_count",
+          ];
+
+          const data = this.formatJson(filterVal, this.tableList);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "药品查询",
+          });
+          this.downloadLoading = false;
+        });
       }
+
+      if(this.org_id == 0 || this.org_id == 10697){
+
+        if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i +1
+            this.tableList[i].medical_code = this.getMedicalInsuranceLeve(this.tableList[i].medical_insurance_level)
+            this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
+            this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+            this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
+            this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+            this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          }
+       }
  
-      import("@/vendor/Export2Excel").then((excel) => {
-        const tHeader = [
-          "序号",
-          "药品类型",
-          "药品名称",
-          "规格&单位",
-          "生产厂商",
-          "经销商",
-          "批准文号",
-          "国家编码",
-          "入库数量",
-          "出库数量",
-          "退库数量",
-          "实际出库",
-          "剩余库存",
-          "总库存",
-        ];
-        const filterVal = [
-          "index",
-          "drug_type_name",
-          "drug_name",
-          "specification_name",
-          "manufacturer_name",
-          "dealer_name",
-          "number",
-          "medical_insurance_number",
-          "stock_in_count",
-          "stock_out_count",
-          "cancle_out_count",
-          "act_cout",
-          "over_count",
-          "sum_count",
-        ];
+        import("@/vendor/Export2Excel").then((excel) => {
+          const tHeader = [
+            "序号",
+            '医保等级',
+            "药品类型",
+            "药品名称",
+            "规格&单位",
+            "零售价",
+            "生产厂商",
+            "经销商",
+            "批准文号",
+            "国家编码",
+            "入库数量",
+            "出库数量",
+            "退库数量",
+            "实际出库",
+            "剩余库存",
+            "总库存",
+          ];
+          const filterVal = [
+            "index",
+            "medical_code",
+            "drug_type_name",
+            "drug_name",
+            "specification_name",
+            "retail_price",
+            "manufacturer_name",
+            "dealer_name",
+            "number",
+            "medical_insurance_number",
+            "stock_in_count",
+            "stock_out_count",
+            "cancle_out_count",
+            "act_cout",
+            "over_count",
+            "sum_count",
+          ];
 
-        const data = this.formatJson(filterVal, this.tableList);
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: "药品查询",
+          const data = this.formatJson(filterVal, this.tableList);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "药品查询",
+          });
+          this.downloadLoading = false;
         });
-        this.downloadLoading = false;
-      });
+      }
+     
     },
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -96,19 +96,22 @@
                         </td>
                         <td align="center" style="width: 200px;">
 
-                           {{item.month_in_total_price }}
+                         <span v-if="item.is_total == 0">{{item.month_in_total_price }}</span>
+                         <span v-if="item.is_total == 1">{{(item.month_in_total_price).toFixed(2) }}</span>
                         </td>
                         <td align="center">{{ getOutCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td> 
                         <td align="center" style="width: 200px;">{{ getRetailPrice(item.drug_id) }}</td>
                         <td align="center" style="width: 200px;">
-                            {{ item.month_out_total_price}}
+                          <span v-if="item.is_total == 0">  {{ item.month_out_total_price}}</span>
+                          <span v-if="item.is_total == 1">  {{ (item.month_out_total_price).toFixed(2)}}</span>
                         </td>
                         <td align="center">{{ getSumCount(item.sum_count,item.min_number,item.min_unit,item.max_unit) }}</td>
                         <td align="center" style="width: 200px;">
                             {{ getBuyPrice(item.drug_id) }}
                         </td>
                         <td align="center" style="width: 200px;">
-                            {{ item.month_over_total_price}}
+                           <span v-if="item.is_total == 0">{{ item.month_over_total_price}}</span> 
+                           <span v-if="item.is_total == 1">{{ (item.month_over_total_price).toFixed(2)}}</span> 
                         </td>
                         <td align="center">
                            <span v-if="item.is_total == 0">
@@ -313,7 +316,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           warehouseInfoFlow:[],
           warehouseOutFlow:[],
           cancelFlow:[],
-
+          cancelOutInfo:[],
+          cancelInfoList:[],
        }
      },
      methods:{
@@ -376,6 +380,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                  this.warehouseInfoFlow = response.data.data.warehouseInfoFlow
                  this.warehouseOutFlow = response.data.data.warehouseOutFlow
                  this.cancelFlow = response.data.data.cancelFlow
+
+                 this.cancelInfoList = response.data.data.cancelOutInfo
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                   list.forEach((item, index) => {
@@ -401,6 +407,9 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                       month_over_total:0,//本月剩余库存
                       month_over_total_price:0,
                       is_total:0,
+                      month_in_total_price_one:0,
+                      month_out_total_price_one:0,
+                      month_over_total_price:0,
                     }
                   }
                 })
@@ -419,9 +428,13 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                   arr[i].month_in_total = this.getInCount(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
                   arr[i].last_price = this.getBuyPrice(arr[i].drug_id)
                   arr[i].month_in_total_price = (this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)).toFixed(2)
+                  arr[i].month_in_total_price_one =this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
                   arr[i].retail_price = this.getRetailPrice(arr[i].retail_price)
                   arr[i].month_out_total_price = (this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)).toFixed(2)
+                  
+                  arr[i].month_out_total_price_one =this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)
                   arr[i].month_over_total_price = (this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getBuyPrice(arr[i].drug_id)).toFixed(2)
+                  arr[i].month_over_total_price_one =this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) *  this.getBuyPrice(arr[i].drug_id)
                 }
 
                 this.tableList = arr
@@ -430,11 +443,13 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
 
               
                 for(let i=0;i<this.tableList.length;i++){
-                  obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price) 
-                  obj.month_out_total_price +=parseFloat(this.tableList[i].month_out_total_price)
-                  obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price) 
+                  obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price_one) 
+                  obj.month_out_total_price +=parseFloat(this.tableList[i].month_out_total_price_one)
+                  obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price_one) 
                 }
-                obj.mon
+                // obj.month_in_total_price = obj.month_in_total_price.toFixed(2)
+                // obj.month_out_total_price = obj.month_out_total_price.toFixed(2)
+                // obj.month_over_total_price = obj.month_out_total_price.toFixed(2)
                 console.log("obj=====================",obj)
                 this.tableList.push(obj)
                 // console.log("arr--------------",arr)
@@ -540,10 +555,10 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                 }
              }
 
-             console.log("drug_id=================",drug_id)
-             console.log("total_in_count",total_in_count)
-             console.log("total_cancel_count",total_cancel_count)
-             console.log("total_out_count",total_out_count)
+            //  console.log("drug_id=================",drug_id)
+            //  console.log("total_in_count",total_in_count)
+            //  console.log("total_cancel_count",total_cancel_count)
+            //  console.log("total_out_count",total_out_count)
              total = total_in_count + total_cancel_count - total_out_count
 
 
@@ -800,11 +815,20 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           var total =0
           var min_str  =""
           var max_str = ""
+          var cancelNewArr = []
+          var all_total = 0
+          var cancel_total = 0
           for(let i=0;i<this.outList.length;i++){
             if(drug_id == this.outList[i].drug_id){
                newArr.push(this.outList[i])
             }
           }
+
+          for(let i=0;i<this.cancelInfoList.length;i++){
+            if(drug_id == this.cancelInfoList[i].drug_id){
+                cancelNewArr.push(this.cancelInfoList[i])
+            }
+          }
         
          if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
@@ -829,20 +853,45 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             }
           }
 
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+               if(cancelNewArr[i].max_unit == max_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count * min_number
+               } 
+               if(cancelNewArr[i].max_unit == min_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+               if(cancelNewArr[i].max_unit == max_unit && max_unit==min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+            }
+         }
+
+
+
+        console.log("newARR========",newArr)
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+              cancel_total += parseInt(cancelNewArr[i].last_stock_max_number)
+            }
+          }
+
+          var all_total = total - cancel_total
+
         
-          if (total < min_number) {
-               min_str = total + min_unit;
+          if (all_total < min_number) {
+               min_str = all_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 (all_total >= min_number) {
+                if (parseInt(all_total / min_number) != 0) {
+                max_str = parseInt(all_total / min_number) + max_unit;
                 }
-                if (total % min_number != 0) {
-                min_str = (total % min_number) + min_unit;
+                if (all_total % min_number != 0) {
+                min_str = (all_total % min_number) + min_unit;
                 }
             }
             console.log("max_str",max_str)
@@ -857,12 +906,20 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           
           var newArr =[]
           var total =0
-
+          var cancelNewArr = []
+          var all_total = 0
+          var cancel_total = 0
           for(let i=0;i<this.outList.length;i++){
             if(drug_id == this.outList[i].drug_id){
                newArr.push(this.outList[i])
             }
           }
+
+          for(let i=0;i<this.cancelInfoList.length;i++){
+            if(drug_id == this.cancelInfoList[i].drug_id){
+                cancelNewArr.push(this.cancelInfoList[i])
+            }
+          }
         
          if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
@@ -883,7 +940,41 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             }
           }
 
-         return total
+       
+
+
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+               if(cancelNewArr[i].max_unit == max_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count * min_number
+               } 
+               if(cancelNewArr[i].max_unit == min_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+               if(cancelNewArr[i].max_unit == max_unit && max_unit==min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+            }
+         }
+
+
+
+       
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+              cancel_total += parseInt(cancelNewArr[i].last_stock_max_number)
+            }
+          }
+
+          var all_total = total - cancel_total
+          if(drug_id == 25194){
+            console.log("drug_id =====",drug_id)
+            console.log("total =====",total)
+            console.log("cancel_total =====",cancel_total)
+            console.log("all_total555555555",all_total)
+          }
+         
+         return all_total
         },
         getSumCount(total,min_number,min_unit,max_unit){
            var min_str  =""

src/xt_pages/stock/query/goodNewQuery.vue

@@ -879,7 +879,7 @@ export default {
    exportList(){
       import('@/vendor/Export2Excel').then(excel => {
       
-        if(this.org_id!=0 && this.org_id!=9956){
+        if(this.org_id!=0 && this.org_id!=9956 && this.org_id!=10697){
           if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
             this.tableList[i].index = i+1
@@ -911,7 +911,7 @@ export default {
           this.downloadLoading = false
         }
 
-        if(this.org_id == 0 || this.org_id == 9956){
+        if(this.org_id == 9956){
          
           if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
@@ -943,6 +943,41 @@ export default {
          })
           this.downloadLoading = false
         }
+
+
+        if(this.org_id == 0 || this.org_id == 10697){
+         
+         if(this.tableList!=null && this.tableList.length > 0){
+         for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].index = i+1
+           this.tableList[i].medical_code = this.getMedicalInsuranceLeve(this.tableList[i].medical_insurance_level)
+           this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+           this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+           this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+           this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+           this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+           this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+           this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+           this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+
+         }
+        }
+        
+
+        const tHeader = ['序号','医保等级','耗材编码','耗材类型', '耗材名称', '规格&单位','零售价','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+        const filterVal = ['index','medical_code','good_number','type_name', 'good_name', 'spec','packing_price','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+       
+        const data = this.formatJson(filterVal, this.tableList)
+        
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '库存查询'
+        })
+         this.downloadLoading = false
+       }
    
        })
       },

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -56,7 +56,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
-                                 <td v-if="org_id==9956">{{item.good_number}}</td>
+                                 <td v-if="org_id==9956 || org_id== 0">{{item.good_number}}</td>
                                  <td>{{item.social_security_directory_code}}</td>
                                  <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
@@ -231,6 +231,7 @@ export default {
                 
                 }
                
+               
                var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
           
                 if(this.org_id == 0 || this.org_id == 10697){
@@ -255,6 +256,7 @@ export default {
                     list.push(obj)
                  }
                 }
+                this.tableList = list
                this.manufacturerList = response.data.data.manufacturerList
             
             }

src/xt_pages/stock/stockInventoryModePrint.vue

@@ -299,6 +299,7 @@ export default {
       warehouseinfoList: [],
       warehouseOutInfoList: [],
       cancelInfoList: [],
+      cancelFlowList:[]
 
     }
   },
@@ -368,6 +369,8 @@ export default {
           this.warehouseOutInfoList = warehouseOutInfo
           var cancelInfoList = response.data.data.cancelInfo
           this.cancelInfoList = cancelInfoList
+
+          this.CancelFlowList = response.data.data.CancelFlowList
           loading.close()
           //  console.log("list===============",list)
 
@@ -559,14 +562,32 @@ export default {
 
       var newArr = []
       var newArrOne = []
+      
       var total_count = 0
       var total_count_one = 0
+      var total_count_two = 0
       var total = 0
+
+      var cancelNewArr = []
       for (let i = 0; i < this.outinfo.length; i++) {
         if (good_id == this.outinfo[i].good_id) {
           newArr.push(this.outinfo[i])
         }
       }
+
+      for(let i=0;i<this.cancelFlowList.length;i++){
+         if(good_id == this.cancelFlowList[i].good_id){
+            cancelNewArr.push(this.cancelFlowList[i])
+         }
+      }
+
+      if(cancelNewArr!=null){
+        for(let i=0;i<cancelNewArr.length;i++){
+            total_count_two += cancelNewArr[i].count
+        }
+      }
+
+
       if (newArr != null) {
         for (let i = 0; i < newArr.length; i++) {
           total_count += parseInt(newArr[i].count)
@@ -585,7 +606,7 @@ export default {
       }
 
 
-      total = total_count + total_count_one
+      total = total_count + total_count_one - total_count_two
       return total
     },
     getSumCount(good_id) {

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))