新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -1326,7 +1326,7 @@
                           <!-- <thead> -->
                           <tr>
                             <td
-                              colspan="14"
+                              colspan="15"
                               style="
                                 letter-spacing: 5px;
                                 text-align: center;
@@ -1356,6 +1356,7 @@
                             <td width="50" >1:9肝素盐水剩余量<br />(ml)</td>
                             
                             <td width="60">体温(°C)</td>
+                            <td width="60">病情变化及处理</td>
                             <td width="60">签名</td>
                             
                           </tr>
@@ -1469,6 +1470,11 @@
                                 : ""
                             }}
                             </td>
+                            <td width="60">
+                              {{ monitor_record.symptom }} &nbsp;{{
+                                monitor_record.dispose
+                              }}
+                            </td>
                             <!-- 签名 -->
                             <td>
                                 <!-- <span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1493,14 +1493,14 @@
                           {{
                             monitor.arterial_pressure
                               ? monitor.arterial_pressure
-                              : ""
+                              : "/"
                           }}
                         </td>
                         <td>
                           {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
-                              : ""
+                              : "/"
                           }}
                         </td>
                         <td>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -1404,7 +1404,7 @@
                     <tbody>
                       <tr>
                         <td
-                          :colspan="14"
+                          :colspan="15"
                           style="
                             letter-spacing: 5px;
                             text-align: center;
@@ -1434,6 +1434,7 @@
                         <td width="50">超滤量<br />(ml/h)</td>
                         <td width="50">1:9肝素盐水剩余量<br />(ml/h)</td>
                         <td width="50">体温<br />(ml/h)</td>
+                        <td width="50">病情变化及处理</td>
                         <td width="50">签名<br /></td>
                      
                       </tr>
@@ -1455,6 +1456,9 @@
                         <td width="50">{{monitor.ultrafiltration_volume }}<br /></td>
                         <td width="50">{{monitor.heparin }}<br /></td>
                         <td width="50">{{monitor.temperature }}<br /></td>
+                        <td width="50">{{ monitor.symptom }} &nbsp;{{
+                                monitor.dispose
+                              }}</td>
                         <td width="50">
                           <span v-if="monitor.creator == 0">
                             <span

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -443,7 +443,7 @@
                       {{ afterdialysis.breathing_rate }} 次/分
                     </span>&nbsp;
                     BP: <span>
-                      {{ afterdialysis.systolic_blood_pressure }} mmHg / {{ afterdialysis.diastolic_blood_pressure }}mmHg
+                      {{ afterdialysis.systolic_blood_pressure }}  / {{ afterdialysis.diastolic_blood_pressure }}mmHg
                     </span>&nbsp;
                   </div>
                 </td>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -58,23 +58,22 @@
       </printSeven>
       <print10191 :info="info" v-if="org_id == 10191"></print10191>
       <printTen :info="info" v-if="org_id == 10210"></printTen>
-      <printEleven v-if="org_id == 10485 || org_id == 0"></printEleven>
+      <printEleven :info="info" v-if="org_id == 10485 || org_id == 0"></printEleven>
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
             org_id != 0 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 && this.paramsObj.balance_accounts_type == 1">
-      </printOne>
+            org_id != 10485 &&
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 && this.paramsObj.balance_accounts_type == 1"></printOne>
+
 
       <privateChargePrint  :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 0 && this.paramsObj.balance_accounts_type == 2">
-      </privateChargePrint>
-
-
+            org_id != 0 &&
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>
     </div>
   </div>
 </template>
@@ -489,7 +488,7 @@
                   console.log("this.num", this.num);
                 }
               });
-            } else if (this.org_id == 10028 ||  this.org_id == 0  || this.org_id == 9504) {
+            } else if (this.org_id == 10028  || this.org_id == 9504) {
               getPrivateExpenses(params).then((response) => {
                 if (response.data.state == 0) {
                   // this.$message.error(response.data.msg)
@@ -533,8 +532,7 @@
                   console.log(111, this.balanceAccounts);
                 }
               });
-            } else
-            {
+            } else {
               getPrivateExpensesOrder(params).then((response) => {
                 if (response.data.state == 0) {
                   // this.$message.error(response.data.msg)
@@ -623,6 +621,7 @@
                   that.info["order_infos"] = response.data.data.order_infos;
                   that.info["diagnosis"] = response.data.data.diagnosis;
                   that.info["his"] = response.data.data.his;
+                  that.info["order"] = response.data.data.order;
 
                   let obj = {
                     type: 1,
@@ -684,9 +683,12 @@
                     that.info.enddate = that.getTimes(that.paramsObj.end_time);
                   }
 
-                  that.info.order_infos.map((item) => {
+                  console.log("~~~~~~~~")
+                  console.log(that.info)
+                  console.log("~~~~~~~~")
+
+
 
-                  });
 
                 }
               });

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -105,9 +105,9 @@
           <td colspan="8">个人现金支付金额：{{info.psn_cash_pay}}</td>
         </tr>
         <tr>
-          <td colspan="2">家属或参保人签名：</td>
-          <td colspan="2">收费员签名：</td>
-          <td colspan="2">医院盖章：</td>
+          <td colspan="2" >家属或参保人签名：</td>
+          <td colspan="2" >收费员签名：</td>
+          <td colspan="2" >医院盖章：</td>
         </tr>
         <tr>
           <td colspan="8">医师签名：</td>
@@ -118,6 +118,7 @@
 </template>
 <script>
 import { uParseTime } from '@/utils/tools'
+
 export default {
   data() {
     return {
@@ -211,4 +212,5 @@ export default {
     border: none;
   }
 }
+
 </style>

src/xt_pages/role/admin.vue

@@ -68,7 +68,7 @@
           style="float:left"
           @click="toTestSeven">添加合同签署人</el-button> -->
 
-        <el-button 
+        <!-- <el-button 
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -76,10 +76,10 @@
           @click="toTestTen"
           >
            短信验证码
-          </el-button> 
+          </el-button>  -->
 
          
-         <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -92,7 +92,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestElement">创建企业用章</el-button>
+          @click="toTestElement">创建企业用章</el-button> -->
           
      </div>
     

src/xt_pages/stock/detail/print.vue

@@ -25,6 +25,8 @@
               <td style="line-height: 50px" width="50">序号</td>
               <td style="line-height: 50px" width="200">耗材名称</td>
               <td style="line-height: 50px" width="200">规格型号</td>
+              <td style="line-height: 50px" width="200" v-if="org_id == 10485">生产厂商</td>
+              <td style="line-height: 50px" width="200" v-if="org_id == 10485">经销商</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height: 50px" width="50">单位</td>
 
@@ -48,6 +50,13 @@
                 {{item.specification_name}}
               </td>
 
+              <td style="line-height: 50px" v-if="org_id == 10485">
+                {{getManufacterName(item.manufacturer) }}
+              </td>
+              <td style="line-height: 50px" v-if="org_id == 10485">
+                {{getDealerName(item.dealer) }}
+              </td>
+
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2">
@@ -118,7 +127,8 @@
             </tr>
           </table>
 
-          <div style="display:flex;margin-top:20px;float:right;">
+          <div style="display:flex;margin-top:20px;float:right;" v-if="org_id!=10485 && org_id!=0">
+
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"></div>
@@ -126,6 +136,13 @@
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
 
+          <div  v-if="org_id==10485 || org_id==0"  style="display:flex;margin-top:20px;float:right;">
+            <div style="width:150px;">制单人(仓管)：</div><div style="width:100px;"></div>
+            <div style="width:80px;"></div><div style="width:100px;"></div>
+            <div style="width:50px;"></div><div style="width:100px;"></div>
+            <div style="width:50px;"></div><div style="width:100px;"></div>
+            <div style="width:70px;">领取人：</div><div style="width:100px;"></div>
+         </div>
         </div>
 
       </div>
@@ -174,6 +191,8 @@
         org_id:this.$store.getters.xt_user.org.id,
         informationList:[],
         wareOutList:[],
+        manufacturerList:[],
+        dealerList:[]
       }
     },
     methods: {
@@ -400,6 +419,8 @@
           var total =   response.data.data.total
           var list = response.data.data.list
           this.wareOutList = list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.dealerList = response.data.data.dealerList
         }
       })
      },
@@ -480,6 +501,24 @@
          }
       }
       return total
+    },
+    getManufacterName(id){
+      var manufacturer_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+         if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+         }
+       }
+       return manufacturer_name
+    },
+    getDealerName(id){
+      var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+             dealer_name =this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
     }
     },
     created() {

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -19,6 +19,8 @@
               <td style="line-height: 50px" width="50">序号</td>
               <td style="line-height: 50px" width="250">药品名称</td>
               <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="250" v-if="org_id == 0||org_id==10485">生产厂家</td>
+              <td style="line-height: 50px" width="250" v-if="org_id == 0||org_id==10485">经销商</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80">单价</td>
@@ -36,6 +38,12 @@
               <td style="line-height: 50px">
                 <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
+              <td style="line-height: 50px" v-if="org_id == 0||org_id==10485">
+                {{getManufacterName(item.manufacturer) }}
+              </td>
+              <td style="line-height: 50px" v-if="org_id == 0||org_id==10485">
+                {{getDealerName(item.dealer) }}
+              </td>
               <td style="line-height: 50px">
                 <span v-if="org_id == 9671 || org_id == 9919 ">{{item.max_unit}}</span>
                 <span v-else>{{item.min_unit}}</span>
@@ -70,15 +78,24 @@
             </tbody>
           </table> -->
 
-          <div style="display:flex;margin-top:20px;float:right;">
+          <div style="display:flex;margin-top:20px;float:right;" v-if="org_id!=10485 && org_id!=0">
+
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;"></div>
             <div style="width:50px;">审核：</div><div style="width:100px;"></div>
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-          </div>
         </div>
 
+        <div  v-if="org_id==10485 || org_id==0"  style="display:flex;margin-top:20px;float:right;">
+          <div style="width:150px;">制单人(仓管)：</div><div style="width:100px;"></div>
+          <div style="width:80px;"></div><div style="width:100px;"></div>
+          <div style="width:50px;"></div><div style="width:100px;"></div>
+          <div style="width:50px;"></div><div style="width:100px;"></div>
+          <div style="width:70px;">领取人：</div><div style="width:100px;"></div>
+        </div>
+       </div>
+
       </div>
 
     </div>
@@ -120,7 +137,9 @@
         page:this.$route.query.page,
         cancelStockDate:[],
         drugList:[],
-        org_id:0
+        org_id:0,
+        manufacturerList:[],
+        dealerList:[]
       }
     },
     methods: {
@@ -232,6 +251,8 @@
                   min_number:item.XtBaseDrug.min_number,
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
+                  manufacturer:item.XtBaseDrug.manufacturer,
+                  dealer:item.XtBaseDrug.dealer
                 }
               }
             })
@@ -245,6 +266,9 @@
             }
             console.log("list2334444",newArr)
             this.cancelStockDate = newArr
+
+            this.manufacturerList = response.data.data.manufacturerList
+            this.dealerList    = response.data.data.dealerList
           }
         })
       },
@@ -329,7 +353,25 @@
           count+= val[i].count
         }
         return (count*price).toFixed(2)
-      }
+      },
+      getManufacterName(id){
+      var manufacturer_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+         if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+         }
+       }
+       return manufacturer_name
+    },
+    getDealerName(id){
+      var dealer_name = ""
+       for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+             dealer_name =this.dealerList[i].dealer_name
+          }
+       }
+       return dealer_name
+    }
     },
     created() {
       this.org_id = this.$store.getters.xt_user.org.id

src/xt_pages/user/inspection.vue

@@ -142,15 +142,15 @@
                 min-width="80"
               >
                 <template slot-scope="scope">
-                  <div v-if="items[0].value.indexOf('http') < 0">
-                    <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
-                    <span v-else>{{ scope.row.value }}</span>
-                    <span v-if="scope.row.range_type == 1">
-                  {{ scope.row.value_direction }}
-                </span>
-                  </div>
+                    <div v-if="items[0].value.indexOf('http') < 0">
+                      <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
+                      <span v-else>{{ scope.row.value }}</span>
+                      <span v-if="scope.row.range_type == 1">
+                    {{ scope.row.value_direction }}
+                    </span>
+                    </div>
                   <div v-else>
-                    <img :src="scope.row.value">
+                    <img :src="scope.row.value"> 
                   </div>
                 </template>
               </el-table-column>
@@ -202,7 +202,7 @@
                               content="点击查看大图"
                               placement="top-start"
                               >
-                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt=""> 
                               </el-tooltip>
                           </div>
                         </div>
@@ -630,7 +630,8 @@ export default {
       return false
     },
     handleAvatarSuccess(res, file) {
-      console.log("")
+      console.log("RESPOWOWOWOWO",res)
+      console.log("wowowowow",file)
       this.form.imgs.push({
         img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
         desc: '',
@@ -1134,11 +1135,11 @@ export default {
         this.$message.error('未上传图片')
         return false
       }
+      console.log("form",this.form)
       CreatePatientPICInspection(
         this.patientID,
         this.form
-      )
-        .then(response => {
+      ).then(response => {
           if (response.data.state === 1) {
             this.$notify({
               title: '成功',
@@ -1294,7 +1295,7 @@ export default {
             }
             console.log("inspectionsMap",this.inspectionsMap)
             var items = this.project.inspection_reference
-            console.log("i5ems2323232wo",items)
+            console.log("时间",items)
             for (var index in items) {
 
              console.log("obj",items[index])
@@ -1313,7 +1314,7 @@ export default {
 
 
 
-                  if(this.org_id == 10121 || this.org_id == 0 ){
+                  if(this.org_id == 10121){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{
@@ -1346,16 +1347,24 @@ export default {
                   item.value_direction = '↑'
                 }
               }
-              // console.log("items23233232",item)
-              if(item.item_name!=""){
+              console.log("items23233232",item)
+              if(this.org_id!=0&& this.org_id!=10503){
+                if(item.item_name!=""){
+                 this.items.push(item)
+               }
+              }else{
                 this.items.push(item)
               }
+             
 
-              console.log("items232232332wo",this.items)
+              console.log("items232232332wo",item.value.indexOf('http'))
 
-              if(item.value.indexOf("http") >= 0){
+              if(item.value.indexOf("http") >= -1){
                 this.isPic = true
               }
+              
+              
+              console.log("isPicwowowow",this.items)
             }
           }
         })

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -196,9 +196,17 @@
                     </span>
                 </div>
                 <div class="printCell">
-                   血管通路:
+                  血管通路:
+                  <span v-if="org_id!=0&& org_id!=10375">
                     <span v-if="type ==1">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                     <span v-if="type ==2">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
+                  </span>
+
+                  <span v-if="org_id == 0 || org_id == 10375">
+                   <span v-if="type ==1">{{getBloodAccess(main_collection.dialysissolution.blood_access)}} </span>
+                   <span v-if="type ==2">{{getBloodAccess(main_collection.dialysissolution.blood_access)}} </span>
+                  </span>
+                 
                 </div>
                 
                 <div class="printCell">