Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/data/components/addDrugs.vue

@@ -404,10 +404,21 @@
                                 <el-checkbox label="注射类">注射类</el-checkbox>
                             </el-checkbox-group>
                         </el-form-item>
-                        <el-form-item label="限制说明 : " prop="limit_remark" style="width:100%;">
+                        <el-form-item label="药品追溯码 : " prop="limit_remark" style="width:100%;">
                             <el-input type="form.restrictions" :rows="2" placeholder="请输入内容"
                                       v-model="form.limit_remark"></el-input>
                         </el-form-item>
+
+                        <el-form-item label="是否显示: " prop="limit_remark" style="width:100%;">
+                          <el-select v-model="form.is_show" style="width:160px;" filterable placeholder="请选择">
+                                <el-option
+                                        v-for="(item,index) in showList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                          </el-select>
+                        </el-form-item>
                     </el-form>
                 </div>
             </el-tab-pane>
@@ -643,6 +654,7 @@
           bbx01:"",
           bby01:"",
           is_project:"",
+          is_show:"",
         },
 
         rules: {
@@ -701,7 +713,8 @@
           id: "2",
           name: "否"
         }],
-        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}]
+        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}],
+        showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
@@ -974,7 +987,7 @@
         form['bbx01'] = this.form.bbx01
         form['bby01'] = this.form.bby01
         form['is_project'] = this.form.is_project
-
+        form['is_show'] = this.form.is_show
         return form
       },
       getlist() {

src/xt_pages/data/components/addProject.vue

@@ -249,6 +249,17 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+
+                    <el-form-item label="是否显示:" prop="is_advice">
+                        <el-select v-model="form.is_show" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in showList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -314,6 +325,7 @@ export default {
               is_print:"",
               bbx01:"",
               bby01:"",
+              is_show:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -334,7 +346,8 @@ export default {
            ],
            limit:100,
            page:1,
-           departMentList:[]
+           departMentList:[],
+           showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
         }
     },
     methods:{
@@ -410,8 +423,9 @@ export default {
                     social_security_directory_code:this.form.social_security_directory_code,
                     record_date:this.form.record_date,
                     is_print:parseInt(this.form.is_print),
-                   bbx01:this.form.bbx01,
-                   bby01:this.form.bby01,
+                    bbx01:this.form.bbx01,
+                    bby01:this.form.bby01,
+                    is_show:parseInt(this.form.is_show)
                }
              console.log("params222222",params)
               saveProject(params).then(response=>{

src/xt_pages/data/components/consumables.vue

@@ -352,7 +352,8 @@
               number:"",
               is_warehouse:"1",
               bbx01:"",
-              bby01:""
+              bby01:"",
+              is_show:"",
             },
             isVisibility: false,
           }
@@ -772,6 +773,12 @@
 
             this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
 
+            //  if(response.data.data.goodInfo.is_show<=0){
+            //    this.goodInfo.goodInfoDialog.formValue.is_show = ''
+            //   }else{
+            //     this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
+            //   }
+
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
           }

src/xt_pages/data/components/drugs.vue

@@ -319,7 +319,7 @@
           is_record: '',//是否备案
           agent: '',// 代理商
           drug_status: '',// 状态
-          limit_remark: '',//限制说明
+          limit_remark: '',//药品追溯码
           delivery_way: '',//默认给药途径
           execution_frequency: '',//默认执行频率
           single_dose: '',//默认单次用量
@@ -341,6 +341,7 @@
           is_user:"",
           bbx01:"",
           bby01:"",
+          is_show:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -741,6 +742,12 @@
                 this.formValue.is_project = this.formValue.is_project.toString()
               }
 
+              // if(this.formValue.is_show<=0){
+              //     this.formValue.is_show = ''
+              // }else{
+              //   this.formValue.is_show = this.formValue.is_show.toString()
+              // }
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 

src/xt_pages/data/components/editProject.vue

@@ -251,6 +251,16 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否显示:" prop="is_advice">
+                        <el-select v-model="form.is_show" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in showList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -320,6 +330,7 @@ export default {
               is_print:"",
               bbx01:"",
               bby01:"",
+              is_show:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -345,7 +356,8 @@ export default {
            departMentList:[],
            statisticsCategoryList:[],
            tubeColorList:[],
-           costClassifyList:[]
+           costClassifyList:[],
+           showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
         }
     },
     methods:{
@@ -456,6 +468,12 @@ export default {
                 this.form.is_print = projecDetail.is_print
               }
 
+              // if(projecDetail.is_show == 0){
+              //   this.form.is_show = ""
+              // }else{
+              //   this.form.is_show = projecDetail.is_show.toString()
+              // }
+
             }
          })
        },
@@ -500,7 +518,8 @@ export default {
                     record_date:this.form.record_date,
                     bbx01:this.form.bbx01,
                     bby01: this.form.bby01,
-                    is_print:parseInt(this.form.is_print)
+                    is_print:parseInt(this.form.is_print),
+                    is_show:parseInt(this.form.is_show)
                }
 
               updatedProject(params).then(response=>{

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1476,7 +1476,12 @@
                         </div>
                       </div>
 
-                      
+                      <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id == 0|| org_id ==10598">
+                        在线Kt/V监测：
+                        <div class="under_line" style="width: 30px; text-align: center">
+                           <check-box :checked="true"></check-box>
+                         </div>
+                      </div>
                       <div
                         class="row"
                         style="padding: 2px 0; line-height: 23px; display: flex"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -62,10 +62,10 @@
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45 && this.$store.getters.xt_user.template_info.org_id != 10600">
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 0&& this.$store.getters.xt_user.template_info.org_id != 10694">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65  && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65  && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10694">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65 || this.$store.getters.xt_user.template_info.org_id == 10600 || this.$store.getters.xt_user.template_info.org_id == 10694)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
             
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
@@ -87,7 +87,7 @@
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_zongliang != "0" ? "ml" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">
-               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675  || this.$store.getters.xt_user.template_info.org_id == 10694">
                   {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
               </span>
               <span v-else>
@@ -95,7 +95,7 @@
               </span>
             </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">
-              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10694">
                   {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
               </span>
               <span v-else>

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

@@ -1264,27 +1264,27 @@
             this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
             this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
             
-            if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10480){
-              console.log("尽量",last_predialysis_evaluation)
-              console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
-              if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
-
-                // var blood_id = 0
-                // console.log("SHJU232323",this.blood_access_part_opera)
-                // for(let i= 0;i<this.blood_access_part_opera.length;i++){
-                //     if(last_predialysis_evaluation.blood_access_part_opera_id == this.blood_access_part_opera[i].id){
-                //       blood_id = this.blood_access_part_opera[i].name
-                //     }
-                // }
-                // console.log("blood_id-----",blood_id)
-                if(last_predialysis_evaluation.blood_access_part_opera_id >0){
-                  this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
-                }
-              
-                this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
+          
+            console.log("尽量",last_predialysis_evaluation)
+            console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
+            if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
+
+              // var blood_id = 0
+              // console.log("SHJU232323",this.blood_access_part_opera)
+              // for(let i= 0;i<this.blood_access_part_opera.length;i++){
+              //     if(last_predialysis_evaluation.blood_access_part_opera_id == this.blood_access_part_opera[i].id){
+              //       blood_id = this.blood_access_part_opera[i].name
+              //     }
+              // }
+              // console.log("blood_id-----",blood_id)
+              if(last_predialysis_evaluation.blood_access_part_opera_id >0){
+                this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
               }
-             
+            
+              this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
             }
+             
+            
 
           } else {
             if (this.lastPredialysisEvaluation != null) {

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

@@ -2779,6 +2779,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10693){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '6:40'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if (this.$store.getters.xt_user.org.id == 10551){
             var date = new Date()
             var year = date.getFullYear()

src/xt_pages/dialysis/details/index.vue

@@ -277,7 +277,7 @@
               <div class="signPrint" style="width: 360px;font-size:16px;">
                 <div  style="margin-left:50px;">姓名:
                   <span>{{main_collection.patient.name}} </span>
-                  （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁）
+                  （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
                 <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
                   <div style="">透析模式:

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -940,6 +940,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 76">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1445,6 +1457,9 @@
             v-if="org_template_info.template_id == 75">
 
           </DialysisPrintOrderseventyfive>
+          <DialysisPrintOrderSeventysix v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 76">
+          </DialysisPrintOrderSeventysix>
         </div>
       </el-container>
     </div>
@@ -1538,6 +1553,7 @@ import DialysisPrintOrderSeventyTwo from './template/DialysisPrintOrderSeventyTw
 import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
 import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
+import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1617,6 +1633,7 @@ export default {
     DialysisPrintOrderSeventythree,
     DialysisPrintOrderSop,
     DialysisPrintOrderseventyfive,
+    DialysisPrintOrderSeventysix,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -1798,7 +1815,7 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;} .row1{ border-left: 1px solid black;padding: 5px 5px;} .row2{ border-left:1px solid black; border-right:1px solid black; border-bottom:1px solid black;} .inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;} .row1{ border-left: 1px solid black;padding: 5px 5px;} .row2{ border-left:1px solid black; border-right:1px solid black; border-bottom:1px solid black;} .inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 0px 5px;line-height: 16px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 0px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
@@ -2299,6 +2316,13 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 76) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -724,39 +724,42 @@
 
         <table class="print-table" border="1" style="line-height:30px;">
           <tr style="line-height:20px;">
-            <td style="min-width:60px">时间</td>
-            <td style="min-width:60px">
+            <td style="width:60px">时间</td>
+            <td style="width:60px">
               血压
               <br />(mmHg)
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               心率
               <br />次/分
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               血流量
               <br />ml/min
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               静脉压
               <br />(mmHg)
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               跨膜压
               <br />(mmHg)
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               超滤率
               <br />L/h
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               超滤量
               <br />L
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               NA⁺
               <br />
             </td>
+            <td style="width:60px">透析液温度<br/>℃</td>
+            <td style="width:60px">血容量<br/>L</td>
+            <td style="width:60px">kt/v</td>
             <td style="min-width:60px">病情变化及处理</td>
             <td style="min-width:110px">护士签名核对者</td>
           </tr>
@@ -780,6 +783,10 @@
             <td>{{ monitor.ultrafiltration_rate }}</td>
             <td>{{ monitor.ultrafiltration_volume }}</td>
             <td>{{ monitor.sodium_concentration }}</td>
+            <td>{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ""}}</td>
+            <td>{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
+            <td>{{ monitor.ktv ? monitor.ktv : "" }}</td>
+            <!-- 病情变化及处理 -->
             <td>
               <span style="line-height:18px;display:block;">
                 {{ monitor.symptom }}&nbsp;{{ monitor.dispose }}&nbsp;{{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1525,6 +1525,8 @@
                       </div>
                     </div>
 
+                  
+
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id ==10683">
                       上机时间：
                       <div
@@ -1535,6 +1537,12 @@
                       </div>
                     </div>
                   </div>
+                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 0  || org_id == 10598">
+                    在线Kt/V监测：
+                    <div class="under_line" style="width: 30px; text-align: center">
+                      <check-box :checked="true"></check-box>
+                    </div>
+                  </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 3877  || org_id == 9671">
                     <div
@@ -1955,8 +1963,8 @@
                         <td></td>
                         <td></td>
                         <td></td>
-                        <td></td>
-                        <td></td>
+                        <td v-if="org_id!=10644"></td>
+                        <td v-if="org_id!=10644"></td>
                         <td v-if="org_id == 10375 || org_id == 0"><br /></td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
@@ -3735,8 +3743,16 @@
           岁
         </div>
         <div class="inline_block" style="margin-left: 10px;">
+          透析日期：
+          <div class="under_line" style="width: 100px;text-align: left">
+            {{ xtdate }}
+          </div>
+        </div>
+      </div>
+      <div class="row" style="margin-top: 15px">
+        <div class="inline_block" style="">
           诊断：
-          <div class="under_line" style="width:180px;text-align: left">
+          <div class="under_line" style="width:180px;text-align: left;white-space: normal;">
             {{ patientInfo.diagnose }}
           </div>
         </div>
@@ -4775,9 +4791,10 @@ export default {
           this.doctor_advices[index]["isShow"] = 2;
         }
 
+          
+        console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
+        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id==10478){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -4793,7 +4810,7 @@ export default {
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
 
         //华池
-        if(this.org_id == 0 || this.org_id == 10440){
+        if(this.org_id == 10440){
            var parint_id =0
            var newArr = []
            if(this.doctor_advices!=null&&this.doctor_advices.length>0){
@@ -4815,7 +4832,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644 || this.org_id ==0 || this.org_id ==10478){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -188,18 +188,21 @@
                 <span v-if="prescription.anticoagulant_name == '那屈肝素钙'"> 
                   {{  prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }} IU
                 </span>
-                <span v-if="prescription.anticoagulant_name == '肝素钠'">
+                <span >
                     
                 </span>
             </div>
           </div>
           <div class="inline_block" style="flex: 1;">
-            首剂:
+            肝素钠首剂:
             <div class="under_line"
               style=" width: 60%;
                 text-align: left; white-space: normal;
               ">
+              <span v-if="prescription.anticoagulant_name == '肝素钠'">
                 {{prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "0" }} &nbsp;
+              </span>
+              <span v-else>/</span>
             </div>
            
             <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
@@ -217,7 +220,10 @@
               style=" width: 60%;
                 text-align: left; white-space: normal;
               ">
+              <span v-if="prescription.anticoagulant_name == '肝素钠'">
                 {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "0" }} &nbsp;
+              </span>
+              <span>/</span>
             </div>
             <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
             <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -374,7 +374,7 @@
 
                 <div style="margin-left:50px;">姓名:
                   <span>{{ main_collection.patient.name }} </span>
-                  （{{ main_collection.patient.dialysis_no }}，{{ getNewAge(main_collection.patient.id_card_no) }}岁）
+                  （{{ main_collection.patient.dialysis_no }}，{{ getNewAge(main_collection.patient.id_card_no) }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
                 <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
                   <div style="">透析模式:

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1814,32 +1814,62 @@
                 //药品
                 for (let b = 0; b < prescription.advices.length; b++) {
                   console.log("prescription.advices[b].drug.drug_status.startsWith('停用')",prescription.advices[b].drug.drug_status.startsWith('停用'))
-                  if(prescription.advices[b].drug!=null && prescription.advices[b].drug.drug_status.startsWith('停用')  == false){
-                    let obj = {
-                    advice_id: prescription.advices[b].id,
-                    drug_name: prescription.advices[b].advice_name,
-                    single_dose: prescription.advices[b].single_dose,
-                    delivery_way: prescription.advices[b].delivery_way,
-                    execution_frequency: prescription.advices[b].execution_frequency,
-                    retail_price: prescription.advices[b].price.toString(),
-                    remark: prescription.advices[b].remark,
-                    day: prescription.advices[b].day,
-                    prescribing_number: prescription.advices[b].prescribing_number.toString(),
-                    single_dose_unit: prescription.advices[b].single_dose_unit,
-                    prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                    medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id,
-                    drug: prescription.advices[b].drug,
-                    groupno: prescription.advices[b].groupno,
-                    frequency_type: prescription.advices[b].frequency_type,
-                    day_count: prescription.advices[b].day_count,
-                    week_day: prescription.advices[b].week_day,
-                    number:  prescription.advices[b].drug.number
+                  //孝感原生堂做特殊处理
+                  if(this.org_id != 0 && this.org_id!=10598){
+                      if(prescription.advices[b].drug!=null && prescription.advices[b].drug.drug_status.startsWith('停用')  == false){
+                      let obj = {
+                      advice_id: prescription.advices[b].id,
+                      drug_name: prescription.advices[b].advice_name,
+                      single_dose: prescription.advices[b].single_dose,
+                      delivery_way: prescription.advices[b].delivery_way,
+                      execution_frequency: prescription.advices[b].execution_frequency,
+                      retail_price: prescription.advices[b].price.toString(),
+                      remark: prescription.advices[b].remark,
+                      day: prescription.advices[b].day,
+                      prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                      single_dose_unit: prescription.advices[b].single_dose_unit,
+                      prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                      medical_insurance_number: prescription.advices[b].med_list_codg,
+                      id: prescription.advices[b].drug_id,
+                      drug: prescription.advices[b].drug,
+                      groupno: prescription.advices[b].groupno,
+                      frequency_type: prescription.advices[b].frequency_type,
+                      day_count: prescription.advices[b].day_count,
+                      week_day: prescription.advices[b].week_day,
+                      number:  prescription.advices[b].drug.number
 
-                  }
-                  tempAdvice.push(obj)
+                    }
+                    tempAdvice.push(obj)
                   }
 
+                  }else{
+                    if(prescription.advices[b].drug!=null){
+                      let obj = {
+                      advice_id: prescription.advices[b].id,
+                      drug_name: prescription.advices[b].advice_name,
+                      single_dose: prescription.advices[b].single_dose,
+                      delivery_way: prescription.advices[b].delivery_way,
+                      execution_frequency: prescription.advices[b].execution_frequency,
+                      retail_price: prescription.advices[b].price.toString(),
+                      remark: prescription.advices[b].remark,
+                      day: prescription.advices[b].day,
+                      prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                      single_dose_unit: prescription.advices[b].single_dose_unit,
+                      prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                      medical_insurance_number: prescription.advices[b].med_list_codg,
+                      id: prescription.advices[b].drug_id,
+                      drug: prescription.advices[b].drug,
+                      groupno: prescription.advices[b].groupno,
+                      frequency_type: prescription.advices[b].frequency_type,
+                      day_count: prescription.advices[b].day_count,
+                      week_day: prescription.advices[b].week_day,
+                      number:  prescription.advices[b].drug.number
+
+                    }
+                    tempAdvice.push(obj)
+                  }
+                  }
+                
                 }
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
@@ -1922,8 +1952,94 @@
                         }
                         tempProject.push(obj)
                     }
-                  }else if(prescription.project[b].type == 3 && prescription.project[b].good_info.good_status.startsWith('停用') == false){
-                    if (this.org_id == 10206 ) {
+                    //针对孝感原生堂
+                  }else if(prescription.project[b].type == 3){
+
+                    if(this.org_id!=0&&this.org_id!=10510 && prescription.project[b].good_info.good_status.startsWith('停用') == false){
+
+                      if (this.org_id == 10206 ) {
+                      let obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project_id,
+                        project_name: prescription.project[b].project.project_name,
+                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total: prescription.project[b].count.toString(),
+                        price: prescription.project[b].price,
+                        remark: prescription.project[b].remark,
+                        medical_code: prescription.project[b].project.medical_code,
+                        type: prescription.project[b].type,
+                        frequency_type: prescription.project[b].frequency_type,
+                        day_count: prescription.project[b].day_count,
+                        week_day: prescription.project[b].week_day,
+                        number_days:prescription.project[b].day
+
+
+                      }
+
+                      if (prescription.project[b].type == 2) {
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['medical_code'] = prescription.project[b].project.medical_code
+                        obj['project_name'] = prescription.project[b].project.project_name
+                        obj['project'] = prescription.project[b].project
+                        obj['unit'] = prescription.project[b].unit
+                        obj['number'] = ""
+
+
+                      } else if (prescription.project[b].type == 3) {
+                        obj['statistical_classification'] = ''
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['good_info'] = prescription.project[b].good_info
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
+                        obj['number'] = prescription.project[b].good_info.good_number
+
+                      }
+                      tempProject.push(obj)
+                    }else{
+                        let obj = {
+                          id: prescription.project[b].id,
+                          project_id: prescription.project[b].project_id,
+                          project_name: prescription.project[b].project.project_name,
+                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          single_dose: prescription.project[b].single_dose,
+                          delivery_way: prescription.project[b].delivery_way,
+                          execution_frequency: prescription.project[b].execution_frequency,
+                          number_days: prescription.project[b].day,
+                          total: prescription.project[b].count.toString(),
+                          price: prescription.project[b].price,
+                          remark: prescription.project[b].remark,
+                          medical_code: prescription.project[b].project.medical_code,
+                          type: prescription.project[b].type,
+                          frequency_type: prescription.project[b].frequency_type,
+                          day_count: prescription.project[b].day_count,
+                          week_day: prescription.project[b].week_day,
+                          number_days:prescription.project[b].day
+
+                        }
+
+                        if (prescription.project[b].type == 2) {
+                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['medical_code'] = prescription.project[b].project.medical_code
+                          obj['project_name'] = prescription.project[b].project.project_name
+                          obj['project'] = prescription.project[b].project
+                          obj['unit'] = prescription.project[b].unit
+                        } else if (prescription.project[b].type == 3) {
+                          obj['statistical_classification'] = ''
+                          obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] = prescription.project[b].good_info.good_name
+                          obj['good_info'] = prescription.project[b].good_info
+                          obj['unit'] = prescription.project[b].good_info.packing_unit
+                        }
+                        tempProject.push(obj)
+                      }
+
+                    }else{
+
+                      if (this.org_id == 10206 ) {
                       let obj = {
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project_id,
@@ -2002,6 +2118,10 @@
                         }
                         tempProject.push(obj)
                       }
+                    }
+
+
+               
                   }
                 }
                 // var preTime = nowTime

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -18,7 +18,6 @@
                 <div v-if="org_id == 10460">就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
                 <div v-else>就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
             </div>
-
             <div class="printTitle">{{orgname}}</div>
             <div class="printTitle">处方、治疗单</div>
             <!-- class="infoTitle" -->
@@ -126,39 +125,40 @@
                     :src="setAdminUserES(item.creator,item.doctor)"
                     alt=""
                     srcset=""
-                    
+
                   />
                 </div>
                 <div style="width: 300px;">签章：</div>
                 <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
             </div>
-
-            <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-                <tr>
-                    <td style="width:16%;">治疗时间</td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                </tr>
-                <tr>
-                    <td style="width:16%;">医生签字</td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                    <td style="width:16%;"></td>
-                </tr>
-                <tr>
-                    <td style="width:16px;">患者签字</td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                    <td style="width:16px;"></td>
-                </tr>
-            </table>
+            <div v-if="org_id !=10478 && org_id !=0">
+              <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+                  <tr>
+                      <td style="width:16%;">治疗时间</td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                  </tr>
+                  <tr>
+                      <td style="width:16%;">医生签字</td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                      <td style="width:16%;"></td>
+                  </tr>
+                  <tr>
+                      <td style="width:16px;">患者签字</td>
+                      <td style="width:16px;"></td>
+                      <td style="width:16px;"></td>
+                      <td style="width:16px;"></td>
+                      <td style="width:16px;"></td>
+                      <td style="width:16px;"></td>
+                  </tr>
+              </table>
+            </div>
             <span v-if="org_id == 10537 || org_id ==0">
             <img
               src="https://kuyi.shengws.com/xuwenwei.jpg"
@@ -577,7 +577,7 @@
 
     .prescriptionBox {
         padding: 0 10px;
-        
+
     }
 
     .Rp {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -320,6 +320,17 @@
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
 
+          <el-form-item label="是否显示: " prop="limit_remark" style="width:100%;">
+              <el-select v-model="form.is_show" style="width:160px;" filterable placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in showList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+              </el-select>
+          </el-form-item>
+
         </el-form>
       </el-tab-pane>
     </el-tabs>
@@ -414,6 +425,7 @@
           is_warehouse:"1",
           bbx01:"",
           bby01:"",
+          is_show:"",
           
         },
 
@@ -458,7 +470,8 @@
          {id: "1",name: "是"},
          {id: "2",name: "否"}
         ],
-        org_id:0
+        org_id:0,
+        showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
@@ -649,6 +662,7 @@
         form["is_warehouse"] = this.form.is_warehouse
         form["bbx01"] = this.form.bbx01
         form["bby01"] = this.form.bby01
+        form["is_show"] = this.form.is_show
 
         return form
       }, changeSelected: function(val) {

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -369,8 +369,8 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=0 && org_id!=10088 && org_id!=10510">
-                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=10088 && org_id!=10510">
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}} </span>
                     <span v-if="is_sys == 0">
                       <!-- <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}} </span>  -->
@@ -378,7 +378,7 @@
                     </span>
                     </span>
 
-                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id==0 || org_id ==10088 || org_id ==10510">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id ==10088 || org_id ==10510">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0">
@@ -1888,6 +1888,40 @@ export default {
         return "spanClass";
       }
     },
+    getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+
+      for(let j=0;j<this.outList.length;j++){
+        if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
+           arr.push(this.outList[j])
+        }
+      }
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+        }
+      }
+     
+      if (total < min_number) {
+         min_str = total;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number)
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number)
+        }
+      }
+      return max_str * min_number + min_str;
+    },
     getOutCountSix(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
       var arr = []
       var total = 0
@@ -2083,7 +2117,7 @@ export default {
       }
       return price
     },
-    getTotalPrice(warehouse_info_id,max_unit,min_unit,min_number){
+    getTotalPrice(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
       
       var arr = []
       var total = 0
@@ -2096,10 +2130,11 @@ export default {
            arr.push(this.tabList[j])
         }
       }
-     
+      total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
+    
+      console.log("taolaa------",total,drug_id)
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
-           total +=arr[i].count
            price = arr[0].price
         }
       }