safecheck-client 3.0.32 → 3.0.33-2

package/src/components/rongcheng/AspiratedDevices.vue

@@ -34,7 +34,7 @@
                             v-if="row.type == 'date'"
                             v-show="row.isshow"
                             :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format=row.format
                             :show-reset-button="reset" readonly="readonly">
                 </datepicker>
               </div>
@@ -206,6 +206,12 @@
         f_issue_reading:{},
         //上期表读数
         f_prior_reading:{},
+        // 安装日期
+        f_install_date:{},
+        // 使用年限
+        f_use_limit:{},
+        // 到期日期
+        f_scrap_date:{},
         // 气量异常差值允许误差
         gasDeviation: (
           function (_this) {
@@ -625,6 +631,16 @@
         }
 
       },
+      // 计算到期日期
+      getscrapNumber() {
+        //tag
+        if(!this.f_items[this.f_install_date.index].f_item_value || !this.f_items[this.f_use_limit.index].f_item_value ){
+          return
+        }
+        let data = new Date(this.f_items[this.f_install_date.index].f_item_value)
+        data.setFullYear(data.getFullYear() + parseInt(this.f_items[this.f_use_limit.index].f_item_value))
+        this.f_items[this.f_scrap_date.index].f_item_value = data.toISOString().split('T')[0];
+      },
       readmeter(){
         if(!this.f_items[this.f_issue_reading.index].f_item_value && parseFloat(this.f_items[this.f_issue_reading.index].f_item_value).toString() == "NaN"){
           this.$showMessage("请输入本期表读数！")
@@ -738,6 +754,7 @@
           isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
           readonly: this.config[this.device.device].items[item].readonly == true?true:false,
           remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
+          format: this.config[this.device.device].items[item].format ? this.config[this.device.device].items[item].format : 'yyyy-MM-dd 00:00:00',
           f_path: '',
           tooltip:'',
           f_live_dispose:'',
@@ -871,6 +888,22 @@
               }
             }
           }
+          if (this.f_items[f].f_item_name == '安装日期') {
+            //tag)
+            this.f_install_date.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '使用年限') {
+            //tag)
+            this.f_use_limit.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '到期日期') {
+            //tag)
+            this.f_scrap_date.index = f
+          }
         }
         //tag)
         this.$set('piece.f_items',this.f_items)

package/src/components/rongcheng/DefectPaper.vue

@@ -407,7 +407,7 @@
         defectType:[],
         userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defectLeave:'',
-        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'}],
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患'}],
         thead: '',
         headData: ['入户状态','用户名','用户电话','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','一级隐患数','一级隐患','二级隐患数','二级隐患','三级隐患数','三级隐患','其他隐患','隐患内容'],
         bodyData: ['f_entry_status','f_user_name','f_user_phone','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_fist_count','f_fist_content','f_second_count','f_second_content','f_third_count','f_third_content','f_other_count','f_defect_content'],
@@ -468,6 +468,9 @@
           if(this.defectLeave=='三级隐患'){
             args.condition += ` and f_third_count > 0`
           }
+          if(this.defectLeave=='其他隐患'){
+            args.condition += ` and f_other_count > 0`
+          }
         }
         if(this.defectType.length>0){
           args.condition += ` and (`

package/src/components/rongcheng/SafecheckDevices.vue

@@ -34,7 +34,7 @@
                             v-if="row.type == 'date'"
                             v-show="row.isshow"
                             :disabled-days-of-Week="[]"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format=row.format
                             :show-reset-button="reset" readonly="readonly">
                 </datepicker>
               </div>
@@ -222,6 +222,12 @@
         f_issue_reading:{},
         //上期表读数
         f_prior_reading:{},
+        // 安装日期
+        f_install_date:{},
+        // 使用年限
+        f_use_limit:{},
+        // 到期日期
+        f_scrap_date:{},
         // 气量异常差值允许误差
         gasDeviation: (
           function (_this) {
@@ -656,6 +662,16 @@
         }
 
       },
+      // 计算到期日期
+      getscrapNumber() {
+        //tag
+        if(!this.f_items[this.f_install_date.index].f_item_value || !this.f_items[this.f_use_limit.index].f_item_value ){
+          return
+        }
+        let data = new Date(this.f_items[this.f_install_date.index].f_item_value)
+        data.setFullYear(data.getFullYear() + parseInt(this.f_items[this.f_use_limit.index].f_item_value))
+        this.f_items[this.f_scrap_date.index].f_item_value = data.toISOString().split('T')[0];
+      },
       readmeter(){
         if(!this.f_items[this.f_issue_reading.index].f_item_value && parseFloat(this.f_items[this.f_issue_reading.index].f_item_value).toString() == "NaN"){
           this.$showMessage("请输入本期表读数！")
@@ -769,6 +785,7 @@
           isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
           readonly: this.config[this.device.device].items[item].readonly == true?true:false,
           remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
+          format: this.config[this.device.device].items[item].format ? this.config[this.device.device].items[item].format : 'yyyy-MM-dd 00:00:00',
           f_path: '',
           f_second_path:'',
           tooltip:'',
@@ -903,6 +920,22 @@
               }
             }
           }
+          if (this.f_items[f].f_item_name == '安装日期') {
+            //tag)
+            this.f_install_date.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '使用年限') {
+            //tag)
+            this.f_use_limit.index = f
+            this.$watch('f_items[' + f + '].f_item_value', function () {
+              this.getscrapNumber()
+            })
+          }else if (this.f_items[f].f_item_name == '到期日期') {
+            //tag)
+            this.f_scrap_date.index = f
+          }
         }
         //tag)
         this.$set('piece.f_items',this.f_items)

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -1795,6 +1795,7 @@ export default {
       this.$set('data.f_idnumber', this.item.f_idnumber)
       this.$set('data.f_comments', this.item.f_comments)
       this.$set('data.f_userproperties', this.item.f_userproperties)
+      this.$set('data.f_usetype', this.item.f_plan_meters[0].f_usetype)
       // this.$set('data.f_user_inhome_time', this.item.f_user_inhome_time)
       // this.$set('data.f_user_check_time', this.item.f_user_check_time)
       // this.$set('data.f_user_spare_phone', this.item.f_user_spare_phone)

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -44,6 +44,17 @@
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_state }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title text-left font" style="width: 23%;float: left"><b>使用类型:</b></p>
+          <v-select
+                     :value.sync="f_usetype"
+                     v-model="f_usetype"
+                     width="67%"
+                     placeholder='请选择'
+                     :value-single="true"
+                     :options="f_usetypes"
+                     clear-button></v-select>
+        </div>
         <div class="col-xs-12" style="margin-left: 20px">
           <!-- <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>-->
           <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>
@@ -914,6 +925,12 @@
       RadioGroup,
       Radio
     },
+    computed: {
+      // 使用类型
+      f_usetypes() {
+        return this.$appdata.getParam('使用类型')
+      }
+    },
   }
 </script>
 

package/src/filiale/Util.js

@@ -20,6 +20,13 @@ export function getAttendanceState(item, timeToWork, timeToGo) {
     item.f_state = '正常'
 }
 
+export function dateAddDay (date, day) {
+  date.setDate(date.getDate() + Number.parseInt(day));
+  let month = date.getMonth()+1
+  let date2 = date.getDate()
+  return date.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date2<10? '0'+ date2 : date2)
+}
+
 // 字符串进行解密
 export function uncompileStr (code) {
   code = unescape(code)

package/src/filiale/ankangyihua/android/AndroidDefectDeal.vue

@@ -491,7 +491,7 @@
       commitDealDefect() {
         //tag
         //tag)
-        debugger
+
         if(this.deal.result.f_rect_methods==''){
          this.$showMessage('请选择整改方式')
           return

package/src/filiale/ankangyihua/android/CurrentCreate.vue

@@ -862,7 +862,7 @@
 
         //tag
         this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
-        debugger
+
 
       },
       getNewOrder(){

package/src/filiale/bayan/pc/NewCheckpaper.vue

@@ -1823,7 +1823,7 @@ export default {
     }
   },
   ready() {
-    debugger
+
     if (this.item.f_check_type == '非民用'){
       this.config = this.config3
     }