新分支

src/api/his/his.js

@@ -836,6 +836,16 @@ export function changeOrderDesc(params){
 }
 
 
+export function getfapiaonumber(){
+  return request({
+    url:"/api/getfapiaonumber",
+    method:"get",
+  })
+}
+
+
+
+
 
 
 

src/api/stock.js

@@ -273,9 +273,9 @@ export function getWarehouseOutInfoList(params) {
   })
 }
 
-export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id) {
+export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id,warehouseOut_id) {
   return request({
-    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id+"&warehouseOut_id="+warehouseOut_id,
     method: 'post',
     data: params
   })

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1489,11 +1489,22 @@
                             }}
                           </td>
                           <td>
-                            {{
+                            <span v-if="org_id ==10551">
+                              {{
                               monitor_record.venous_pressure
                                 ? monitor_record.venous_pressure
                                 : "/"
-                            }}
+                              }}
+                            </span>
+
+                            <span v-if="org_id !=10551">
+                              {{
+                              monitor_record.venous_pressure
+                                ? monitor_record.venous_pressure
+                                : ""
+                              }}
+                            </span>
+                           
                           </td>
                           <td>
                             {{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1498,11 +1498,21 @@
                           }}
                         </td>
                         <td>
-                          {{
+                          <span v-if="org_id ==10551">
+                            {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
                               : "/"
-                          }}
+                            }}
+                          </span>
+                          <span v-if="org_id!=10551">
+                            {{
+                            monitor.venous_pressure
+                              ? monitor.venous_pressure
+                              : ""
+                            }}
+                          </span>
+                          
                         </td>
                         <td>
                           <span

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -137,14 +137,14 @@
 
       <el-form-item label="发票编码：">
         <div style="display:flex;">
-          <el-input v-model.number="form.fapiao_code"></el-input>
+          <el-input v-model="form.fapiao_code"></el-input>
         </div>
       </el-form-item>
 
 
       <el-form-item label="发票号码：">
-        <div style="display:flex;">
-          <el-input v-model.number="form.fapiao_number"></el-input>
+        <div style=" display:flex;">
+          <el-input v-model="form.fapiao_number"></el-input>
         </div>
       </el-form-item>
 
@@ -165,6 +165,12 @@
     idtobalance
   }from "@/api/deposit";
 
+  import {
+    getfapiaonumber
+  }from "@/api/his/his";
+
+
+
   export default {
     name: 'chargeDialog',
 
@@ -324,6 +330,12 @@
           this.tmp_pay = this.form.pay_price
           this.form.pay_price = ((parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000).toFixed(2)
         }
+      },getfapiaonumber(){
+        getfapiaonumber().then((res) => {
+          if (res.data.state == 1) {
+            this.form.fapiao_number = res.data.data.fapiao_number;
+          }
+        })
       },
       //查询用户当前的余额
       updateconfig(){
@@ -352,6 +364,7 @@
         this.id =id
         this.form.dec_way = false
         this.updateconfig()
+        this.getfapiaonumber()
         this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -18,8 +18,8 @@
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-          <!-- <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive> -->
-          <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
+          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -96,10 +96,10 @@
         </div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
         <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'75px'}">{{list.chineseTraditionalMedicineCostTotal?list.chineseTraditionalMedicineCostTotal:""}}</div>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -99,7 +99,7 @@ import {
   getAllDoctorList,
   getAllHisPatientList,
 } from "@/api/project/project";
-import PrintTen from '../outpatientCharges/invoiceTemplate/printTen.vue'
+import PrintTen from '../outpatientCharges/invoiceTemplate/printTen'
 import PrintTenOne from './template/printTenOne.vue'
 export default {
   name: "dialysisPrintOrder",
@@ -159,7 +159,7 @@ export default {
       }
        else {
         const style =
-          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:300px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/sign/signIn.vue

@@ -45,6 +45,7 @@
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
+                                <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">床位号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
                                 <p>签到时间</p>
@@ -57,6 +58,7 @@
                                         <span v-if="item.schedule_type == 3">晚上</span>
                                         {{ item.queue_no }}号
                                     </p>
+                                    <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">{{ item.partition_name + item.bed_name }}</p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -138,8 +140,10 @@
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
+                                <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">床位号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
+                                
                                 <p>签到时间</p>
                             </div>
                             <div class="signInList">
@@ -150,6 +154,7 @@
                                         <span v-if="item.schedule_type == 3">晚上</span>
                                         {{ item.queue_no }}号
                                     </p>
+                                    <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">{{ item.partition_name + item.bed_name }}</p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -257,6 +262,7 @@ export default {
         },
     },
     created(){
+        
         if(sessionStorage.getItem('signInKey') != null){
             if(sessionStorage.getItem('signInKey') == 1){
                 this.dialogTableVisible = true
@@ -340,6 +346,7 @@ export default {
                     if(res.channel == 'queue/join'){
                         if(res.data.type == 1){
                             this.signInList = res.data.patientQueueList.data
+                            console.log("signInListWOOWOWOWOWOWOW",this.signInList)
                             this.count = res.data.patientQueueList.count
                             this.signInList.map(item => {
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
@@ -363,6 +370,7 @@ export default {
                     }else if(res.channel == 'queue/queuelist'){
                         console.log(11111111111,res.data)
                         this.signInList = res.data.patientQueueList.data
+                        console.log("signInListWOOWOWOWOWOWOW",this.signInList)
                         this.count = res.data.patientQueueList.count
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
@@ -370,6 +378,7 @@ export default {
                     }else if(res.channel == 'queue/queuelistbyq'){
                         console.log(11111111111,res.data)
                         this.signInList = res.data.patientQueueList.data
+                        console.log("signInListWOOWOWOWOWOWOW",this.signInList)
                         this.count = res.data.patientQueueList.count
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -821,17 +821,20 @@ export default {
           const array = this.recordInfo.recordData;
           if (this.storehouse_id == 0) {
             this.$message.error("仓库不能为空!");
+            this.loading = false;
             return false;
           }
           for (let i = 0; i < array.length; i++) {
             if (array[i].drug_id == 0) {
               this.$message.error("药品名称或者药品规格名称不能为空");
+              this.loading = false;
               return;
             }
           }
 
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加入库商品");
+            this.loading = false;
             return;
           }
 

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -813,6 +813,9 @@ export default {
         count_two +=val3[i].count
       }
      }
+     console.log("countwowowoowow3333",count)
+     console.log("count_one222222",count_one)
+     console.log("count_two222222",count_two)
      all_count = count +count_one - count_two
      if(all_count >0){
        return all_count

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -661,16 +661,19 @@ export default {
           for (let i = 0; i < array.length; i++) {
             if (array[i].good_type_id == 0) {
               this.$message.error("商品类型不能为空");
+              this.loading = false
               return;
             }
             if (array[i].good_id == 0) {
               this.$message.error("规格名称不能为空");
+              this.loading = false
               return;
             }
             total = total + array[i].price * array[i].return_count;
           }
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加出库商品");
+            this.loading = false
             return;
           }
 
@@ -696,6 +699,13 @@ export default {
           }
 
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+             
+            if(parseInt(this.recordInfo.recordData[i].count) > parseInt(this.recordInfo.recordData[i].stock_count) ){
+               this.$message.error(this.recordInfo.recordData[i].good_name+"/"+this.recordInfo.recordData[i].specification_name+"库存不足!")
+               this.loading = false
+               return
+            }
+
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
@@ -720,11 +730,13 @@ export default {
               }
 
             }
+            
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
-
+          console.log("pramsswoowowowoow",params)
+          console.log(" this.warehouseOut_id", this.warehouseOut_id)
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -921,7 +933,7 @@ export default {
 
     },
     getSupplyCount(count,sum_count,index){
-
+       
       if(sum_count < count){
         this.$message.error("出库数量不能大于剩余库存")
         for(let i=0;i<this.recordInfo.recordData.length;i++){

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -648,14 +648,22 @@
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
+                this.loading = false
                 return
               }
               if (array[i].good_id == 0) {
                 this.$message.error('规格名称不能为空')
+                this.loading = false
                 return
               }
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+
+              if(parseInt(this.recordInfo.recordData[i].count) > parseInt(this.recordInfo.recordData[i].stock_count) ){
+                this.$message.error(this.recordInfo.recordData[i].good_name+"/"+this.recordInfo.recordData[i].specification_name+"库存不足!")
+                this.loading = false
+                return
+               }
                if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }