safecheck-client 3.0.34-1 → 3.0.34-11

package/src/filiale/yangchunboneng/pc/DefectPaperNew.vue

@@ -158,7 +158,30 @@
                      condition="f_user_name = '{}'"
                      style="width: 60%" placeholder="用户名称">
             </div>
-
+            <div :class="$parent.$parent.style"  >
+              <label class="font_normal_body">通气开始</label>
+              <datepicker
+                :value.sync="model.f_gas_start"
+                placeholder='首次通气时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_start"
+                condition="f_uservent_date >='{} 00:00:00'">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">通气结束</label>
+              <datepicker
+                :value.sync="model.f_gas_end"
+                placeholder='首次通气时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_end"
+                condition="f_uservent_date <=  '{} 23:59:59'">
+              </datepicker>
+            </div>
           </div>
 
 
@@ -311,6 +334,30 @@
                      condition="f_user_name = '{}'"
                      style="width: 60%" placeholder="用户名称">
             </div>
+            <div :class="$parent.$parent.style"  >
+              <label class="font_normal_body">通气开始</label>
+              <datepicker
+                :value.sync="model.f_gas_start"
+                placeholder='首次通气时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_start"
+                condition="f_uservent_date >='{} 00:00:00'">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">通气结束</label>
+              <datepicker
+                :value.sync="model.f_gas_end"
+                placeholder='首次通气时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_end"
+                condition="f_uservent_date <=  '{} 23:59:59'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -324,6 +371,9 @@
             <th><nobr>用户电话</nobr></th>
             <th><nobr>用户小区</nobr></th>
             <th><nobr>用户地址</nobr></th>
+            <th>
+              <nobr>通气时间</nobr>
+            </th>
             <th><nobr>安检时间</nobr></th>
             <th><nobr>安检员</nobr></th>
             <th><nobr>计划名</nobr></th>
@@ -346,6 +396,7 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_user_phone}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_residential_area}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_address}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_uservent_date}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_offsite_time}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_checker_name}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_plan_name}}</td>
@@ -523,8 +574,8 @@ export default {
       repairers:[],
       cbcs:[],
       thead: '',
-      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
-      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content','f_deal_count','f_repair_count','f_is_deal','f_is_repair','f_repairman'],
+      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','通气时间','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
+      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_uservent_date','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content','f_deal_count','f_repair_count','f_is_deal','f_is_repair','f_repairman'],
     }
   },
   props:{