库存显示展示

src/api/advice.js

 }
 
 export function getNewSchedualDoctors(params) {
+  console.log('params-----', params)
   return request({
     url: '/api/schedule/new/advices',
     method: 'get',
   })
 }
 
-export function GetMobileScheduleList(params){
+export function GetMobileScheduleList(params) {
   return request({
-    url:"/api/schedule/getmobileschedulelist",
-    method:"Get",
-    params:params,
+    url: '/api/schedule/getmobileschedulelist',
+    method: 'Get',
+    params: params
   })
-}
+}

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

                    <td style="text-align:left;" >
                     <span style="display:inline-block;margin-left:15px;"
                       >透析/灌流器型号:
-                     {{
+                    <span v-if="record.prescription.dialysis_dialyszers!=''">
+                      {{
                         record.prescription.dialysis_dialyszers
                          ?  record.prescription.dialysis_dialyszers
                            : "/"
-                        }}&nbsp;&nbsp;{{
+                        }}
+                      </span> 
+                      <span v-if="record.prescription.dialysis_irrigation==''">
+                        &nbsp;&nbsp;{{
                         record.prescription.dialysis_irrigation
                         ? record.prescription.dialysis_irrigation
                         : "/"
                     }}
                       </span>
+                      <span v-if="record.prescription.dialysis_strainer!=''">
+                      &nbsp;&nbsp;{{
+                          record.prescription.dialysis_strainer
+                          ? record.prescription.dialysis_strainer
+                          : "/"
+                      }}
+                      </span> 
+                      </span>
                   </td>
                    <td style="text-align:left;" colspan="2">
                     <span style="display:inline-block;margin-left:15px;"

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType">
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
             return v.getTime() < new Date().getTime() - 86400000;
           },
         },
+        zoneIdList:[]
       }
     },
     created() {
             return false
           } else {
             this.partitionArr = response.data.data.zone
-            this.partitionArr.unshift({ id: 0, name: '全部' })
+            for(let i=0;i<this.partitionArr.length;i++){
+              this.zoneIdList.push(this.partitionArr[i].id)
+            }
+            // this.partitionArr.unshift({ id: 0, name: '全部' })
           }
         })
       },
       statistics() {
          this.tableList = []
+
+          var str = ""
+         if(this.partion_type==0){
+            str = this.zoneIdList.join(",")
+         }
+         if(this.partion_type!=0){
+            str = this.partion_type.join(",")
+         }
+          
           var params = {
             schedule_type:this.schedule_type,
-            partion_type:this.partion_type,
+            partion_type:str,
             selected_date:this.query.schedule_date,
           }
         // console.log("params2332232wo",params)

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple>
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
         typeList:[],
         ids:"",
         org_id:0,
+        zoneIdList:[],
       }
     },
     created() {
             return false
           } else {
             this.partitionArr = response.data.data.zone
-            this.partitionArr.unshift({ id: 0, name: '全部' })
+            for(let i=0;i<this.partitionArr.length;i++){
+              this.zoneIdList.push(this.partitionArr[i].id)
+            }
+            // this.partitionArr.unshift({ id: 0, name: '全部' })
           }
         })
       },
       statistics() {
         this.tableList = []
+        
+        var arr = this.zoneIdList.join(",")
+        var str = ""
+         if(this.partion_type == 0){
+            str = arr
+         }
+         if(this.partion_type != 0){
+            str = this.partion_type.join(',')
+         }
+        
+        console.log("str-==-------",str)
         var params = {
           schedule_type:this.schedule_type,
-          partion_type:this.partion_type,
+          partion_type:str,
           selected_date:this.query.schedule_date,
         }
+       
        getDialysisGoodTotalCount(params).then(response=>{
           if(response.data.state == 1){
             this.startDialogVisible = true

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

           case '3': // 透析前症状
 
             this.InnerDialogProps.values = this.symptom_before_dialysis
-            this.InnerDialogProps.titles = '透析期间'
+            this.InnerDialogProps.titles = '透析前症状'
             this.InnerDialogProps.type = 'symptom_before_dialysis'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.symptom_before_dialysis
             this.InnerDialogProps.isShowTextArea = false

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

                 org_id == 10210 ||
                 org_id == 9555 || org_id == 10387
                 || org_id == 10432
-                || org_id == 10445)
+                || org_id == 10445
+                || org_id == 10410)
             "
           >
             <template slot-scope="scope">
               org_id!= 10210 &&
               org_id != 9555 && org_id!=10387
               && org_id!=10432 && org_id!=10445
+              && org_id!=10410
             "
           >
             <template slot-scope="scope">
                 template_id == 47 ||
                 template_id == 60 ||
                 org_id == 10432 ||
-                org_id == 10445)
+                org_id == 10445 ||
+                org_id == 10410)
             "
           >
             <template slot-scope="scope">
               template_id != 47 &&
               template_id != 60 &&
               org_id!=10432 &&
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10410
             "
           >
             <template slot-scope="scope">
                 template_id == 47 ||
                 template_id == 60 ||
                 org_id== 10432 || 
-                org_id== 10445)
+                org_id== 10445 ||
+                org_id== 10410)
             "
           >
             <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
               template_id != 47 &&
               template_id != 60 &&
               org_id!=10432 && 
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10410
             "
           >
             <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
                 org_id == 10340 ||
                 org_id == 10387 ||
                 org_id == 10432 ||
-                org_id == 10445)
+                org_id == 10445 ||
+                org_id == 10410)
             "
           >
             <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
               org_id != 9555 &&
               org_id!=10387&&
               org_id!=10432 && 
-              org_id!=10445
+              org_id!=10445 && 
+              org_id!=10410
             "
           >
             <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <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 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" 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 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445"  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 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" 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 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445" 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 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" 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 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410"  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 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" 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 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410" 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 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/newDoctorAdvice.vue

         </div>
       </div>
 
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">执行频率</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == execution_frequency ? 'active' : ''"
+              @click="selectFrequencyWay(item.id)"
+              v-for="item in excutList"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+
        <div class="cell clearfix">
         <label class="title"> <span class="name">执行状态</span> : </label>
         <div class="time">
       tableDataList:[],
       adminUserList:[],
       doctorMap:[],
+      excutList:[],
+      execution_frequency:"",
     };
   },
   created() {
        this.delivery_way = val
        this.requestSchedualDoctors(this.time)
     },
+    selectFrequencyWay(val){
+      this.execution_frequency = val
+      this.requestSchedualDoctors(this.time)
+    },
 
     selectExcutionWay(val){
        this.excution_way = val
           var obj = {id:0,name:"全部"}
           this.deliveryWay.push(obj)
           this.deliveryWay.push(...dics)
+          var objOne = {id:0,name:"全部"}
+           this.excutList.push(objOne)
+           var efs = response.data.data.efs
+           this.excutList.push(...efs)
+          console.log("执行瓶绿",this.excutList)
         }
       });
     },
         if(name == '全部'){
           name = ""
         }
+       
+        var nameOne = ""
+         for(let i=0;i<this.excutList.length;i++){
+            if(this.execution_frequency == this.excutList[i].id){
+              nameOne = this.excutList[i].name
+            }
+        }
+
+         if(nameOne == '全部'){
+          nameOne = ""
+        }
 
         let newTime =  moment(time).format('YYYY-MM-DD')
 
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
-
-        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType}).then(rs => {
+       
+        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
         if(name == '全部'){
           name = ""
        }
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+        var nameOne = ""
+         for(let i=0;i<this.excutList.length;i++){
+            if(this.execution_frequency == this.excutList[i].id){
+              nameOne = this.excutList[i].name
+            }
+        }
+
+         if(nameOne == '全部'){
+          nameOne = ""
+        }
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/signPrint.vue

             show:true,
             showOne:false,
             delivery_way:"",
-            list:[]
+            list:[],
+            execution_frequency:"",
         }
     },
     methods:{
             patient_type: 0,
             advice_type: 2,
             delivery_way:this.delivery_way,
+            execution_frequency:this.execution_frequency,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
       var delivery_way = this.$route.query.delivery_way
       console.log("delivery_Way",delivery_way)
       this.delivery_way = delivery_way
+      var execution_frequency = this.$route.query.execution_frequency
+      this.execution_frequency = execution_frequency
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

             </td>
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
-                透析/灌流器型号:{{
+                透析/灌流器型号:
+                <span v-if="prescription.dialysis_dialyszers!=''">{{
                   prescription.dialysis_dialyszers
                     ? prescription.dialysis_dialyszers
                     : "/"
-                }}&nbsp;&nbsp;{{
+                }}
+                </span>
+               <span v-if="prescription.dialysis_irrigation!=''">
+                 &nbsp;&nbsp;{{
                   prescription.dialysis_irrigation
                     ? prescription.dialysis_irrigation
                     : "/"
                 }}
+               </span>
+               <span v-if="prescription.dialysis_strainer!=''">
+                &nbsp;&nbsp;{{
+                    prescription.dialysis_strainer
+                      ? prescription.dialysis_strainer
+                      : "/"
+                  }}
+               </span>
+                
               </span>
             </td>
             <td style="text-align: left" colspan="2">

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/treatBatchPrint.vue

       class="prescription-print"
       v-for="(item,index) in i.prescriptions"
       :key="index"
+
     >
+
       <span v-if="org_id == 10138">
         <img
           src="https://kuyi.shengws.com/bailin/bltotle.jpg"
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
               </div> -->
         <div class="drugsBox" v-for="(it, index) in item.project" :key="index">
-          <div class="drugsOne">
+          <div class="drugsOne" v-if="(item.type == 2 && item.project.cost_classify != 3) || item.type ==3">
             <span style="font-weight: bold">{{ index + 1 + "." }}</span
             >{{
               it.type == 2 ? it.project.project_name : it.good_info.good_name
         alt=""
       /></span>
       <div style="page-break-after: always"></div>
+
     </div>
 
     <!-- <div id='prescriptionPrint'>

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

 
           let new_patients = []
           if (type != 3) {
-            Arr.forEach((i) => {
-              if (i.prescriptions.length != 0) {
-                new_patients.push(i)
-              }
-            })
+
+            if (type == 1){
+              Arr.forEach((i) => {
+                if (i.prescriptions.length != 0) {
+                  new_patients.push(i)
+                }
+              })
+
+            }else {
+              Arr.forEach((i) => {
+                if (i.prescriptions.length != 0) {
+                  for(let b = 0; b < i.prescriptions.length;b++) {
+                    for (let c = 0; c < i.prescriptions[b].project.length; c++) {
+                      if(b == 1) {
+                        console.log(i.prescriptions[b].project.length)
+                        console.log(i.prescriptions[b].project[c].project.cost_classify)
+                        console.log(i.prescriptions[b].project[c].type)
+                      }
+                      if(i.prescriptions[b].project[c].type == 2 && i.prescriptions[b].project[c].project.cost_classify == 3){
+                        i.prescriptions[b].project.splice(c,1)
+                        c--
+                      }
+                    }
+                  }
+                  new_patients.push(i)
+                }
+              })
+              let new_patients_two = []
+
+              new_patients.forEach((i) => {
+                if (i.prescriptions.length != 0) {
+                  for(let b = 0; b < i.prescriptions.length;b++) {
+                    if(i.prescriptions[b].project.length == 0){
+                      i.prescriptions.splice(b,1)
+                      b--
+                    }
+                  }
+                  new_patients_two.push(i)
+                }
+              })
+              new_patients = new_patients_two
+            }
+
           } else {
             Arr.forEach((el) => {
               el.new_prescriptions.forEach((o) => {

src/xt_pages/workforce/components/tableData.vue

       this.currentData.patient_id = 0;
     },
     getSchedules() {
+      console.log
          var partionStr = this.partition_id
          var arr = this.zoneIdList.join(',')
          var str = ""
           patitionid:str,
           schedule_type:this.schedule_type,
         }
+        
 
       getSchedulesOne(params).then(response => {
         if (response.data.state == 1) {