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

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1094,14 +1094,19 @@
                                 <td>楼层</td>
                                 <td>湿化瓶<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
+                                <td width="40">检查合格<br/></td>
                                 <td>止血带<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td>医疗垃圾桶<br/>1000mg/l含氯制剂</td>
+                                <td width="40">检查合格<br/></td>
+                                <td>医疗垃圾桶<br/>1000mg/l含<br/>氯制剂</td>
                                 <td>负责人</td>
-                                <td>体温计<br/>75%酒精<br/>浸泡</td>
+                                <td width="40">检查合格<br/></td>
+                                <td>体温计<br/>75%酒精浸泡</td>
                                 <td>负责人</td>
-                                <td>体温枪<br/>75%酒精<br/>擦拭</td>
+                                <td width="40">检查合格<br/></td>
+                                <td>体温枪<br/>75%酒精擦拭</td>
                                 <td>负责人</td>
+                                <td width="40">检查合格<br/></td>
                                
                             </tr>
 
@@ -1117,6 +1122,9 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
+
+                                <td>是<br/></td>
+
                                 <td>{{getTimeTwo(item.sencond_start_time) }} - {{getTimeTwo( item.sencond_end_time) }}</td>
                                 <td>
                                  <span v-if="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator) == ''">
@@ -1126,6 +1134,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
+                                <td>是<br/></td>
                                 <td>{{getTimeTwo(item.third_start_time) }} - {{getTimeTwo(item.third_end_time)  }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.third_creator?item.third_creator:item.third_creator) == ''">
@@ -1135,6 +1144,8 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.third_creator?item.third_creator:item.third_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
+
+                                <td>是<br/></td>
                                 <td>{{getTimeTwo(item.fourth_start_time)  }} - {{getTimeTwo(item.fourth_end_time)  }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator) == ''">
@@ -1153,7 +1164,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                              
+                                <td>是<br/></td>
                             </tr>
                          </table>   
 

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

@@ -20,8 +20,7 @@
                       :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
-                      placeholder="选择日期时间" align="right"
-                      :picker-options="pickerOptions"></el-date-picker>
+                      placeholder="选择日期时间" align="right"></el-date-picker>
       <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
                 class="filter-item" v-model="query.keywords"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>

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

@@ -21,7 +21,7 @@
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
                       placeholder="选择日期时间" align="right"
-                      :picker-options="pickerOptions"></el-date-picker>
+                      ></el-date-picker>
       <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
                 class="filter-item" v-model="query.keywords"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>

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

@@ -237,13 +237,15 @@
         dialysisSett:{},
         total_one:0,
         total_two:0,
-        total_three:0
+        total_three:0,
+        org_id:'',
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
       this.displace_liqui_part_option = this.$store.getters.displace_liqui
       this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')
       this.getlist()
@@ -309,14 +311,27 @@
         }
      },
       printAction: function() {
-        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 0px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 0px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
-        printJS({
-          printable: 'print_content',
-          type: 'html',
-          documentTitle: '  ',
-          style: style,
-          scanStyles: false
-       })
+        if(this.org_id != 10495 && this.org_id != 0){
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 0px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 0px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+          })
+        }else{
+          // const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 0px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 0px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+          })
+        }
+        
       },
       getAnticoagualnt(id){
        var name = ""

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -717,7 +717,7 @@
               "storehouse_id":parseInt(this.storehouse_id),
             }
 
-
+            console.log("paramswowowoowow",params)
             var warehout_id = parseInt(this.$route.query.id)
            
             editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer,this.storehouse_id).then(response => {
@@ -835,13 +835,13 @@
             
               
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
-              this.recordInfo.recordData[i].expiry_date = this.getTime(val.first_xt_warehouse_info.expiry_date)
+              this.recordInfo.recordData[i].expiry_date = this.getTime(val.first_xt_warehouse_info.expiry_date,"{y}-{m}-{d}")
             }else{
               this.recordInfo.recordData[i].expiry_date = ""
             }
 
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.product_date >0){
-              this.recordInfo.recordData[i].product_date = this.getTime(val.first_xt_warehouse_info.product_date)
+              this.recordInfo.recordData[i].product_date = this.getTime(val.first_xt_warehouse_info.product_date,"{y}-{m}-{d}")
             }else{
               this.recordInfo.recordData[i].product_date = ""
             }