新分支

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1094,14 +1094,19 @@
                                 <td>楼层</td>
                                 <td>湿化瓶<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
+                                <td width="50px">检查合格<br/></td>
                                 <td>止血带<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
+                                <td width="50px">检查合格<br/></td>
                                 <td>医疗垃圾桶<br/>1000mg/l含氯制剂</td>
                                 <td>负责人</td>
+                                <td width="50px">检查合格<br/></td>
                                 <td>体温计<br/>75%酒精<br/>浸泡</td>
                                 <td>负责人</td>
+                                <td width="50px">检查合格<br/></td>
                                 <td>体温枪<br/>75%酒精<br/>擦拭</td>
                                 <td>负责人</td>
+                                <td>检查合格<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/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 = ""
             }