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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
      // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/config.js

@@ -71,6 +71,7 @@ export function getSystemPrescription(params) {
 
 
 export function postSystemPrescription(params) {
+  console.log("params2222222",params)
   return request({
     url: '/api/systemprescription/commit',
     method: 'post',

src/api/schedule.js

@@ -142,4 +142,12 @@ export function getAllZones(params){
     method:"get",
     params:params
   })
+}
+
+export function copyPatientSchedule(params){
+  return request({
+    url:"/api/schedule/copypatientschedules",
+    method:"Get",
+    params:params
+  })
 }

src/api/stock.js

@@ -121,6 +121,7 @@ export function GetGoodType(params) {
 }
 
 export function createGoodInfo(params) {
+  console.log("prams",params)
   return request({
     url: '/api/stock/good/info/create',
     method: 'post',

src/xt_pages/data/components/addDrugs.vue

@@ -146,14 +146,24 @@
               <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" >
-              <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
+              <!-- <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
                 <el-option
                   v-for="item,index in manufacturers"
                   :key="index"
                   :label="item.manufacturer_name"
                   :value="item.id">
                 </el-option>
-              </el-select>
+              </el-select> -->
+
+            <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="item in manufacturerList"
+                    :key="item.id"
+                    :label="item.manufacturer_name"
+                    :value="item.id">
+                  </el-option>
+            </el-select>
+
             </el-form-item>
             <el-form-item label="药理分类 : " prop="pharmacology_category">
               <el-select v-model="form.pharmacology_category" style="width:160px;" placeholder="请选择">
@@ -333,6 +343,7 @@
   import {
     getAdviceConfig,
   } from '@/api/advice'
+ import { getManufacturerList } from "@/api/stock";
   export default {
     data() {
       return {
@@ -422,7 +433,10 @@
           drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
           drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
           manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }]
-        }
+        },
+        page:1,
+        limit:500,
+        manufacturerList:[]
       }
     },
     props: {
@@ -440,7 +454,7 @@
         type: Number,
         default: 1
       }
-
+      
     },
     methods: {
       cancle: function(formName) {
@@ -574,11 +588,26 @@
 
         return form
       },
+      getlist(){
+         var params = {
+             page:this.page,
+             limit:this.limit
+          }
+          console.log("params2222222",params)
+        getManufacturerList(params).then(response=>{
+           var manufacturerList =   response.data.data.manufacturer
+           console.log("列表2222222",manufacturerList)
+           this.manufacturerList = manufacturerList
+        })
+      }
     }, watch: {
       visible(val) {
         // this.form = this.formValue
 
       }
+    },
+    created(){
+      this.getlist()
     }
   }
 </script>

src/xt_pages/data/components/consumables.vue

@@ -286,12 +286,12 @@
               this.goodInfo.goodInfoDialog.formValue.good_unit =
                 response.data.data.goodInfo.good_unit
             }
-
+           
             if (response.data.data.goodInfo.manufacturer <= 0) {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
             } else {
-              this.goodInfo.goodInfoDialog.formValue.manufacturer =
-                response.data.data.goodInfo.manufacturer
+              this.goodInfo.goodInfoDialog.formValue.manufacturer = response.data.data.goodInfo.manufacturer
+             
             }
 
             if (response.data.data.goodInfo.dealer <= 0) {
@@ -500,6 +500,7 @@
           good_kind:this.good_kind,
           is_charge: this.is_charge,
         }
+        console.log("222222",params)
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
             this.goodInfo.loading = false
@@ -550,7 +551,8 @@
 
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              // this.$message.error(response.data.msg)
+              this.$message.error("同一耗材类型同一规格名称不能重复录入!")
               return false
             } else {
               this.$refs.addConsumable.hide()
@@ -581,8 +583,9 @@
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              // this.$message.error(response.data.msg)
+              // return false
+              this.$message.error("同一耗材类型同一规格名称不能重复录入!")
             } else {
               this.$refs.addConsumable.hide()
               this.getList()

src/xt_pages/data/prescription.vue

@@ -231,12 +231,26 @@
 
                   <el-col :span="8">
                     <el-form-item label="透析器/灌流器：">
-
                       <el-input
                         v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
                     </el-form-item>
                   </el-col>
 
+
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
+                    <el-form-item label="透析器：">
+                      <el-input
+                        v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
+                    <el-form-item label="灌流器：">
+                      <el-input
+                        v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
+                    </el-form-item>
+                  </el-col>
+
                   <el-col :span="8">
                     <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
                       <el-input v-model="addPlan.bicarbonate"></el-input>
@@ -803,7 +817,9 @@ export default {
         displace_liqui_part: "",
         displace_liqui_value: "",
         ultrafiltration: "",
-        blood_access: ""
+        blood_access: "",
+        dialysis_dialyszers:"",
+        dialysis_irrigation:""
       },
       system_prescription: [],
       isEdit: false,
@@ -831,7 +847,9 @@ export default {
       body_fluid_option: [],
       special_medicine_option: [],
       displace_liqui_part_option: [],
-      blood_access_option: []
+      blood_access_option: [],
+      dialysis_dialyszers:"",
+      dialysis_irrigation:"",
     };
   },
   computed: {},
@@ -845,6 +863,28 @@ export default {
           this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
           this.InnerDialogProps.selected = this.addPlan.dialyzer_perfusion_apparatus
           this.InnerDialogProps.isShowTextArea = false
+          break
+         case '6':
+           for(let i=0;i<this.dialyzers.length;i++){
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+           }
+          this.InnerDialogProps.values = this.dialyzers
+          this.InnerDialogProps.titles = '透析器'
+          this.InnerDialogProps.type = 'dialyzers'
+          this.InnerDialogProps.selected = this.dialysis_dialyszers
+          this.InnerDialogProps.isShowTextArea = false
+        
+          break
+        case '7':
+          for(let i=0;i<this.irrigations.length;i++){
+             this.irrigations[i].name = this.irrigations[i].specification_name
+           }
+          this.InnerDialogProps.values = this.irrigations
+          this.InnerDialogProps.titles = '灌流器'
+          this.InnerDialogProps.type = 'irrigations'
+          this.InnerDialogProps.selected = this.dialysis_irrigation
+          this.InnerDialogProps.isShowTextArea = false
+        
           break
       }
     },
@@ -854,7 +894,12 @@ export default {
         case 'dialyzer_perfusion_apparatus':
           this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
           break
-
+        case 'dialyzers':
+          this.dialysis_dialyszers = val.value.join(',')
+         break
+        case 'irrigations':
+          this.dialysis_irrigation = val.value.join(',')
+        break
       }
     },
     innerDialogCancle: function() {
@@ -915,7 +960,10 @@ export default {
         displace_liqui_part: "",
         displace_liqui_value: "",
         ultrafiltration: "",
-        blood_access: ""
+        blood_access: "",
+        stockType:[],
+        irrigations:[],
+        dialyzers:[],
       };
 
       for (const key in tempAddPlan) {
@@ -973,6 +1021,10 @@ export default {
             }
           }
           this.addPlan.mode = id;
+          this.addPlan.dialysis_dialyszers = prescription.dialysis_dialyszers
+          this.addPlan.dialysis_irrigation = prescription.dialysis_irrigation
+          this.dialysis_dialyszers = prescription.dialysis_dialyszers
+          this.dialysis_irrigation = prescription.dialysis_irrigation
         }
       });
     },
@@ -991,12 +1043,43 @@ export default {
           return false;
         } else {
           this.system_prescription = response.data.data.prescriptions;
-
+          
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
               this.isEdit = true;
             }
           }
+          this.stockType =  response.data.data.stockType
+          console.log("2333555555555",this.stockType)
+          if(this.stockType.length >0 ){
+               var arr = []
+                var arrTwo = []
+                for(let i=0;i<this.stockType.length;i++){
+                  if(this.stockType[i].stock_attribute == 2){
+                      arr.push(this.stockType[i])
+                  }
+                  if(this.stockType[i].stock_attribute == 3){
+                      arrTwo.push(this.stockType[i])
+                  }
+                }
+                var dialyzator = []
+                var irrigation = []
+                for(let i=0;i<arr.length;i++){
+                  for(let j=0;j<arr[i].GoodInfo.length;j++){
+                      dialyzator.push(arr[i].GoodInfo[j])
+                  }
+                }
+                console.log("透析器",dialyzator)
+                this.dialyzers = dialyzator
+
+                for(let i=0;i<arrTwo.length;i++){
+                  for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
+                      irrigation.push(arrTwo[i].GoodInfo[j])
+                  }
+                }
+                console.log("灌流器",irrigation)
+                this.irrigations = irrigation
+          }
         }
       });
     },
@@ -1024,6 +1107,8 @@ export default {
     savePrescription: function() {
       this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString();
       if (!this.isEdit) {
+        this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
+        this.addPlan.dialysis_irrigation = this.dialysis_irrigation
         postSystemPrescription(this.addPlan).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -1043,6 +1128,8 @@ export default {
           }
         });
       } else {
+          this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+          this.addPlan.dialysis_dialyszers  = this.dialysis_dialyszers
         updateSystemPrescription(this.addPlan.id, this.addPlan).then(
           response => {
             if (response.data.state == 0) {
@@ -1088,7 +1175,8 @@ export default {
     )
     this.getAllSystemPrescription();
     this.getSystemPrescription(this.addPlan.mode);
-
+    
+   
   },
   watch: {
     "addPlan.dialysis_duration": function() {

src/xt_pages/data/showConfig.vue

@@ -150,7 +150,7 @@ export default {
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-
+    
     for (let i = 0; i < filedList.length; i++) {
       switch (filedList[i].module) {
         case 1:

src/xt_pages/dialysis/PatientBox.vue

@@ -57,7 +57,12 @@
         <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
        
         </p>
-        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
+        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">
+          透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}
+           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_dialyszers:''}}</span>
+           <span v-if="schedule.prescription!=null && schedule.prescription.dialysis_irrigation!=''">/</span>
+           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_irrigation:''}}</span>
+        </p>
       </div>
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
         <ul>
@@ -115,6 +120,7 @@
       :dry_weight="lastDryWeightDislysis"
       :schedual="temp_schedual"
       :date='date'
+      :stockType="stockType"
     ></dialysis-prescription-dialog>
     <treatment-summary-dialog
       title="治疗小结"
@@ -225,6 +231,7 @@ export default {
       temp_schedual: null,
       date:'',
       modedata:0,
+      stockType:"",
     };
   },
   props: {
@@ -391,7 +398,7 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           var patient = resp.data.patient; // 患者信息
-          console.log("患者信息",patient)
+         
           var schedual = resp.data.schedual; // 患者排班信息
           var prescription = resp.data.prescription; // 透析处方
           if(prescription!=null){
@@ -411,10 +418,10 @@ export default {
              }
            }
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
-          //console.log("力气-------", doctor_advices);
+          
           var double_check = resp.data.double_check; // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
-          //console.log("透后品谷数", assessment_after_dislysis);
+        
           var treatment_summary = resp.data.treatment_summary; // 治疗小结
           var monitor_records = resp.data.monitor_records; // 透析监测
           var dialysis_order = resp.data.dialysis_order; // 透析记录
@@ -447,7 +454,10 @@ export default {
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
 
           var system_prescribe = resp.data.system_prescribe;
-
+          
+          var stockType =  resp.data.stockType
+          this.stockType = stockType
+          console.log("元单快乐222222",this.stockType)
           
           this.$refs.prescription.setLastRecord(
             schedual,
@@ -601,7 +611,7 @@ export default {
       this.$emit("advice");
     },
     open(schedual){
-      console.log("中国2222222",this)
+     
      
       this.date = schedual.schedule_date
       this.patient_id = schedual.patient_id

src/xt_pages/dialysis/batch_print/batch_print_order_thirty.vue

@@ -52,7 +52,10 @@
                             <td width="10"></td>
                             <td width="50">性 别:</td>
                             <td width="60">
-                                <div class="under-line">{{ record.patient.gender ? "男" : "女" }}</div>
+                                <div class="under-line">
+                                  <span v-if=" record.patient.gender == 1">男</span>
+                                  <span v-if=" record.patient.gender == 2">女</span>
+                                </div>
                             </td>
                             <td width="10"></td>
                             <td width="50">年 龄:</td>

src/xt_pages/dialysis/components/allSummary.vue

@@ -239,7 +239,7 @@ export default {
           this.getlist()
           this.getAllMaterial()
         },
-           search(){
+          search(){
           //  if(this.selected_date==""){
           //     this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
           //   }

src/xt_pages/dialysis/components/allSummaryDialog.vue

@@ -66,6 +66,7 @@
 const moment = require('moment')
 import { parseTime } from "@/utils";
 import {getGatherList} from "@/api/consumable"
+
 export default {
     data(){
         return{
@@ -83,7 +84,8 @@ export default {
             partitionType: 0,
             tableData: [],
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD")
+            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            stockTotal:[]
         }
     },
     created(){
@@ -141,6 +143,8 @@ export default {
             }
           })
         }
+
+      
     }
 }
 </script>

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -20,24 +20,24 @@
         placeholder="选择日期"
         @change="selectEndtime">
       </el-date-picker>
-      <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+      <!-- <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button> -->
 
     </div>
     <div style="margin-top:10px;">
       <el-table :data="tableData" border style="width: 100%" height="300px">
-        <el-table-column align="center" prop="date" label="商品类型" width="180">
+        <el-table-column align="center" prop="date" label="耗材类型" width="180">
           <template slot-scope="scope">
-            {{scope.row.good_type_name}}
+            {{scope.row.good_name}}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="规格名称" width="180">
           <template slot-scope="scope">
-            {{scope.row.good_name}}
+            {{scope.row.specification_name}}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="address" label="数量">
           <template slot-scope="scope">
-            {{scope.row.count}}
+            {{getStockCount(scope.row.id)}}
           </template>
         </el-table-column>
       </el-table>
@@ -50,7 +50,7 @@
   const moment = require('moment')
   import { GetDialysisGoodStatistics } from '@/api/dialysis'
   import { parseTime } from '@/utils'
-
+  import { getPrintStockGood } from '@/api/stock'
   export default {
     props: {
       list: Array
@@ -62,7 +62,8 @@
           end_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD')
         },
         visible: false,
-        startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        // startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        startTime:moment().startOf('month').format("YYYY-MM-DD"),
         endTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         schedulArr: [
           { value: 0, label: '全部班' },
@@ -76,7 +77,8 @@
         partitionType: 0,
         tableData: [],
         start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
-        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD')
+        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        stockTotal:[]
       }
     },
     created() {
@@ -119,8 +121,8 @@
         done()
       },
       show() {
-        this.GetDialysisGoodStatistics()
-
+        // this.GetDialysisGoodStatistics()
+        this.getlist()
         this.visible = true
       },
 
@@ -136,9 +138,40 @@
         this.GetDialysisGoodStatistics()
 
       },
+       getlist(){
+          var params = {
+            start_time:this.startTime,
+            end_time:this.endTime,
+            type:3
+          }
+          console.log("param2222222",params)
+          getPrintStockGood(params).then(response=>{
+            var stockTotal = response.data.data.stockTotal
+            console.log("stocktOTl",stockTotal)
+            this.stockTotal = stockTotal
+            for (let i = 0; i < response.data.data.list.length; i++) {
+               if (response.data.data.list[i].query_warehouseout_info.length > 0) {
+                  this.tableData.push(response.data.data.list[i])
+               }
+             }
+             console.log("表哥22222222222",this.tableData) 
+          })
+       },
+
       toPrint() {
         this.$router.push('/dialysis/consumables_print?startime=' + this.start_time + '&endtime=' + this.end_time)
-      }
+      },
+      getStockCount(id){
+       
+       var count = ""
+       for(let i=0;i<this.stockTotal.length;i++){
+          if(id == this.stockTotal[i].good_id){
+             count = this.stockTotal[i].count
+          }
+       }
+       return count
+     }
+    
 
     }
   }

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -75,6 +75,18 @@
           <span class="unit"></span>
         </li>
 
+        <li v-if="isShow('透析器')">
+          <label>透析器 : </label>
+          <span class="content">{{ dialysis_dialyszers }}</span>
+          <span class="unit"></span>
+        </li>
+
+        <li v-if="isShow('灌流器')">
+          <label>灌流器 : </label>
+          <span class="content">{{ dialysis_irrigation }}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('透析前使用特殊药物')">
           <label>透析前使用特殊药物: </label>
           <span class="content">{{ special_medicine }}</span>
@@ -332,6 +344,9 @@ export default {
     },
     device_number_map: {
       type: Object
+    },
+    preparestock:{
+      type:Array
     }
   },
   computed: {
@@ -494,6 +509,50 @@ export default {
         'dialyzer_perfusion_apparatus'
       )
     },
+    dialysis_dialyszers:function(){
+
+      var str = this.getValueStr('dialysis_dialyszers','dialysis_dialyszers')
+       console.log("str",str)
+      var arr = str.split(",")
+
+      if (arr.length >0) {
+         for(let i=0;i<arr.length;i++){
+           for(let j=0;j<this.preparestock.length;j++){
+              if(arr[i] == this.preparestock[j].specification_name){
+                 if(this.preparestock[j].commdity_code!=""){
+                   arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+                 }
+              }
+           }
+         }
+      }
+      console.log("arr00000",arr)
+      var strs = arr.join(',')
+      console.log("strs",strs)
+      return strs
+    },
+    dialysis_irrigation:function(){
+        var str = this.getValueStr('dialysis_irrigation','dialysis_irrigation')
+       console.log("str",str)
+      var arr = str.split(",")
+
+      if (arr.length >0) {
+         for(let i=0;i<arr.length;i++){
+           for(let j=0;j<this.preparestock.length;j++){
+              if(arr[i] == this.preparestock[j].specification_name){
+                if(this.preparestock[j].commdity_code!=""){
+                  arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+                } 
+              }
+           }
+         }
+      }
+      console.log("arr00000",arr)
+      var strs = arr.join(',')
+      console.log("strs",strs)
+      return strs
+      // return this.getValueStr('dialysis_irrigation','dialysis_irrigation')
+    },
     body_fluid: function() {
       var id = this.getValueStr('body_fluid', 'body_fluid')
       if (id == 0) {
@@ -572,6 +631,7 @@ export default {
     }
   },
   created() {
+
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -88,6 +88,7 @@
       :last_prescription="last_dialysis_prescribe"
       :dry_weight="last_dryWeight_dislysis"
       :schedual="temp_schedual"
+      :stockType="stockType"
       :lastAssessment="lastAssessment"
     ></dialysis-prescription-dialog>
 
@@ -95,8 +96,11 @@
       title="双人核对"
       ref="doubleCheck"
       :patient="patient"
+      :predialysis_evaluation="predialysis_evaluation"
+      :prescription="prescription"
       :double_check="double_check"
       :admin_users="admin_users"
+
     ></double-check-dialog>
 
     <accepts-treatment-dialog
@@ -509,6 +513,12 @@ export default {
         return [];
       }
     },
+    stockType:{
+      type:Array,
+      default:()=>{
+        return [];
+      }
+    },
     lastAssessment:{
      // 最后一条血管通路(处理今天录的)
      type: Object,

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

@@ -1262,6 +1262,7 @@
       this.humor_excessive_symptom_array = getDataConfig('hemodialysis', 'humor_excessive_symptom')
       // console.log("血管通路部位",this.blood_access_part_opera)
       this.internal_fistula = getDataConfig('hemodialysis', 'internal_fistula')
+      console.log("内瘘222222",this.internal_fistula)
       this.internal_fistula_skin = getDataConfig('hemodialysis', 'internal_fistula_skin')
       this.puncture_method = getDataConfig('hemodialysis', 'puncture_method')
       this.machineType = getDataConfig('hemodialysis', 'machine_type')

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

@@ -252,7 +252,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          
+
 
            <el-col :span="8" v-if="isShows('置换速度')" v-show="totalShow">
             <el-form-item label="置换速度(ml/min)">
@@ -262,7 +262,7 @@
             </el-form-item>
           </el-col>
 
- 
+
           <el-col
             :span="8"
             v-if="anticoagulant.gaimingcheng != -1 && isShows('钙名称')"
@@ -368,18 +368,18 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col :span="8" v-if="isShows('透析器')">
+          <el-col :span="8" v-if="isShows('透析器')">
              <el-form-item label="透析器:">
-                  <el-input v-model="dialysisPrescription.dialyzers" @focus="showInnerDialog('7')"></el-input>
+                  <el-input v-model="dialysisPrescription.dialysis_dialyszers" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>
           </el-col>
 
-ß
+
           <el-col :span="8" v-if="isShows('灌流器')">
              <el-form-item label="灌流器:">
-                  <el-input v-model="dialysisPrescription.irrigation" @focus="showInnerDialog('8')"></el-input>
+                  <el-input v-model="dialysisPrescription.dialysis_irrigation" @focus="showInnerDialog('8')"></el-input>
              </el-form-item>
-          </el-col> -->
+          </el-col>
 
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
@@ -400,10 +400,7 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
-
 
-          <el-row :gutter="20" > -->
 
           <el-col :span="8" v-if="isShows('体液过多其他症状')">
             <el-form-item label="体液过多其他症状">
@@ -440,9 +437,7 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
 
-          <el-row :gutter="20" > -->
           <el-col :span="8">
             <el-form-item
               label="置换液："
@@ -530,281 +525,6 @@
 
             </el-form-item>
           </el-col>
-
-
-          <!-- </el-row>
-          <el-row :gutter="20" > -->
-          <!--          <el-col :span="8" v-if="isShows('实际超滤量')">-->
-          <!--            <el-form-item label="实际超滤量(L)">-->
-          <!--              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-          <!--透析耗材-->
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('血液透析干粉') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="血液透析干粉：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.niprocart"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-                <!--<el-option-->
-                  <!--v-for="(option, index) in niprocart_info"-->
-                  <!--:key="index + 'p'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="一次性使用动静脉穿刺针：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.jms"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in jms_info"-->
-                  <!--:key="index + 'a'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('内瘘管翼状针') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="内瘘管翼状针：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.fistula_needle_set"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in fistula_needle_set_info"-->
-                  <!--:key="index + 's'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="内瘘管翼状针16G：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.fistula_needle_set_16"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in fistula_needle_set_16_info"-->
-                  <!--:key="index + 'd'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="一次性使用血液灌流器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.hemoperfusion"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in hemoperfusion_info"-->
-                  <!--:key="index + 'f'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('空心纤维血液透析器') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="空心纤维血液透析器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.dialyser_sterilised"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in dialyser_sterilised_info"-->
-                  <!--:key="index + 'g'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('中空纤维透析器') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="中空纤维透析器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.filtryzer"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in filtryzer_info"-->
-                  <!--:key="index + 'h'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">-->
-            <!--<el-form-item label="透析器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.dialyzers"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in dialyzers_info"-->
-                  <!--:key="index + 1"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">-->
-            <!--<el-form-item label="注射器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.injector"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in injector_info"-->
-                  <!--:key="index + 'j'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('体外循环血路管') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="体外循环血路管：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.bloodlines"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in bloodlines_info"-->
-                  <!--:key="index + 'k'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="血液净化补液管路(置换管)：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.tubing_hemodialysis"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in tubingHemodialysis_info"-->
-                  <!--:key="index + 'x'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">-->
-            <!--<el-form-item label="护理包：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.package"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in safe_package_info"-->
-                  <!--:key="index + 'z'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('A液') && config.is_open == 1">-->
-            <!--<el-form-item label="A液：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.a_liquid"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in aliquid_info"-->
-                  <!--:key="index + 'c'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-
-
-
-
         </el-row>
 
         <el-row :gutter="20">
@@ -1162,6 +882,12 @@
         }
       },
       scheudle_mode:Number,
+     stockType:{
+        type:Array,
+        default:()=>{
+          return [];
+        }
+      },
       lastAssessment: {
         type: Object,
         default: () => {
@@ -1287,6 +1013,8 @@
           nucleoprotamine:"",//鱼精蛋白
           no_heparin_remarks:"",
           blood:"",
+          dialysis_dialyszers:"",
+          dialysis_irrigation:"",
           irrigation:"",
           antioxidant_commodity_name:"",
           displace_speed:"",
@@ -1311,7 +1039,7 @@
         doctorAdvices: [],
         dialyzerPerfusionApparatus: [],
         bloods:[],
-        irrigation:[],
+        irrigations:[],
         dialyzers:[],
       }
     },
@@ -1378,6 +1106,25 @@
 
            case '7': // 透析器
 
+            for(let i=0;i<this.dialyzers.length;i++){
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+            }
+            this.InnerDialogProps.values = this.dialyzers
+            this.InnerDialogProps.titles = '透析器'
+            this.InnerDialogProps.type = 'dialyzers'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_dialyszers
+            this.InnerDialogProps.isShowTextArea = false
+            break
+           case '8':
+           for(let i=0;i<this.irrigations.length;i++){
+             this.irrigations[i].name = this.irrigations[i].specification_name
+           }
+            this.InnerDialogProps.values = this.irrigations
+            this.InnerDialogProps.titles = '透析器'
+            this.InnerDialogProps.type = 'irrigations'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_irrigation
+            this.InnerDialogProps.isShowTextArea = false
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1389,6 +1136,12 @@
           case 'blood':
             this.dialysisPrescription.blood = val.value.join(',')
            break
+          case 'dialyzers':
+           this.dialysisPrescription.dialysis_dialyszers = val.value.join(',')
+          break
+          case 'irrigations':
+           this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
+          break
         }
       },
       innerDialogCancle: function() {
@@ -1490,7 +1243,7 @@
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-
+        console.log("3333333",this.dialyzerPerfusionApparatus)
         this.bloods = getDataConfig(
           'hemodialysis',
           'blood'
@@ -1618,6 +1371,7 @@
                 ParamsQuery['mode'] = '3'
               }
             }
+
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1838,7 +1592,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
-     
+
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -1911,8 +1665,8 @@
         } else {
           last_weight_after = this.last_record.weight_after
         }
-        
- 
+
+
 
         if (this.predialysis == null || this.predialysis.id == 0) {
           if(last != null) {
@@ -1934,7 +1688,7 @@
 
             weight_before = 0
 
-           
+
           }
 
         } else {
@@ -1943,29 +1697,29 @@
 
 
           //获取最后一次血管通路
-         if(this.predialysis!=null){
-            if(this.lastAssessment!=null){
-              var blood_id = 0
-              for(let i= 0;i<this.blood_access_option.length;i++){
-                  if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_option[i].name){
-                    blood_id = this.blood_access_option[i].id
-                  }
-              }
-               console.log("中国人名职员",this.lastAssessment)
-               this.dialysisPrescription.blood_access = blood_id
-            }else{
-              if(this.last_prescription!=null){
-                  var blood_id = 0
-                  for(let i= 0;i<this.blood_access_option.length;i++){
-                      if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
-                        blood_id = this.blood_access_option[i].id
-                      }
-                  }   
-                   this.dialysisPrescription.blood_access = blood_id
-              }
-            }
-           
-         }
+        //  if(this.predialysis!=null){
+        //     if(this.lastAssessment!=null){
+        //       var blood_id = 0
+        //       for(let i= 0;i<this.blood_access_option.length;i++){
+        //           if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_option[i].name){
+        //             blood_id = this.blood_access_option[i].id
+        //           }
+        //       }
+        //        console.log("中国人名职员",this.lastAssessment)
+        //        this.dialysisPrescription.blood_access = blood_id
+        //     }else{
+        //       if(this.last_prescription!=null){
+        //           var blood_id = 0
+        //           for(let i= 0;i<this.blood_access_option.length;i++){
+        //               if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
+        //                 blood_id = this.blood_access_option[i].id
+        //               }
+        //           }
+        //            this.dialysisPrescription.blood_access = blood_id
+        //       }
+        //     }
+
+        //  }
 
         if (weight_before > 0 && last_weight_after > 0) {
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
@@ -2050,7 +1804,7 @@
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
 
-            console.log("第一")
+            console.log("第一",ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -3738,7 +3492,36 @@
           }
         }
       },
+      stockType:function(){
+        console.log("stockType",this.stockType)
+        var arr = []
+        var arrTwo = []
+        for(let i=0;i<this.stockType.length;i++){
+          if(this.stockType[i].stock_attribute == 2){
+              arr.push(this.stockType[i])
+          }
+          if(this.stockType[i].stock_attribute == 3){
+              arrTwo.push(this.stockType[i])
+          }
+        }
+        var dialyzator = []
+        var irrigation = []
+        for(let i=0;i<arr.length;i++){
+          for(let j=0;j<arr[i].GoodInfo.length;j++){
+              dialyzator.push(arr[i].GoodInfo[j])
+          }
+        }
+        this.dialyzers = dialyzator
 
+        for(let i=0;i<arrTwo.length;i++){
+           for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
+              irrigation.push(arrTwo[i].GoodInfo[j])
+           }
+        }
+        this.irrigations = irrigation
+        console.log("透析器",this.dialyzers)
+        console.log("灌流器",this.irrigations)
+      }
     }
   }
 </script>

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

@@ -4,45 +4,94 @@
              :modal-append-to-body="false"
              width="854px">
 
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
+      
       <el-form-item label="透析物品核查 : ">
-        <el-radio v-model="doubleReview.dialysis_item_check" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.dialysis_item_check" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.dialysis_item_check" label="1" @change="changeRadio">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.dialysis_item_check" label="2">错误</el-radio> -->
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.dialysis_item_desc"></el-input>
       </el-form-item>
     </el-form>
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+   
+   <el-form :inline="true" class="demo-form-inline newCheckBox" :model="doubleReview" label-width="110px">
+       <el-checkbox-group v-model="checkList" @change="changeBox">
+          <el-checkbox :label="diazes"></el-checkbox>
+          <el-checkbox :label="puncture_needle"></el-checkbox>
+          <el-checkbox :label="dialysate_formulation"></el-checkbox>
+          <el-checkbox :label="kalium"></el-checkbox>
+          <el-checkbox :label="calcium"></el-checkbox>
+       </el-checkbox-group>
+    </el-form>
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       <el-form-item label="透析参数核查 : ">
-        <el-radio v-model="doubleReview.dialysis_parameter_check" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.dialysis_parameter_check" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.dialysis_parameter_check" label="1" @change="changeRadioTwo">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.dialysis_parameter_check" label="2">错误</el-radio> -->
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.dialysis_parameter_desc"></el-input>
       </el-form-item>
     </el-form>
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form class="newCheckBox">
+     <el-checkbox-group v-model="checkListOne" @change="changeBoxOne" >
+        <el-checkbox :label="dialys_mode"></el-checkbox>
+        <el-checkbox :label="long_time"></el-checkbox>
+        <el-checkbox :label="target_ultrafiltration"></el-checkbox>
+        <el-checkbox :label="anticoagulant" ></el-checkbox>
+        <el-checkbox :label="anticoagulant_shouji"></el-checkbox>
+        <el-checkbox :label="anticoagulant_weichi"></el-checkbox>
+        <el-checkbox :label="anticoagulant_zongliang"></el-checkbox>
+        <el-checkbox :label="displace_liqui_part"></el-checkbox>
+        <el-checkbox :label="replacement_total"></el-checkbox>
+        <el-checkbox :label="blood_flow_volume"></el-checkbox>
+        <el-checkbox :label="dialysate_flow"></el-checkbox>
+     </el-checkbox-group>
+    </el-form>
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       <el-form-item label="血管通路核查 : ">
 
-        <el-radio v-model="doubleReview.vascular_access_verification" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.vascular_access_verification" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.vascular_access_verification" label="1" @change="changeRadioThree">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.vascular_access_verification" label="2">错误</el-radio> -->
 
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.vascular_access_desc"></el-input>
       </el-form-item>
     </el-form>
-    <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">
+    <el-form class="newCheckBox">
+       <el-checkbox-group v-model="checkListTwo" @change="changeBoxTwo">
+        <el-checkbox :label="blood_access_part_opera_id">
+
+        </el-checkbox>
+        <el-checkbox label="动静脉接错"></el-checkbox>
+        <el-checkbox label="渗血"></el-checkbox>
+        <el-checkbox label="压迫" ></el-checkbox>
+        <el-checkbox label="折叠"></el-checkbox>
+        <el-checkbox label="滑脱"></el-checkbox>
+     </el-checkbox-group>
+    </el-form>
+    <el-form :inline="true" class="demo-form-inline newInline" :model="doubleReview" label-width="105px">
       <el-form-item label="管道连接核查 : ">
-        <el-radio v-model="doubleReview.pipeline_connection_check" label="1">正确</el-radio>
-        <el-radio v-model="doubleReview.pipeline_connection_check" label="2">错误</el-radio>
+        <el-radio v-model="doubleReview.pipeline_connection_check" label="1" @change="changeRadioFour">正确</el-radio>
+        <!-- <el-radio v-model="doubleReview.pipeline_connection_check" label="2">错误</el-radio> -->
       </el-form-item>
-      <el-form-item label="差错描述 : " label-width="80px">
+      <el-form-item class="newItem" label="差错描述 : " label-width="90px">
         <el-input v-model="doubleReview.pipeline_connection_desc"></el-input>
       </el-form-item>
     </el-form>
-
+    <el-form class="newCheckBox">
+      <el-checkbox-group v-model="checkListThree" @change="changeBoxThree">
+        <el-checkbox label="泵前补液测管未夹"></el-checkbox>
+        <el-checkbox label="肝素管夹未开启"></el-checkbox>
+        <el-checkbox label="透析器连接错误"></el-checkbox>
+        <el-checkbox label="动静脉壶页面不标准" ></el-checkbox>
+        <el-checkbox label="静脉管路未卡入保护夹"></el-checkbox>
+        <el-checkbox label="压力传感器夹未打开"></el-checkbox>
+        <el-checkbox label="接口连接松动"></el-checkbox>
+        <el-checkbox label="管路打折"></el-checkbox>
+     </el-checkbox-group>
+    </el-form>
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="120px">
       <el-form-item label="第一核对时间:">
         <el-time-picker
@@ -99,7 +148,7 @@
   import { postDoubleCheck } from '@/api/dialysis'
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
-
+  import { getDataConfig } from '@/utils/data'
   export default {
     name: 'doubleCheckDialog',
     data() {
@@ -128,8 +177,29 @@
           check_time: 0,
           first_check_time: 0
         },
-
-        record_date: ''
+        dialysate_formulation_options:[],
+        record_date: '',
+        checkList: [],
+        checkListOne:[],
+        checkListTwo:[],
+        checkListThree:[],
+        diazes:"透析器/灌流器:",
+        puncture_needle:"穿刺针:",
+        dialysate_formulation:"透析液配方:",
+        kalium:"钾:",
+        calcium:"钙:",
+        dialys_mode:"透析模式:",
+        long_time:"透析时长:",
+        target_ultrafiltration:"目标超滤量:",
+        anticoagulant:"抗凝剂:",
+        anticoagulant_shouji:"首剂:",
+        anticoagulant_weichi:"维持:",
+        anticoagulant_zongliang:"总量:",
+        displace_liqui_part:"置换液:",
+        replacement_total:"置换总量:",
+        blood_flow_volume:"处方血流量:",
+        dialysate_flow:"透析液流量:",
+        blood_access_part_opera_id:"通路类型:"
       }
     }, methods: {
       show() {
@@ -187,7 +257,8 @@
       handleCancle: function() {
         this.isVisibility = false
 
-      }, handleComfirm: function() {
+      }, 
+      handleComfirm: function() {
 
         if (this.patient.id <= 0) {
           this.$message.error('没有选择患者')
@@ -259,6 +330,7 @@
             // }
 
             let doublecheck_resp = response.data.data.doubleCheck
+         
             var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {
               // doubleCheck[index] = doublecheck_resp[index];
@@ -464,6 +536,355 @@
           }
         }
       },
+      changeBox(val){
+         
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+        if(str.indexOf('透析器/灌流器')!=-1 && this.prescription!=null){
+            arr.push("透析器/灌流器:"+(this.prescription.dialyzer_perfusion_apparatus?this.prescription.dialyzer_perfusion_apparatus:""))
+        }
+
+       if(str.indexOf('透析器/灌流器')!=-1 && this.prescription==null){
+            arr.push("透析器/灌流器:")
+        }
+       
+        if(str.indexOf('穿刺针')!=-1 && this.predialysis_evaluation.id!=0){
+           arr.push("穿刺针:"+this.predialysis_evaluation.puncture_needle)
+        }
+
+         if(str.indexOf('穿刺针')!=-1 && this.predialysis_evaluation.id==0){
+           arr.push("穿刺针:")
+        }
+        
+        if(str.indexOf('透析液配方')!=-1 && this.prescription!=null){
+           arr.push("透析液配方:"+this.GetDialysateFormulationById(this.prescription.dialysate_formulation))
+        }
+
+       if(str.indexOf('透析液配方')!=-1 && this.prescription==null){
+           arr.push("透析液配方:")
+        }
+        if(str.indexOf('钾')!=-1 && this.prescription!=null ){
+          arr.push("钾:"+(this.prescription.kalium?this.prescription.kalium:""))
+        }
+        if(str.indexOf('钾')!=-1 && this.prescription==null ){
+          arr.push("钾:")
+        }
+        if(str.indexOf('钙')!=-1 && this.prescription!=null ){
+          arr.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
+        }
+        if(str.indexOf('钙')!=-1 && this.prescription==null ){
+          arr.push("钙:")
+        }
+        console.log("arr",arr)
+        this.doubleReview.dialysis_item_desc = arr.join(";")
+        if(val.length > 0){
+          this.doubleReview.dialysis_item_check = 2
+        }else{
+          this.doubleReview.dialysis_item_check = "1"
+        }
+      },
+      changeBoxOne(val){
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+        if(str.indexOf('透析模式')!=-1 && this.prescription!=null){
+            arr.push("透析模式:"+(this.getMode(this.prescription.mode_id)?this.getMode(this.prescription.mode_id):""))
+        }
+         if(str.indexOf('透析模式')!=-1 && this.prescription==null){
+            arr.push("透析模式:")
+         } 
+
+         if(str.indexOf('透析时长')!=-1 && this.prescription!=null){
+            arr.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysis_duration:""))
+         }
+
+        if(str.indexOf('透析时长')!=-1 && this.prescription==null){
+            arr.push("透析时长:")
+         }
+        
+        if(str.indexOf("目标超滤量")!=-1 && this.prescription!=null){
+           arr.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
+        }
+        if(str.indexOf("目标超滤量")!=-1 && this.prescription==null){
+           arr.push("目标超滤量:")
+        }
+        if(str.indexOf("抗凝剂")!=-1 && this.prescription!=null){
+           arr.push("抗凝剂:"+(this.prescription.anticoagulant?this.prescription.anticoagulant:""))
+        }
+       if(str.indexOf("抗凝剂")!=-1 && this.prescription==null){
+           arr.push("抗凝剂:")
+        }
+        if(str.indexOf("首剂")!=-1 && this.prescription!=null){
+           arr.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
+        }
+        if(str.indexOf("首剂")!=-1 && this.prescription==null){
+           arr.push("首剂:")
+        }
+       if(str.indexOf("维持")!=-1 && this.prescription!=null){
+           arr.push("维持:"+(this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:""))
+        }
+
+        if(str.indexOf("维持")!=-1 && this.prescription==null){
+           arr.push("维持:")
+        }
+
+        if(str.indexOf("总量")!=-1 && this.prescription!=null){
+           arr.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
+        }
+        
+        if(str.indexOf("总量")!=-1 && this.prescription==null){
+           arr.push("总量:")
+        }
+
+       if(str.indexOf("置换液")!=-1 && this.prescription!=null){
+           arr.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+        } 
+
+       if(str.indexOf("置换液")!=-1 && this.prescription==null){
+           arr.push("置换液:")
+        } 
+      
+       if(str.indexOf("置换总量")!=-1 && this.prescription!=null){
+           arr.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+        } 
+
+        if(str.indexOf("置换总量")!=-1 && this.prescription==null){
+           arr.push("置换总量:")
+        } 
+
+       if(str.indexOf("处方血流量")!=-1 && this.prescription!=null){
+           arr.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
+        } 
+
+       if(str.indexOf("处方血流量")!=-1 && this.prescription==null){
+           arr.push("处方血流量:")
+        } 
+       
+       if(str.indexOf("透析液流量")!=-1 && this.prescription!=null){
+           arr.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
+        } 
+
+       if(str.indexOf("透析液流量")!=-1 && this.prescription==null){
+           arr.push("透析液流量:")
+        } 
+        console.log("arr",arr)
+        this.doubleReview.dialysis_parameter_desc = arr.join(";")
+        if(val.length>0){
+          this.doubleReview.dialysis_parameter_check = 2
+        }else{
+          this.doubleReview.dialysis_parameter_check = "1"
+        }
+      },
+      changeBoxTwo(val){
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+ 
+          if(str.indexOf('通路类型')!=-1 && this.predialysis_evaluation.id!=0){
+            arr.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
+          
+          }
+
+          if(str.indexOf('通路类型')!=-1 && this.predialysis_evaluation.id==0){
+            arr.push("通路类型:")
+          }
+          if(str.indexOf('动静脉接错')!=-1){
+             arr.push("动静脉接错:")
+          }
+          if(str.indexOf('渗血')!=-1){
+             arr.push("渗血:")
+          }
+         if(str.indexOf('压迫')!=-1){
+             arr.push("压迫:")
+          }
+          if(str.indexOf('折叠')!=-1){
+             arr.push("折叠:")
+          }
+          if(str.indexOf('滑脱')!=-1){
+             arr.push("滑脱:")
+          }
+        console.log("arr",arr)
+        this.doubleReview.vascular_access_desc = arr.join(";")
+        if(val.length>0){
+          this.doubleReview.vascular_access_verification = 2
+        }else{
+          this.doubleReview.vascular_access_verification = "1"
+        }
+      },
+      changeBoxThree(val){
+         var arr = []
+         var str = val.join(';')
+         console.log("strw222222222",str)
+         if(str.indexOf('泵前补液测管未夹')!=-1){
+           arr.push("泵前补液测管未夹:")
+         }
+         if(str.indexOf('肝素管夹未开启')!=-1){
+           arr.push("肝素管夹未开启:")
+         }
+         if(str.indexOf('透析器连接错误')!=-1){
+           arr.push("透析器连接错误:")
+         }
+        if(str.indexOf('动静脉壶页面不标准')!=-1){
+           arr.push("动静脉壶页面不标准:")
+         }
+          if(str.indexOf('静脉管路未卡入保护夹')!=-1){
+           arr.push("静脉管路未卡入保护夹:")
+         }
+         if(str.indexOf("压力传感器夹未打开")!=-1){
+           arr.push("压力传感器夹未打开")
+         }
+         if(str.indexOf('接口连接松动')!=-1){
+            arr.push("接口连接松动")
+         }
+         if(str.indexOf("管路打折")!=-1){
+           arr.push("管路打折")
+         }
+         this.doubleReview.pipeline_connection_desc = arr.join(";")
+         if(val.length > 0){
+          this.doubleReview.pipeline_connection_check = 2
+         }else{
+           this.doubleReview.pipeline_connection_check = "1"
+         }
+      },
+
+      changeRadio(val){
+        if(val == 1){
+         this.doubleReview.dialysis_item_desc = ""
+         this.checkList =[]
+        }
+      },
+      changeRadioTwo(val){
+        if(val == 1){
+          this.doubleReview.dialysis_parameter_desc = ""
+          this.checkListOne = []
+        }
+      },
+      changeRadioThree(val){
+         if(val == 1){
+           this.doubleReview.vascular_access_desc = ""
+           this.checkListTwo = []
+         }
+      },
+      changeRadioFour(val){
+         if(val == 1){
+           this.doubleReview.pipeline_connection_desc = ""
+           this.checkListThree = [] 
+         }
+      },
+
+      GetDialysateFormulationById(val) {
+         this.dialysate_formulation_options = getDataConfig('hemodialysis','dialysate_formulation')
+         console.log("透析液配方",this.dialysate_formulation_options)
+        let name = ''
+        let dfl = this.dialysate_formulation_options.length
+        for (let index = 0; index < dfl; index++) {
+          if (this.dialysate_formulation_options[index].id == val) {
+            name = this.dialysate_formulation_options[index].name
+            break
+          }
+        }
+        return name
+     },
+      getMode(id){
+       var name = ""
+        if(id == 1){
+          name = "HD"
+        }
+        if(id == 2){
+          name = "HDF"
+        }
+
+        if(id == 3){
+          name = "HD+HP"
+        }
+
+        if(id == 4){
+          name = "HP"
+        }
+        if(id == 5){
+          name = "HF"
+        }
+       if(id == 6){
+          name = "SCUF"
+        }
+       if(id == 7){
+          name = "IUF"
+        }
+       if(id == 8){
+          name = "HFHD"
+        }
+
+       if(id == 9){
+          name = "HFHD+HP"
+        }
+       if(id == 10){
+          name = "PHF"
+        }
+
+       if(id == 11){
+          name = "HFR"
+        }
+
+        if(id == 12){
+          name = "HDF+HP"
+        }
+
+        if(id == 13){
+          name = "CRRT"
+        }
+
+        if(id == 14){
+          name = "腹水回输"
+        }
+        if(id == 19){
+          name = "IUF+HD"
+        }
+        if(id == 20){
+          name = "UF"
+        }
+        return name
+     },
+
+     getAnticoagulant(id){
+       var name = ""
+       if(id == 1){
+         name = "无肝素"
+       }
+       if(id == 2){
+         name = "普通肝素"
+       }
+       if(id == 3){
+         name = "低分子肝素"
+       }
+       if(id == 4){
+         name = "阿加曲班"
+       }
+       if(id == 5){
+         name = "枸橼酸钠"
+       }
+       if(id == 6){
+         name ="低分子肝素钙"
+       }
+       if(id == 7){
+         name = "低分子肝素钠"
+       }
+       return name
+     },
+     getBloodAccess(id){
+       
+        let vascular_access_desc = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+        )
+        var name = ""
+        for(let i=0;i<vascular_access_desc.length;i++){
+          if(vascular_access_desc[i].id == id){
+             name = vascular_access_desc[i].name
+          }
+        }
+        return name
+     }
     },
 
     props: {
@@ -485,13 +906,146 @@
         default: () => {
           return { id: 0 }
         }
-      }
+      },
+      predialysis_evaluation: { // 透前评估
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
+      prescription: {
+        // 透析处方
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
 
     },
     watch: {
       isVisibility(val) {
-
-      }, 'double_check.id': function() {
+      
+        if(this.prescription!=null && this.prescription.id!=0){
+          this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+          this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
+         
+          this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")
+         
+          this.calcium = this.calcium + (this.prescription.calcium?this.prescription.calcium:"")
+          this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
+          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysate_formulation:"")
+          this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
+          this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
+          this.anticoagulant_shouji = this.anticoagulant_shouji + (this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:"")
+          this.anticoagulant_weichi = this.anticoagulant_weichi + (this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:"")
+          this.anticoagulant_zongliang = this.anticoagulant_zongliang+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:"")
+          this.displace_liqui_part = this.displace_liqui_part + (this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:"")
+          this.replacement_total = this.replacement_total + (this.prescription.replacement_total?this.prescription.replacement_total:"")
+          this.dialysate_flow = this.dialysate_flow + (this.prescription.dialysate_flow?this.prescription.dialysate_flow:"")
+        }
+        if(this.predialysis_evaluation!=null && this.predialysis_evaluation.id!=0){
+          this.puncture_needle = this.puncture_needle + this.predialysis_evaluation.puncture_needle
+          this.blood_access_part_opera_id = this.blood_access_part_opera_id + this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id)
+        } 
+        if(this.double_check !=null && this.double_check.id!=0){
+           console.log("双人核对",this.double_check)
+           if(this.double_check.dialysis_item_desc.indexOf("透析器/灌流器")!=-1){
+             this.checkList.push("透析器/灌流器:"+this.prescription.dialyzer_perfusion_apparatus)
+             console.log("222222",this.checkList)
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("穿刺针")!=-1){
+              this.checkList.push("穿刺针:"+(this.predialysis_evaluation.puncture_needle?this.predialysis_evaluation.puncture_needle:""))
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("透析液配方:")!=-1){
+              this.checkList.push("透析液配方:"+this.GetDialysateFormulationById(this.prescription.dialysate_formulation))
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("钾:")!=-1){
+              this.checkList.push("钾:"+(this.prescription.kalium?this.prescription.kalium:""))
+           }
+           if(this.double_check.dialysis_item_desc.indexOf("钙:")!=-1){
+               this.checkList.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("透析模式:")!=-1){
+              this.checkListOne.push("透析模式:"+this.getMode(this.prescription.mode_id))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("透析时长")!=-1){
+              this.checkListOne.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysate_formulation:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("目标超滤量")!=-1){
+              this.checkListOne.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("抗凝剂")!=-1){
+              this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("首剂")!=-1){
+              this.checkListOne.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("维持")!=-1){
+              this.checkListOne.push("维持:"+(this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:""))
+           }
+          if(this.double_check.dialysis_parameter_desc.indexOf("总量")!=-1){
+              this.checkListOne.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
+           }
+          if(this.double_check.dialysis_parameter_desc.indexOf("置换液")!=-1){
+              this.checkListOne.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("置换总量")!=-1){
+             this.checkListOne.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("处方血流量")!=-1){
+             this.checkListOne.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
+           }
+           if(this.double_check.dialysis_parameter_desc.indexOf("透析液流量")!=-1){
+             this.checkListOne.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
+           }
+           if(this.double_check.vascular_access_desc.indexOf("通路类型")!=-1){
+             this.checkListTwo.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))
+           }
+
+           if(this.double_check.vascular_access_desc.indexOf("动静脉接错")!=-1){
+             this.checkListTwo.push("动静脉接错")
+           }
+           if(this.double_check.vascular_access_desc.indexOf("渗血")!=-1){
+             this.checkListTwo.push("渗血")
+           }
+           if(this.double_check.vascular_access_desc.indexOf("压迫")!=-1){
+             this.checkListTwo.push("压迫")
+           }
+          if(this.double_check.vascular_access_desc.indexOf("折叠")!=-1){
+             this.checkListTwo.push("折叠")
+           }
+          if(this.double_check.vascular_access_desc.indexOf("滑脱")!=-1){
+             this.checkListTwo.push("滑脱")
+           }
+
+           if(this.double_check.pipeline_connection_desc.indexOf("泵前补液测管未夹")!=-1){
+             this.checkListThree.push("泵前补液测管未夹")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("肝素管夹未开启")!=-1){
+             this.checkListThree.push("肝素管夹未开启")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("透析器连接错误")!=-1){
+             this.checkListThree.push("透析器连接错误")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("动静脉壶页面不标准")!=-1){
+             this.checkListThree.push("动静脉壶页面不标准")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("静脉管路未卡入保护夹")!=-1){
+             this.checkListThree.push("静脉管路未卡入保护夹")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("压力传感器夹未打开")){
+              this.checkListThree.push("压力传感器夹未打开")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("接口连接松动")){
+              this.checkListThree.push("接口连接松动")
+           }
+           if(this.double_check.pipeline_connection_desc.indexOf("管路打折")){
+             this.checkListThree.push("管路打折")
+           }
+           console.log("hhh",this.checkListOne)
+        }
+      }, 
+      'double_check.id': function() {
         if (this.double_check.id > 0) {
           for (var index in this.doubleReview) {
             this.doubleReview[index] = this.double_check[index] + ''
@@ -558,6 +1112,7 @@
 
     },
     created() {
+     
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
 
@@ -571,12 +1126,28 @@
         this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
       }
       this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-
+     
     }
 
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.newInline{
+  display: flex;
+}
+.newItem{
+  flex: 1;
+  display: flex !important;
+  .el-form-item__content{
+    width: 100%;
+  }
+}
+.newCheckBox{
+  margin-bottom: 10px;
+  .el-checkbox{
+    margin-bottom: 10px;
+  }
+}
 </style>
+

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

@@ -163,6 +163,7 @@
                   template_id == 31 ||
                   template_id == 32 ||
                   template_id == 34 ||
+                  template_id == 35 ||
                   org_id == 9555)
             "
           >
@@ -202,6 +203,7 @@
                 template_id != 31 &&
                 template_id != 32 &&
                 template_id != 34 &&
+                template_id != 35 &&
                 org_id!=9555
             "
           >
@@ -219,7 +221,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -230,7 +232,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -518,12 +520,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -531,7 +533,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -539,7 +541,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/details/doubleCheck.vue

@@ -7,24 +7,22 @@
           <label>透析物品核查 : </label>
           <span class="content">{{ dialysis_item_check }}</span>
         </li>
-        <li>
-          <label>透析参数核查 : </label>
-          <span class="content">{{ dialysis_parameter_check }}</span>
-        </li>
-        <li>
-          <label>血管通路核查 : </label>
-          <span class="content">{{ vascular_access_verification }}</span>
-        </li>
-      </ul>
-      <ul>
         <li>
           <label>{{ dialysis_item_desc_title }}</label>
           <span class="content">{{ dialysis_item_desc }}</span>
         </li>
+        <li>
+          <label>透析参数核查 : </label>
+          <span class="content">{{ dialysis_parameter_check }}</span>
+        </li>
         <li>
           <label>{{ dialysis_parameter_desc_title }}</label>
           <span class="content">{{ dialysis_parameter_desc }}</span>
         </li>
+        <li>
+          <label>血管通路核查 : </label>
+          <span class="content">{{ vascular_access_verification }}</span>
+        </li>
         <li>
           <label>{{ vascular_access_desc_title }}</label>
           <span class="content">{{ vascular_access_desc }}</span>
@@ -32,9 +30,13 @@
       </ul>
       <ul>
           <li>
-          <label>管道连接核查 : </label>
-          <span class="content">{{ pipeline_connection_check }}</span>
-        </li>
+            <label>管道连接核查 : </label>
+            <span class="content">{{ pipeline_connection_check }}</span>
+          </li>
+          <li>
+            <label>{{ pipeline_connection_desc_title }}</label>
+            <span class="content">{{ pipeline_connection_desc }}</span>
+          </li>
           <li>
           <label>第一次核对人员 : </label>
           <span class="content">{{getCreaterName(record.creater)}}</span>
@@ -44,12 +46,6 @@
           <span class="content">{{getCreateTime(record.first_check_time,record.creater)}}</span>
         </li>
       </ul>
-      <ul>
-          <li>
-          <label>{{ pipeline_connection_desc_title }}</label>
-          <span class="content">{{ pipeline_connection_desc }}</span>
-        </li>
-      </ul>
       <ul>
 
         <li>

src/xt_pages/dialysis/details/index.vue

@@ -267,6 +267,7 @@
         :system_prescribe="system_prescribe"
         :his_is_open="his_is_open"
         :lastAssessment="lastAssessment"
+        :stockType="stockType"
       >
       </nav-igation>
 
@@ -283,6 +284,7 @@
         :prescription="prescription"
         :solution="solution"
         :device_map="device_map"
+        :preparestock="preparestock"
         title="透析处方"
       ></dialysis-prescription>
 
@@ -681,7 +683,8 @@ export default {
       curPatient:{},
 
       queueConfig:{},
-      stockType:[]
+      stockType:[],
+      preparestock:[]
     }
   },
   created() {
@@ -971,24 +974,24 @@ export default {
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
-        
+
         var resp = rs.data
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-        
+
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
             }
           }
-        
+
           var solution = resp.data.solution // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
-         
+
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-         
+           console.log("透器评估",predialysis_evaluation)
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
@@ -1018,7 +1021,7 @@ export default {
           var aliquid_info = resp.data.aliquid_info
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation
-        
+
           if (lastPredialysisEvaluation != null) {
             if (lastPredialysisEvaluation.blood_access_part_id == -2) {
               lastPredialysisEvaluation.blood_access_part_id = 0
@@ -1028,9 +1031,9 @@ export default {
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
-         
+
           var system_prescribe = resp.data.system_prescribe
-           
+
           var lastAssessment =  resp.data.lastAssessment
           console.log("最后一次血管通路",lastAssessment)
           this.$refs.nav.setLastRecord(
@@ -1115,19 +1118,26 @@ export default {
           this.dialysis_order =
             dialysis_order == null ? { id: 0 } : dialysis_order
 
-         
+
 
           this.admin_users = resp.data.doctors
           this.devices = resp.data.devices
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-          
+
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-          
-      
-          
+
+
+
+          var stockType =  resp.data.stockType
+          this.stockType = stockType
+          console.log("stockTYPW",stockType)
+
+          var prepare = resp.data.prepare
+          this.preparestock = prepare
+          console.log("prepare222222",prepare)
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -114,6 +114,8 @@
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+            <span v-if="scope.row.dialysis_dialyszers!=''">{{scope.row.dialysis_dialyszers}}</span>
+            <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
@@ -234,7 +236,11 @@
         </el-table-column>
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
           <template slot-scope="scope">
-            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+            <span>
+              {{ scope.row.dialyzer_perfusion_apparatus }}
+              <span v-if="scope.row.dialysis_dialyszers!=''">{{scope.row.dialysis_dialyszers}}</span>
+              <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
@@ -496,6 +502,8 @@ export default {
                 it.name = item.patient.name
                     if(item.prescription != null){
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                       it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
+                       it.dialysis_irrigation = item.prescription.dialysis_irrigation
                     }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id
@@ -554,6 +562,8 @@ export default {
                 it.name = item.patient.name
                     if(item.prescription != null){
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                       it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
+                       it.dialysis_irrigation = item.prescription.dialysis_irrigation
                     }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -485,6 +485,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 35">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -735,6 +745,11 @@
             v-if="org_template_info.template_id == 34"
           >
           </DialysisPrintOrderThirtyFour>
+          <DialysisPrintOrderThirtyFive
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 35"
+          >
+          </DialysisPrintOrderThirtyFive>
         </div>
       </el-container>
     </div>
@@ -788,9 +803,11 @@ import DialysisPrintOrderThirtyOne from "./template/DialysisPrintOrderThirtyOne"
 import DialysisPrintOrderThirtyTwo from "./template/DialysisPrintOrderThirtyTwo";
 import DialysisPrintOrderThirtyThree from "./template/DialysisPrintOrderThirtyThree";
 import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
+import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyFive,
     DialysisPrintOrderThirtyFour,
     DialysisPrintOrderThirtyThree,
     DialysisPrintOrderThirtyTwo,
@@ -1223,6 +1240,13 @@ export default {
           style: style2,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 35) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -509,7 +509,11 @@
                     <td width="140">透析器/灌流器型号:</td>
                     <td width="">
                       <div class="under-line">
-                        &nbsp;{{ prescription.dialyzer_perfusion_apparatus }}
+                          <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">
+                            <span>{{prescription.dialysis_dialyszers}}</span>
+                            <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
+                          </span>
+                        &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
                       </div>
                     </td>
                   </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -874,7 +874,7 @@
             <td style="line-height:20px;" width="40">钠<br />浓<br />度<br /><span style="font-size:10px; !important">mmol/L</span></td>
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
             
-            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">ml</span></td>
+            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
             <td style="line-height:20px;" width="">病情变化及处理</td>
             <td style="line-height:20px;" width="60">签名</td>
           </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -661,12 +661,18 @@
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}</div>
                     </td>
-                    <td width="10">ml,</td>
+                    <td width="15">
+                      <span v-if="prescription.anticoagulant =='阿加曲班'">ml,</span>
+                      <span v-if="prescription.anticoagulant =='普通肝素'">iu,</span>
+                     </td>
                     <td width="60">追加量</td>
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}</div>
                     </td>
-                    <td width="10">ml</td>
+                    <td width="10">
+                      <span v-if="prescription.anticoagulant =='阿加曲班'">ml</span>
+                      <span v-if="prescription.anticoagulant =='普通肝素'">iu/h</span>
+                    </td>
                     <td width="10">）</td>
                     <td width="100">
                         <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>

src/xt_pages/management/components/PlanForm.vue

@@ -183,7 +183,8 @@ export default {
         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 4, name: "1500mg/l含氯消毒剂" },
+        { id: 5,  name:"消毒湿巾"}
       ],
       // 夜路消毒方式
       sterilizeType: [

src/xt_pages/management/home.vue

@@ -2329,7 +2329,8 @@ export default {
           { id: 1, name: '0.22%季铵盐' },
           { id: 2, name: '500mg/l含氯消毒剂' },
           { id: 3, name: '1000mg/l含氯消毒剂' },
-          { id: 4, name: '1500mg/l含氯消毒剂' }
+          { id: 4, name: '1500mg/l含氯消毒剂' },
+          { id: 5,  name:  "消毒湿巾"}
         ],
         // 夜路消毒方式
         sterilizeType: [
@@ -3212,6 +3213,9 @@ export default {
               if (plan[index].machine_disinfectant === 4) {
                 plan[index].machine_disinfectant = '1500mg/l含氯消毒剂'
               }
+              if(plan[index].machine_disinfectant === 5){
+                 plan[index].machine_disinfectant = "消毒湿巾"
+              }
 
               if (plan[index].disinfectan_way === 0) {
                 plan[index].disinfectan_way = '/'
@@ -3346,6 +3350,9 @@ export default {
               if (plandetail[index].machine_disinfectant === 4) {
                 plandetail[index].machine_disinfectant = '1500mg/l含氯消毒剂'
               }
+              if(plandetail[index].machine_disinfectant === 5){
+                  plandetail[index].machine_disinfectant = "消毒湿巾"
+              }
 
               if (plandetail[index].disinfectan_way === 0) {
                 plandetail[index].disinfectan_way = '/'

src/xt_pages/medicalScheduling/index.vue

@@ -1794,6 +1794,7 @@ export default {
                 start_time:this.getTimestamp(this.weekDayArr[0]),
                 end_time:this.getTimestamp(this.weekDayArr[6])
             }
+           
             copyStaffSchedule(params).then(response=>{
                 if(response.data.state == 1){
                 var msg =  response.data.data.msg

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -54,14 +54,23 @@
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
-              <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
+              <!-- <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择" filterable>
                 <el-option
-                  v-for="item,index in form.manufacturers"
+                  v-for="(item,index) in form.manufacturers"
                   :key="index"
                   :label="item.manufacturer_name"
                   :value="item.id">
                 </el-option>
-              </el-select>
+              </el-select> -->
+
+               <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in form.manufacturers"
+                    :key="index"
+                    :label="item.manufacturer_name"
+                    :value="item.id">
+                  </el-option>
+             </el-select>
             </el-form-item>
             <el-form-item label="单位 : " prop="good_unit">
               <el-select v-model="form.good_unit" style="width:160px;" placeholder="请选择">
@@ -241,7 +250,7 @@
 
 <script>
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
-
+  import { getManufacturerList } from "@/api/stock";
   export default {
     name: 'goodInfoDailog',
     data() {
@@ -418,6 +427,7 @@
         })
       },
       getValue: function() {
+        console.log("生产吃",this.form.manufacturer)
         const form = {}
         form['specification_name'] = this.form.specification_name
         form['good_unit'] = this.form.good_unit
@@ -458,6 +468,18 @@
         return form
       }, changeSelected: function(val) {
         console.log(val)
+      },
+      getlist(){
+         var params = {
+             page:this.page,
+             limit:this.limit
+          }
+          console.log("params2222222",params)
+        getManufacturerList(params).then(response=>{
+           var manufacturerList =   response.data.data.manufacturer
+           console.log("列表2222222",manufacturerList)
+           this.manufacturerList = manufacturerList
+        })
       }
     },
     watch: {
@@ -469,6 +491,9 @@
           this.good_unit = ''
         }
       }
+    },
+    created(){
+      this.getlist()
     }
   }
 

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -12,15 +12,18 @@
       <el-row>
         <el-col>
           <el-form-item label="耗材属性">
-              <el-radio v-model="formValue.stock_attribute" label="1">无</el-radio>
-              <el-radio v-model="formValue.stock_attribute" label="2">透析器</el-radio>
-              <el-radio v-model="formValue.stock_attribute" label="3">灌流器</el-radio>
+            
+              <el-radio-group v-model="formValue.stock_attribute" @change="changeRadio">
+                  <el-radio label="1">无</el-radio>
+                  <el-radio label="2">透析器</el-radio>
+                  <el-radio label="3">灌流器</el-radio>
+              </el-radio-group>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col>
-          <el-form-item label="耗材出库" prop="out_stock">
+          <el-form-item label="耗材出库" prop="out_stock" v-show="showAttribute">
              <el-radio v-model="formValue.out_stock" label="1">是</el-radio>
              <el-radio v-model="formValue.out_stock" label="2">否</el-radio>
           </el-form-item>     
@@ -67,7 +70,8 @@ export default {
         ]
       },
        out_stock: '1',
-       stock_attribute:"1"
+       stock_attribute:"1",
+       showAttribute:false
     };
   },
   props: {
@@ -84,7 +88,15 @@ export default {
     }
   },
   methods: {
-    show:function(){
+    show:function(val){
+      console.log("val22222222",this.formValue)
+      if(this.formValue.stock_attribute == "1"){
+        this.showAttribute = false
+      }
+      if(this.formValue.stock_attribute == "2" || this.formValue.stock_attribute =="3"){
+        this.showAttribute = true
+      }
+   
       this.visibility = true
 
     },hide:function(){
@@ -109,20 +121,35 @@ export default {
       form['out_stock'] = this.formValue.out_stock;
       form["stock_attribute"] = this.formValue.stock_attribute
       return form;
+    },
+
+    changeRadio(val){
+      if(val == 1){
+        this.showAttribute = false
+      }
+      if(val == 2 || val == 3){
+        this.showAttribute = true
+      }
     }
   },
+  
   watch: {
     visibility(val) {
-      !val &&
-        setTimeout(() => {
+      
+      !val && setTimeout(() => {
+        
           this.$refs["formValue"].resetFields();
           this.formValue.remark = "";
           this.formValue.type_name = "";
           this.formValue.stock_attribute="1";
           this.formValue.out_stock = "1"
-        }, 0);
-    }
-  }
+       }, 0);
+    },
+    
+   
+  },
+
+ 
 };
 </script>
 

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -49,6 +49,12 @@
             type="selection"
             width="55">
           </el-table-column>
+           <el-table-column
+            align="center"
+            label="耗材名称"
+            property="good_name"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
           <el-table-column
             align="center"
             label="规格名称"
@@ -136,7 +142,7 @@
         }
       },
        goodTypeTableChange: function(currentRow, oldCurrentRow) {
-        
+        console.log("currentRow2233333",currentRow)
         let keyName = ""
         var arr = []
         for(let i= 0;i<this.propForm.goods.length;i++){
@@ -149,12 +155,14 @@
         }
         this.currentGoodTypeId = parseInt(keyName)
         this.goodInfoTableData = arr[keyName]
+        
         for(let i=0;i<arr.length;i++){
           for(var key in arr[i]){
               this.goodInfo = arr[i][keyName]
               this.goodInfoTableData = arr[i][keyName]
           }
-         }
+        }
+        console.log("22222222哈哈哈哈哈哈哈哈哈",this.goodInfoTableData)
        },
       cancle: function(formName) {
         this.goodInfo = []
@@ -236,7 +244,7 @@
       changeGoodInfoTableData: function(val) {
       },
       changeAllGoodInfoTableData: function(selection) {
-        console.log("888878888888",this.propForm.goods)
+        console.log("888878888888",selection)
         var arr = []
         var id = 0
          for(let i=0;i<this.propForm.goods.length;i++){

src/xt_pages/stock/config/goodType.vue

@@ -339,12 +339,13 @@ export default {
         });
       } else if (val.isCreated == 1) {
         //新增
-        console.log("val22222",val)
+        
        
         createGoodType(val).then(response => {
           
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            // this.$message.error(response.data.msg);
+            this.$message.error("透析器或灌流器商品类型已存在!")
             return false;
           } else {
             this.$refs.dialog.hide();

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -322,17 +322,17 @@ export default {
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
-          
+
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
+
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            
+
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -369,14 +369,14 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
+
           this.total = response.data.data.total;
-         
+
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-           
+
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -386,7 +386,7 @@ export default {
               warehouse_out_time: 0
             }
           });
-        
+
         }
       });
     },
@@ -644,7 +644,7 @@ export default {
                 this.tableList.push(list[i])
               }
             }
-          console.log("表哥",this.tableList)
+          // console.log("表哥",this.tableList)
           }
       })
     },
@@ -663,10 +663,10 @@ export default {
        array = stock.query_warehousing_info
         let total_price = 0.0
         for (let i = 0; i < array.length; i++) {
-         total_price = total_price + array[i].warehousing_count * array[i].price  
+         total_price = total_price + array[i].warehousing_count * array[i].price
         }
         return  Math.floor(total_price * 100) / 100
-      }, 
+      },
       calTotalPrice() {
         var amountPrice = 0
         for (let i = 0; i < this.tableList.length; i++) {
@@ -675,15 +675,15 @@ export default {
           len = obj.query_warehouseout_info.length
           let total_price = 0.0
           for (let a = 0; a < len; a++) {
-           total_price = total_price + obj.query_warehouseout_info[a].total_price   
+           total_price = total_price + obj.query_warehouseout_info[a].total_price
           }
 
           amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
         }
         return Math.floor(amountPrice* 100) / 100
-      }, 
+      },
       getStockCount(id){
-        
+
         var count = ""
         for(let i=0;i<this.stockTotal.length;i++){
             if(id == this.stockTotal[i].good_id){
@@ -709,10 +709,10 @@ export default {
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
       },
-   
+
 
      exportList(){
-     
+
       var obj = {index:"合计",total:0}
        obj.total = this.calTotalPrice()
        for(let i=0;i<this.tableList.length;i++){
@@ -727,13 +727,13 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
        const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
-       
 
-      
+
+
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
-     
+
         excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/index.vue

@@ -13,7 +13,7 @@
           <!--<el-tab-pane label="经销商">-->
             <!--<dealer></dealer>-->
           <!--</el-tab-pane>-->
-          <el-tab-pane label="商品类型" name="first">
+          <el-tab-pane label="耗材类型" name="first">
             <good-type></good-type>
           </el-tab-pane>
           <!--<el-tab-pane label="商品信息">-->

src/xt_pages/stock/stockInOrderAdd.vue

@@ -58,13 +58,13 @@
                   style="width: 100%"
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
-
+      
           <el-table-column align="center" width="200">
-
+            
             <template slot="header" slot-scope="scope">
               <span>耗材类型<span style="color: red">*</span></span>
             </template>
-
+     
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
                 <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id"
@@ -74,6 +74,15 @@
             </template>
           </el-table-column>
           <el-table-column align="center" width="200">
+             <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+            <template slot-scope="scope">
+               <el-input v-model="scope.row.good_name" :disabled="true"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
             </template>
@@ -373,6 +382,7 @@
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
               this.recordInfo.recordData[this.currentIndex].good_unit = val.selectedGoodInfo[i].good_unit
+              this.recordInfo.recordData[this.currentIndex].good_name = val.selectedGoodInfo[i].good_name
             } else {
               const tempForm = {}
               tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
@@ -386,6 +396,7 @@
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
               tempForm['good_unit'] = val.selectedGoodInfo[i].good_unit
+              tempForm['good_name'] = val.selectedGoodInfo[i].good_name
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -501,6 +512,7 @@
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }
+            console.log("333333333",this.recordInfo.recordData)
           }
         })
       }, getTime(val, temp) {

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -126,6 +126,23 @@
               </el-form-item>
             </template>
           </el-table-column>
+           <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder=""
+                  v-model="scope.row.good_id"
+                  :value="typeNameOne(scope.row.good_id)"
+                  :disabled="true"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
@@ -447,6 +464,15 @@ export default {
       }
       return name;
     },
+    typeNameOne:function(good_info_id){
+       let name = ''
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].good_name
+        }
+      }
+      return name
+    },
     specificationName: function(good_info_id) {
       let name = ''
       for (let i = 0; i < this.goodInfo.length; i++) {

src/xt_pages/user/components/PatientForm.vue

@@ -1400,6 +1400,7 @@ export default {
       this.submitForm(formName, "renew");
     },
     onSubmit(formName) {
+      console.log("2222",this.form)
       this.submitForm(formName, "redict");
     },
     submitForm(formName, action) {
@@ -1603,6 +1604,7 @@ export default {
           if (response.data.state == 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            console.log("9999999",response.data.data.patient)
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
             this.form.alias = patietInfo.alias;
@@ -1644,7 +1646,7 @@ export default {
             if (patietInfo.source == 1 || patietInfo.source == 2) {
               this.form.source = patietInfo.source;
             }
-            if (patietInfo.lapseto == 1 || patietInfo.lapseto == 2) {
+            if (patietInfo.lapseto == 1 || patietInfo.lapseto == 2 || patietInfo.lapseto == 3) {
               this.form.lapseto = patietInfo.lapseto;
             }
             if (

src/xt_pages/user/coursePrint.vue

@@ -50,7 +50,7 @@
 
           <div class="row" style="padding: 2px 0;line-height:24px;">
             <div class="inline_block" style="width:100%;">
-              <div v-html="record.content">{{record.content}}</div>
+              <div v-html="record.content" class="printP">{{record.content}}</div>
             </div>
           </div>
 
@@ -101,6 +101,7 @@
         var resp = rs.data
         if (resp.state == 1) {
           this.record = resp.data.record
+          this.record.content = resp.data.record.content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
           this.patient = resp.data.patient
 
           this.loading = false
@@ -114,7 +115,7 @@
     },
     methods: {
       printAction: function() {
-        const style = '@media print {.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; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;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;}.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 td {border: 1px solid;font-size: 16px;padding: 5px 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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.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%;}.print-yema5{position: absolute;top:1370px;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;}'
+        const style = '@media print {.printP div{margin-bottom:5px;} .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; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;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;}.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 td {border: 1px solid;font-size: 16px;padding: 5px 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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.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%;}.print-yema5{position: absolute;top:1370px;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;}'
         printJS({
           printable: 'print_content',
           type: 'html',
@@ -294,6 +295,10 @@
     left: 50%;
   }
   .did_checke::after {content: "\221A";font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}
+  .printP{
+    line-height: 20px;
+    font-weight: bold;
+  }
 </style>
 
 

src/xt_pages/user/dialysisSolution.vue

@@ -85,7 +85,7 @@
             <span>{{ getAdminUserName(scope.row.registrars_id) }}</span>
           </template>
         </el-table-column>
-        
+
         <el-table-column
           prop="created_time"
           align="center"
@@ -215,7 +215,7 @@
               <el-input v-model="addPlan.blood_flow_volume"></el-input>
             </el-form-item>
           </el-col>
-       
+
 
           <el-col :span="8" v-if="isShows('透析液配方')">
             <el-form-item label="透析液配方:">
@@ -229,7 +229,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-         
+
           <el-col :span="8" v-if="isShows('抗凝剂')">
             <el-form-item label="抗凝剂:" prop="anticoagulant">
               <el-select
@@ -349,6 +349,21 @@
             </el-form-item>
           </el-col>
 
+
+
+
+          <el-col :span="8" v-if="isShows('透析器')">
+            <el-form-item label="透析器:">
+              <el-input v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('灌流器')">
+             <el-form-item label="灌流器:">
+               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
+             </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShows('碳酸氢盐')">
             <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
               <el-input v-model="addPlan.bicarbonate"></el-input>
@@ -689,7 +704,9 @@ export default {
         displace_liqui_part: '',
         displace_liqui_value: '',
         ultrafiltration: '',
-        blood_access: ''
+        blood_access: '',
+        dialysis_dialyszers:'',
+        dialysis_irrigation:'',
       },
       childPlan: {
         mode: '',
@@ -812,11 +829,16 @@ export default {
         page: 1,
         limit: 10,
         id: 0
-      }
+      },
+     stockType:[],
+     irrigations:[],
+     dialyzers:[],
+     dialysis_dialyszers:'',
+     dialysis_irrigation:"",
     }
   },
   watch: {
-   
+
    'dialysisTimeShow':function(){
       var val = this.addPlan.dialysis_duration_hour+":"+this.addPlan.dialysis_duration_minute
       var valTime = val.split(':')
@@ -826,7 +848,7 @@ export default {
    },
 
     'addPlan.dialysis_duration': function() {
-    
+
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
@@ -834,7 +856,7 @@ export default {
       )
     },
     'addPlan.anticoagulant_shouji': function() {
-      
+
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
@@ -852,7 +874,7 @@ export default {
   },
 
 
-  
+
   components: {
     MultiSelectBox,
     tableTitle,
@@ -868,15 +890,47 @@ export default {
           this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
           this.InnerDialogProps.selected = this.addPlan.dialyzer_perfusion_apparatus
           this.InnerDialogProps.isShowTextArea = false
+          break
+        case '6':
+           for(let i=0;i<this.dialyzers.length;i++){
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+           }
+           console.log("2222222",this.dialyzers)
+          this.InnerDialogProps.values = this.dialyzers
+          this.InnerDialogProps.titles = '透析器'
+          this.InnerDialogProps.type = 'dialyzers'
+          this.InnerDialogProps.selected = this.dialysis_dialyszers
+          this.InnerDialogProps.isShowTextArea = false
+
+          break
+        case '7':
+          for(let i=0;i<this.irrigations.length;i++){
+             this.irrigations[i].name = this.irrigations[i].specification_name
+           }
+          this.InnerDialogProps.values = this.irrigations
+          this.InnerDialogProps.titles = '灌流器'
+          this.InnerDialogProps.type = 'irrigations'
+          this.InnerDialogProps.selected = this.dialysis_irrigation
+          this.InnerDialogProps.isShowTextArea = false
+
           break
       }
     },
     innerDialogComfirm: function(val) {
+
       this.InnerDialogProps.visibility = false
       switch (val.type) {
         case 'dialyzer_perfusion_apparatus':
           this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
           break
+        case 'dialyzers':
+          this.dialysis_dialyszers = val.value.join(',')
+          console.log("3333333",this.addPlan.dialysis_dialyszers)
+
+          break
+        case 'irrigations':
+          this.dialysis_irrigation = val.value.join(',')
+          break
 
       }
     },
@@ -892,7 +946,7 @@ export default {
     },
 
     selectnDialysisTime(val) {
-     
+
       var valTime = val.split(':')
       this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
       console.log("透析时长",this.addPlan.dialysis_duration)
@@ -1177,7 +1231,7 @@ export default {
         }
       })
     },
-    submitEditSolution(formName) {
+      submitEditSolution(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           let mode = '2'
@@ -1187,6 +1241,8 @@ export default {
           ) {
             mode = '3'
           }
+          this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
+          this.addPlan.dialysis_irrigation = this.dialysis_irrigation
           console.log("2233333",this.addPlan)
           
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
@@ -1223,11 +1279,14 @@ export default {
       })
     },
     submitNewSolution(formName) {
-     
+
       this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
           const mode = '1'
+          this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
+          this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+          console.log("add",this.addPlan)
           createPatientDialysisSolution(
             this.patientID,
             this.addPlan,
@@ -1291,13 +1350,13 @@ export default {
         }else{
           this.addPlan.anticoagulant = row.anticoagulant
         }
-        
+
       }
       this.addPlan.replacement_total = row.replacement_total
 
       this.addPlan.target_ktv = row.target_ktv.toString()
       this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
-      
+
       this.addPlan.dialysis_duration = parseFloat(row.dialysis_duration_hour) + parseFloat((row.dialysis_duration_minute / 60).toFixed(2))
       this.addPlan.dialysis_duration_hour = row.dialysis_duration_hour
       this.addPlan.dialysis_duration_minute = row.dialysis_duration_minute
@@ -1317,7 +1376,10 @@ export default {
       this.addPlan.remark = row.remark
 
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
-
+      this.addPlan.dialysis_irrigation = row.dialysis_irrigation
+      this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
+      this.dialysis_irrigation = row.dialysis_irrigation
+      this.dialysis_dialyszers = row.dialysis_dialyszers
      if(row.body_fluid == 0){
        this.addPlan.body_fluid = ""
       }else{
@@ -1333,6 +1395,10 @@ export default {
 
       this.addPlan.registrars_id = row.registrars_id
       this.addPlan.created_time =  row.created_time
+      this.addPlan.dialysis_irrigation = row.dialysis_irrigation
+      this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
+      this.dialysis_irrigation = row.dialysis_irrigation
+      this.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialogVisible = true
       this.isEdit = true
       if(row.dialysate_formulation==0){
@@ -1461,6 +1527,39 @@ export default {
         if (response.data.state == 1) {
           this.tableData = response.data.data.solutions
           this.total = response.data.data.total
+
+            this.stockType = response.data.data.stockType
+            console.log("2333555555555",this.stockType)
+            if(this.stockType.length >0 ){
+               var arr = []
+                var arrTwo = []
+                for(let i=0;i<this.stockType.length;i++){
+                  if(this.stockType[i].stock_attribute == 2){
+                      arr.push(this.stockType[i])
+                  }
+                  if(this.stockType[i].stock_attribute == 3){
+                      arrTwo.push(this.stockType[i])
+                  }
+                }
+                var dialyzator = []
+                var irrigation = []
+                for(let i=0;i<arr.length;i++){
+                  for(let j=0;j<arr[i].GoodInfo.length;j++){
+                      dialyzator.push(arr[i].GoodInfo[j])
+                  }
+                }
+                console.log("透析器",dialyzator)
+                this.dialyzers = dialyzator
+
+                for(let i=0;i<arrTwo.length;i++){
+                  for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
+                      irrigation.push(arrTwo[i].GoodInfo[j])
+                  }
+                }
+                console.log("灌流器",irrigation)
+                this.irrigations = irrigation
+            }
+
         }
       })
     },
@@ -1688,7 +1787,8 @@ export default {
     }
 
     this.GetDeviceData()
-
+    this.fetchAllAdminUsers()
+    this.fetchPatientDialysisSolutions()
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set
     this.replacementWays = this.$store.getters.replacement_ways
@@ -1714,8 +1814,7 @@ export default {
 
     this.queryParams.id = this.patientID
     // this.fetchAllDoctorAndNurse();
-    this.fetchAllAdminUsers()
-    this.fetchPatientDialysisSolutions()
+
   }
 }
 </script>

src/xt_pages/user/vascularAccess.vue

@@ -508,6 +508,8 @@
                    this.user_status = ""
                    this.stop_reason = ""
                    this.remark = ""
+                }else{
+                   this.$message.error("该日期数据已存在!")
                 }
              })
            }  
@@ -644,7 +646,8 @@
                 user_status:this.form.user_status,
                 stop_reason:this.form.stop_reason,
                 remark:this.form.remark,
-                stop_time:this.form.stop_time
+                stop_time:this.form.stop_time,
+                patient_id:this.patientID
               }
               console.log("编辑",params)
               updatedVasularAccess(params).then(response=>{
@@ -654,6 +657,8 @@
                   this.$message.success("保存成功")
                   this.editDialogVisible = false
                   this.getlist()
+                }else{
+                   this.$message.error("该日期数据已存在!")
                 }
               })
            }

src/xt_pages/workforce/appointment.vue

@@ -84,8 +84,8 @@
           </el-button>
 
           <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
-          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板</el-button>
+          <el-button type="primary" size="small" @click="copySchedule">复制排班</el-button>
         </div>
     </div>
     <div class="app-container">
@@ -122,6 +122,27 @@
 
       <table-data :week-time="activeName" :partitions-prop="partitions" :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition" @event2="changeSchedule"></table-data>
+
+
+       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
+            <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
+                <el-form-item label="复制到 : " required  prop="copyWeek">
+                    <el-select v-model="form.copyWeek" placeholder="请选择">
+                        <el-option
+                        v-for="item in typeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="newVisible=false">取 消</el-button>
+                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+            </div>
+      </el-dialog>            
     </div>
   </div>
 </template>
@@ -130,7 +151,7 @@
   import moment from 'moment'
   import { parseTime } from '@/utils'
   import tableData from './components/tableData'
-  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList } from '@/api/schedule'
+  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList,copyPatientSchedule } from '@/api/schedule'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
   import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
@@ -169,7 +190,25 @@
         partition_id:0,
         start_time:"",
         end_time:"",
-        export_type:0
+        export_type:0,
+        form:{
+          copyWeek:"",
+        },
+        newVisible:false,
+        typeOptions:[],
+        timeOptions:[],
+        copyWeek:'',
+        weekList: [],
+        currentFirstDate1: '',
+        rules: {
+           copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],
+         },
+        weekNum:'',
+        weekDayArr:[],
+        todayDate:'',
+        clen:7,
+        nowYear: new Date().getFullYear(),
+        schedule_week:0,
       }
     },
     components: {
@@ -505,20 +544,7 @@
        return jsonData.map(v => filterVal.map(j => v[j]))
       },
 
-      //  formatJson(filterVal, jsonData) {
-      //    console.log("jsonData",jsonData)
-      //   return jsonData.map(v =>
-      //     filterVal.map(j => {
-      //       console.log("v",j)
-      //       console.log("8888888",v[j])
-      //       if (j === 'timestamp') {
-      //         return parseTime(v[j])
-      //       } else {
-      //         return v[j]
-      //       }
-      //     })
-      //   )
-      // },
+     
       printScheduleAction: function() {
         var date = new Date().getTime()
         if (this.activeName == 'lastWeek') {
@@ -998,8 +1024,7 @@
               return cur
             }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-            console.log("长度11111111111",tempObjArr[i][key].length)
-            console.log("长度22222222222",arr.length)
+           
             if (tempObjArr[i][key].length > arr.length) {    //比对原数组和去重后的原数组总数，不同的话则存在重复元素
               is_exist_repeat = true
             }
@@ -1012,7 +1037,7 @@
 
 
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
-          console.log("ssssssszzzzzzzqqqqqqqq")
+         
 
           this.dialogVisible = true
           return
@@ -1932,7 +1957,7 @@
        },
 
 
-       getThreeWeekList(){
+     getThreeWeekList(){
           var params ={
               start_time:this.start_time,
               end_time:this.end_time,
@@ -2067,30 +2092,28 @@
 
 
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
-               var start = this.getTimestamp(start_time)
+               var start = this.getTimestamp(start_time) - 28800
                console.log("start",start)
-              const end_time = moment().weekday(7).format('YYYY-MM-DD');
-              var end = this.getTimestamp(end_time)
-
-
+               const end_time = moment().weekday(7).format('YYYY-MM-DD');
+               var end = this.getTimestamp(end_time) - 28800
               console.log("end",end)
               var scheduleList = response.data.data.list
-              console.log("排班列表22222",scheduleList)
+             
               var week= []
               var nextWeek = []
               var lastWeek = []
               var next_start = this.getNextWeekOne(1)
-              var nextstart = this.getTimestamp(next_start)
-              // console.log("下周开始时间",nextstart)
+              var nextstart = this.getTimestamp(next_start) - 28800
+              console.log("下周开始时间",nextstart)
               var next_end = this.getNextWeek(1)
-              var nextend = this.getTimestamp(next_end)
-              // console.log("下周结束时间",nextend)
+              var nextend = this.getTimestamp(next_end) - 28800
+              console.log("下周结束时间",nextend)
               var last_start = this.getNextWeekOne(2)
               var last_end = this.getNextWeek(2)
-              var laststart = this.getTimestamp(last_start)
-              // console.log("下下周数据时间",laststart)
-              var lastend = this.getTimestamp(last_end)
-              // console.log("下下周数据时间",lastend)
+              var laststart = this.getTimestamp(last_start) - 28800
+              console.log("下下周数据时间",laststart)
+              var lastend = this.getTimestamp(last_end) - 28800
+              console.log("下下周数据时间",lastend)
 
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
@@ -2447,19 +2470,146 @@
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d}')
       },
+      
+      copySchedule(){
+        this.newVisible = true
+      },
 
+       getYearWeek(year,month,date){
+        /*
+            dateNow是当前日期
+            dateFirst是当年第一天
+            dataNumber是当前日期是今年第多少天
+            用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周
+        */
+        let dateNow = new Date(year, parseInt(month) - 1, date);
+        let dateFirst = new Date(year, 0, 1);
+        let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
+        return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);
+        },
+        getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
 
+        formatDate(date){
+            var year = date.getFullYear()+'.'
+            var month = (date.getMonth()+1)+'.';
+            var day = date.getDate();
+            return year+month+day
+        },
+        formatDateTwo(date){
+            var year = date.getFullYear()+'.'
+            var month = (date.getMonth()+1)+'.';
+            var day = date.getDate();
+            return year+month+day
+        },
+        addDate(date,n){
+            date.setDate(date.getDate()+n);
+            return date;
+        },
+            //
+        setDate(date){
+            var week = date.getDay()-1;
+            date = this.addDate(date,week*-1);
+            this.currentFirstDate = new Date(date);
+            this.currentDate = new Date(date)
+            for(var i = 0;i<this.clen; i++){
+                this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
+            }
+        },
+       setDate1 (date) {
+            var week = date.getDay() - 1
+            date = this.addDate(date, week * -1)
+            this.currentDate = new Date(date)
+            let arr1 = []
+            for (var i = 0; i < this.clen; i++) {
+                arr1.push(this.formatDate(i == 0 ? date : this.addDate(date, 1)))
+            }
+            this.weekList.push(arr1)
+            let num = this.weekNum
+            this.currentFirstDate1 = num + 1
+        },
+        getTimestamp(time) { //把时间日期转成时间戳
+          return (new Date(time)).getTime() / 1000
+        },
+        submitAction(formName){
+            var label = ""
+            for(let i=0;i<this.timeOptions.length;i++){
+               if(this.form.copyWeek == this.timeOptions[i].value){
+                 label = this.timeOptions[i].label
+               }
+            }
+           var start = label.split('~')
+           var copy_startime = this.getTimestamp(start[0])
+           var copy_endtime = this.getTimestamp(start[1])
+
+            const params = {
+              start_time:this.getTimestamp(this.weekDayArr[0]),
+              end_time:this.getTimestamp(this.weekDayArr[6]),
+              copy_startime:copy_startime,
+              copy_endtime:copy_endtime,
+            }
+           console.log("parasm",params)
+        
+           this.$refs[formName].validate(valid=>{
+              if(valid){
+                copyPatientSchedule(params).then(response=>{
+                   if(response.data.state == 1){
+                     var msg = response.data.data.msg
+                     this.$message.success("复制成功")
+                     this.newVisible = false
+                   }else{
+                    this.$message.error("复制失败")
+                  }
+                })
+              }
+           })
+        },
     },
     created() {
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
+     console.log("开始时间",start_time)
      this.start_time = start_time
+    
      var end_time = this.getNextWeek(2)
+     console.log("结束时间222222",end_time)
      this.end_time = end_time
       this.getWeekPanels()
       this.getInitDate()
 
       //获取三周排班数据
       this.getThreeWeekList()
+
+
+     let year = new Date().getFullYear()
+     let month = new Date().getMonth() + 1
+     let date = new Date().getDate()
+     this.weekNum = this.getYearWeek(year,month,date)
+     this.todayDate=this.formatDate(new Date())
+     this.setDate(new Date())
+
+     for (var i = 0; i <= 9; i++) {
+       this.setDate1(this.addDate(this.currentDate, 7))
+     }
+     let newNum = 0
+     for(let i = 0; i < this.weekList.length; i++){
+         if(this.weekNum + i + 1 <= 53){
+             let num = this.weekNum + i + 1
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
+             this.typeOptions.push({value:i,label:str})
+            let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+            this.timeOptions.push({value:i,label:stt})
+        }else{
+
+            newNum++
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
+            this.typeOptions.push({value:i,label:str})
+            let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+            this.timeOptions.push({value:i,label:stt})
+          }
+
+        }
+       
     }
   }
 </script>

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -79,9 +79,11 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="透析器" min-width="100" align="center">
+      <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+          <span > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
+          {{scope.row.prescription.dialysis_dialyszers}}
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
       <el-table-column label="抗凝剂" min-width="100" align="center">
@@ -254,7 +256,7 @@ export default {
              scheduleData[i].sort = scheduleData[i].number.sort
            }
           var arr =   scheduleData.sort(this.compare('sort'))
-          // console.log("元旦快乐",arr)
+           console.log("元旦快乐",arr)
           this.scheduleData = arr
         
          

src/xt_pages/workforce/components/tableData.vue

@@ -917,7 +917,7 @@ export default {
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
           
-          console.log("中国4444444444444",this.scheduleZone)
+        
         
           var that = this;
           this.scheduleZone.forEach(function(zone, index) {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -25,7 +25,7 @@
           </li>
         </ul>
       </div>
-      
+
       <div  class="title"><span class="name">班 次</span> :</div>
       <div class="time">
         <ul class>
@@ -79,11 +79,14 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="透析器" min-width="100" align="center">
+      <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+          {{scope.row.prescription.dialysis_dialyszers}}
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="抗凝剂" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
@@ -208,7 +211,7 @@ export default {
   },
   watch: {
     weekTime: function() {
-     
+
       var theType = this.weekType(this.weekTime);
       this.getSchedules(theType);
     }
@@ -232,7 +235,7 @@ export default {
           week_type:this.week_type,
           week_time:this.week_time,
         }
-       
+
       getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
@@ -241,7 +244,9 @@ export default {
              scheduleData[i].sort = scheduleData[i].number.sort
            }
           var arr = scheduleData.sort(this.compare('sort'))
-          
+
+          var arr =   scheduleData.sort(this.compare('sort'))
+        //  console.log("元旦快乐",arr)
           this.scheduleData = arr
         } else {
           this.$message.error("网络错误");
@@ -449,6 +454,7 @@ export default {
     //   week_type: this.week_type
     // };
     this.getScheduleWeekDay();
+    console.log("org2222222",this.$store.getters.xt_user.org.id)
   }
 };
 </script>

src/xt_pages/workforce/next_remind_print.vue

@@ -38,7 +38,7 @@
                   <td width="70">班次</td>
                   <td width="70">机号</td>
                   <td width="120">透析模式</td>
-                  <td width="100">透析器</td>
+                  <td width="100">透析器/灌流器</td>
                   <td width="120">抗凝剂</td>
                   <td width="100">总量</td>
                   <td width="300">长期医嘱</td>
@@ -60,7 +60,8 @@
                 </td>
                 <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
-
+                  {{main_collection.prescription.dialysis_dialyszers}} 
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width">

src/xt_pages/workforce/remind_print.vue

@@ -38,7 +38,7 @@
                   <td width="70">班次</td>
                   <td width="70">机号</td>
                   <td width="120">透析模式</td>
-                  <td width="100">透析器</td>
+                  <td width="100">透析器/灌流器</td>
                   <td width="120">抗凝剂</td>
                   <td width="100">总量</td>
                   <td width="300">长期医嘱</td>
@@ -60,7 +60,8 @@
                 </td>
                 <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
-
+                  {{main_collection.prescription.dialysis_dialyszers}} 
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width">