新分支

src/api/role/admin.js

@@ -138,7 +138,7 @@ export function toTestFive(params){
 export function toTestSeven(params){
  
   return request({
-    url:"api/sign/addcontractsignatory",
+    url:"/api/sign/addcontractsignatory",
     method:"Get",
     params:params
   })
@@ -151,4 +151,29 @@ export function toTestEight(params){
     method:"Get",
     params:params,
   })
+}
+
+export function toTestNight(params){
+  
+  return request({
+    url:"/api/sign/createbackstagesign",
+    method:"get",
+    params:params
+  })
+}
+
+export function toTestTen(params){
+  return request({
+    url:"/api/sign/getverificationcode",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function toTestElement(params){
+  return request({
+    url:"/api/sign/totestelment",
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -69,12 +69,24 @@
                 </div>
                 岁
               </div>
-              <div class="inline_block">
+              <!-- <div class="inline_block">
                 门诊：
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 1"></check-box>
                 </div>
+              </div> -->
+              <div class="inline_block" v-if="record.receive_assessment.condition == 2 || record.receive_assessment.condition == 0">
+                  门诊：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.receive_assessment.condition == 2 || record.receive_assessment.condition == 0"></check-box>
+                </div>
+             </div>
+            <div class="inline_block" v-if="record.receive_assessment.condition == 1">
+              住院：
+              <div class="under_line" style="width: 30px; text-align: center">
+                <check-box :checked="record.receive_assessment.condition == 1"></check-box>
               </div>
+            </div>
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
@@ -1880,10 +1892,16 @@
                   </div>
                   岁
                 </div>
-                <div class="inline_block">
+                <div class="inline_block" v-if="record.receive_assessment.condition == 2 || record.receive_assessment.condition == 0">
                   门诊：
                   <div class="under_line" style="width: 30px; text-align: center">
-                    <check-box :checked="record.patient.source == 1"></check-box>
+                    <check-box :checked="record.receive_assessment.condition == 2 || record.receive_assessment.condition == 0"></check-box>
+                  </div>
+                </div>
+                <div class="inline_block" v-if="record.receive_assessment.condition == 1">
+                  住院：
+                  <div class="under_line" style="width: 30px; text-align: center">
+                    <check-box :checked="record.receive_assessment.condition == 1"></check-box>
                   </div>
                 </div>
                 <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -65,10 +65,16 @@
             </div>
             岁
           </div>
-          <div class="inline_block">
-            门诊：
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition == 2 || receiverTreatmentAccess.condition == 0">
+              门诊：
+              <div class="under_line" style="width: 30px; text-align: center">
+                <check-box :checked="receiverTreatmentAccess.condition == 2 || receiverTreatmentAccess.condition == 0"></check-box>
+              </div>
+            </div>
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition == 1">
+            住院：
             <div class="under_line" style="width: 30px; text-align: center">
-              <check-box :checked="patientInfo_source_1"></check-box>
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
             </div>
           </div>
           <div class="inline_block">
@@ -1704,10 +1710,16 @@
               </div>
               岁
             </div>
-            <div class="inline_block">
+            <div class="inline_block" v-if="receiverTreatmentAccess.condition == 2 || receiverTreatmentAccess.condition == 0">
               门诊：
               <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="patientInfo_source_1"></check-box>
+                <check-box :checked="receiverTreatmentAccess.condition == 2 || receiverTreatmentAccess.condition == 0"></check-box>
+              </div>
+            </div>
+            <div class="inline_block" v-if="receiverTreatmentAccess.condition == 1">
+              住院：
+              <div class="under_line" style="width: 30px; text-align: center">
+                <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
               </div>
             </div>
             <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -39,8 +39,8 @@
                 <td>性别： {{ patientInfo_gender_1 ? "男" : "女" }}</td>
                 <td>年龄：{{ getAge(patientInfo) }}岁</td>
                 <td>门诊号： {{
-                    patientInfo.admission_number
-                      ? patientInfo.admission_number
+                    patientInfo.dialysis_no
+                      ? patientInfo.dialysis_no
                       : "/"
                   }}</td>
               </tr>
@@ -131,7 +131,7 @@
                         }}次/分
                       </span>&nbsp;
                     BP <span>
-                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} mmHg/
+                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} /
                         {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }}mmHg
                       </span>&nbsp;
                   </div>
@@ -488,7 +488,7 @@
                 </td>
                 <td width="8%">核对护士：</td>
                 <td width="10%">
-                  <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                  <span>{{getAdminUser(check==null?0:check.modifier)}}</span>
                   <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else> -->
                 </td>
                 <td width="8%">下机护士：</td>
@@ -1313,6 +1313,17 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
+
+        var docArr = []
+        if(this.doctor_advices!=null && this.doctor_advices.length>0){
+           for(let i=0;i<this.doctor_advices.length;i++){
+             if(this.doctor_advices[i].delivery_way!='口服'){
+                docArr.push(this.doctor_advices[i])
+             }
+           }
+        }
+        this.doctor_advices = [] 
+        this.doctor_advices = docArr
         // console.log(this.advice_groups);
       } else {
         this.loading = false;

src/xt_pages/role/admin.vue

@@ -28,59 +28,71 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestOne">创建个人用户实名</el-button> -->
+          @click="toTestOne">创建个人用户实名</el-button>
 
-          <!-- <el-button
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestFive">创建企业用户并实名</el-button> -->
+          @click="toTestFive">创建企业用户并实名</el-button>
+
 
 
-          <!-- <el-button
+
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestFour">添加企业成员</el-button> -->
+          @click="toTestFour">添加企业成员</el-button>
          
-          <!-- <el-button
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestTwo">创建个人印章</el-button> -->
+          @click="toTestTwo">创建个人印章</el-button>
 
-           <!-- <el-button
+           <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestThree">创建合同</el-button>
+          @click="toTestThree">创建合同</el-button>  -->
 
-          <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestSeven">添加合同签署人</el-button> -->
 
+        <el-button 
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestTen"
+          >
+           短信验证码
+          </el-button> 
+
          
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTestNight">后台签署</el-button> -->
+          @click="toTestNight">后台签署</el-button>
           
 
-          <!-- <el-button   type="primary"
+          <el-button
+          type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
-          style="float:left"  @click="toTestEight">
-            脚本
-          </el-button> -->
+          style="float:left"
+          @click="toTestElement">创建企业用章</el-button>
           
      </div>
     
@@ -236,7 +248,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -593,12 +605,32 @@ export default {
     },
     toTestNight(){
       toTestNight().then(response=>{
+        if(response.data.state == 1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+          this.$message.success("保存")
+          var maprequest = response.data.data.maprequest
+          console.log("maprequest",maprequest)
+        }
+      })
+    },
+    toTestTen(){
+      toTestTen().then(response=>{
         if(response.data.state == 1){
           var sign =  response.data.data.sign
           console.log("sign",sign)
           this.$message.success("保存")
         }
       })
+    },
+    toTestElement(){
+      toTestElement().then(response=>{
+         if(response.data.state == 1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+          this.$message.success("保存")
+         }
+      })
     }
   },
   watch: {

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -69,6 +69,11 @@
             :class="signAndWeighBoxPatients"
             border
           >
+          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
+              <template slot-scope="scope">
+                <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                  {{getGoodTypeName(scope.row.good_type_id)}}
@@ -79,6 +84,7 @@
                 {{scope.row.good_name}}
               </template>
             </el-table-column>
+
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}

src/xt_pages/user/inspection.vue

@@ -630,6 +630,7 @@ export default {
       return false
     },
     handleAvatarSuccess(res, file) {
+      console.log("")
       this.form.imgs.push({
         img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
         desc: '',
@@ -847,9 +848,7 @@ export default {
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
           value: '',
-          select_options: this.project.inspection_reference[
-            index
-            ].range_options.split(','),
+          select_options: this.project.inspection_reference[index].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
         })
       }

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -170,14 +170,30 @@
                 </div>
                 <div class="printCell">
                    透析器:
-                    <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
-                    <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
+                    <span v-if="org_id!=0&&org_id!=10375">
+                      <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
+                      <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
+                    </span>
+                   
+
+                    <span v-if="org_id == 0 || org_id ==10375">
+                      <span v-if="type ==1">{{main_collection.dialysissolution.dialysis_dialyszers}} </span>
+                      <span v-if="type ==2">{{main_collection.dialysissolution.dialysis_dialyszers}} </span>
+                    </span>
                   
                 </div>
                 <div class="printCell">
                    灌流器:
+                   <span v-if="org_id!=0&&org_id!=10375">
                     <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_irrigation}} </span>
                     <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_irrigation}} </span>
+                   </span>
+                 
+
+                    <span v-if="org_id == 0 || org_id == 10375"> 
+                      <span v-if="type ==1">{{main_collection.dialysissolution.dialysis_irrigation}} </span>
+                      <span v-if="type ==2">{{main_collection.dialysissolution.dialysis_irrigation}} </span>
+                    </span>
                 </div>
                 <div class="printCell">
                    血管通路:
@@ -195,11 +211,20 @@
                 </div>
 
                 <div class="printCell">
-                  <span>
+                  <span v-if="org_id!=0&&org_id!=10375">
                     排班备注：
                     <span  style="width:auto;">
+                     <span>
                       {{ main_collection.dialysis_order.schedule_remark }}
+                    </span>  
                     </span>
+                  
+                  </span>
+                  <span v-if="org_id == 0 || org_id ==10375">
+                    排班备注：
+                    <sapn v-if="main_collection.schedule_type ==1">上午</sapn>
+                    <sapn v-if="main_collection.schedule_type ==2">下午</sapn>
+                    <sapn v-if="main_collection.schedule_type ==3">晚上</sapn>
                   </span>
                  
                 </div>