safecheck-client 4.0.1-8 → 4.0.1-81

package/src/filiale/xinkang/android/AddPlanItem.vue

@@ -185,229 +185,277 @@
 </template>
 
 <script>
-  import {HttpResetClass, PagedList} from 'vue-client'
-  import Vue from 'vue'
-  import * as Util from '../../Util'
-  import {toStandardTimeString} from "../../Util";
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../../Util'
+import {isEmpty, toStandardTimeString} from "../../Util";
 
-  export default {
-    title: '安检员B',
-    data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
-        f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
-      model.f_sign = ['']
-      model.f_user_type = ''
-      model.f_user_state =['']
-      model.f_check_type =['']
-      model.myCycle = 0
-      model.fyCycle = 0
-      model.f_filialeid = Vue.user.orgid
-      //model.f_filialeid = 287
-      return {
-        model: model,
-        cbc:[],
-        showModal:false,
-        signs: [
-          {label:'请选择录入状态', value:''},
-          {label:'录入', value:'1'},
-          {label:'非录入', value:'0'},
-        ],
-        ischecks: [
-        ],
-        user_types: [
-          {label: '请选择用户类型', value: ''},
-          {label: '民用', value: '民用'},
-          {label: '非民用', value: '非民用'},
-        ],
-        f_user_states: [
-          {label:'请选择档案状态', value:''},
-          {label:'正常', value:'正常'},
-          {label:'点火', value:'点火'},
-        ],
-        f_check_types: [
-          {label:'请选择安检类型', value:''},
-          {label:'应检', value:'应检'},
-          {label:'超期', value:'超期'},
-        ],
-      }
+export default {
+  title: '安检员B',
+  data () {
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
+    model.f_sign = ['']
+    model.f_user_type = ''
+    model.f_user_state =['']
+    model.f_check_type =['']
+    model.myCycle = 0
+    model.fyCycle = 0
+    model.f_filialeid = Vue.user.orgid
+    //model.f_filialeid = 287
+    return {
+      model: model,
+      cbc:[],
+      showModal:false,
+      signs: [
+        {label:'请选择录入状态', value:''},
+        {label:'录入', value:'1'},
+        {label:'非录入', value:'0'},
+      ],
+      ischecks: [
+      ],
+      user_types: [
+        {label: '请选择用户类型', value: ''},
+        {label: '民用', value: '民用'},
+        {label: '非民用', value: '非民用'},
+      ],
+      f_user_states: [
+        {label:'请选择档案状态', value:''},
+        {label:'正常', value:'正常'},
+        {label:'点火', value:'点火'},
+      ],
+      f_check_types: [
+        {label:'请选择安检类型', value:''},
+        {label:'应检', value:'应检'},
+        {label:'超期', value:'超期'},
+      ],
+    }
+  },
+  ready () {
+    // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+    //   //tag)
+    //   if(res.data.code == 200){
+    //     this.model.myCycle = res.data.civil.value
+    //     this.model.fyCycle = res.data.civilian.value
+    //   }else{
+    //     //this.$showMessage(res.data.msg)
+    //   }
+    //
+    // })
+    // this.getCheckTime()
+    // this.Mreadibook()
+  },
+  computed: {
+    reload(){
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
     },
-    ready () {
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
-      //   //tag)
-      //   if(res.data.code == 200){
-      //     this.model.myCycle = res.data.civil.value
-      //     this.model.fyCycle = res.data.civilian.value
-      //   }else{
-      //     //this.$showMessage(res.data.msg)
-      //   }
-      //
-      // })
-      // this.getCheckTime()
-      // this.Mreadibook()
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  },
+  methods:{
+    scan(){
+      HostApp.__this__=this,
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
     },
-    computed: {
-      reload(){
-        this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
-      },
-      selected () {
-        return this.$refs.paged.$refs.grid.selected
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      let indexnum = datapa.indexOf("]C1")
+      if(indexnum != -1){
+        datapa = datapa.substring(indexnum+3,datapa.length)
       }
+      this.$refs.paged.$refs.cri.model.f_meternumber=datapa
     },
-    methods:{
-      scan(){
-        HostApp.__this__=this,
-          HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
-      },
-      getCode(){
-        let datapa = HostApp.getCode().data;
-        let indexnum = datapa.indexOf("]C1")
-        if(indexnum != -1){
-          datapa = datapa.substring(indexnum+3,datapa.length)
-        }
-        this.$refs.paged.$refs.cri.model.f_meternumber=datapa
-      },
-      getCheckTime(){
-        //tag
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,{data: {
-            items: 'f_circle,f_start_time',
-            tablename: 't_safe_circle',
-            condition: `f_filialeid  = '${Vue.user.orgid}'`,
-            orderitem: 'id'
-          }}).then(res=>{
-          //tag)
-          let  nocheck=''
-          let  ischeck=''
-          if (res.data[0]){
-            if (res.data[0].f_circle=='1'){
-              nocheck=`(ua.f_last_check_date<'${res.data[0].f_start_time}' or ua.f_last_check_date is null)`
-              ischeck=`ua.f_last_check_date>'${res.data[0].f_start_time}'`
+    getCheckTime(){
+      //tag
+      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,{data: {
+          items: 'f_circle,f_start_time',
+          tablename: 't_safe_circle',
+          condition: `f_filialeid  = '${Vue.user.orgid}'`,
+          orderitem: 'id'
+        }}).then(res=>{
+        //tag)
+        let  nocheck=''
+        let  ischeck=''
+        if (res.data[0]){
+          if (res.data[0].f_circle=='1'){
+            nocheck=`(ua.f_last_check_date<'${res.data[0].f_start_time}' or ua.f_last_check_date is null)`
+            ischeck=`ua.f_last_check_date>'${res.data[0].f_start_time}'`
 
-            }else{
-              let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
-              //tag
-              let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
-              //tag
-              nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
-              ischeck=`ua.f_last_check_date>'${time}'`
-            }
+          }else{
+            let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
             //tag
-            this.ischecks=[
-              {label: '全部', value: ''},
-              {label: '已检', value: ischeck },
-              {label: '未检', value: nocheck},
-            ]
+            let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
             //tag
-          }else{
-            this.$showMessage("未配置安检周期")
+            nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
+            ischeck=`ua.f_last_check_date>'${time}'`
           }
+          //tag
+          this.ischecks=[
+            {label: '全部', value: ''},
+            {label: '已检', value: ischeck },
+            {label: '未检', value: nocheck},
+          ]
+          //tag
+        }else{
+          this.$showMessage("未配置安检周期")
+        }
 
-        })
+      })
+      //tag
+    },
+    inspect(info) {
+      // 当前系统时间
+      let newdate = Util.toStandardTimeString()
+      if(isEmpty(info.f_last_check_date) || info.f_user_type == '非民用'){
+        info.id = ''
+        info.f_state = '未检'
+        info.f_no_checkplan = '无计划安检'
         //tag
-      },
-      inspect (info){
-        // 当前系统时间
-        let newdate = Util.toStandardTimeString()
-        if(info.f_last_check_state == '入户' && info.f_last_check_date){
-          // 解析上次安检时间
-          let lastCheckDate = new Date(info.f_last_check_date)
-          let currentDate = new Date(newdate)
-          // 计算时间差（毫秒）
-          let timeDiff = currentDate.getTime() - lastCheckDate.getTime()
-
-          // 6个月 = 6 * 30 * 24 * 60 * 60 * 1000 毫秒（约15552000000毫秒）
-          // 更精确的计算：6个月 = 6 * 平均每月30.44天 * 24 * 60 * 60 * 1000
-          let sixMonthsInMs = 6 * 30 * 24 * 60 * 60 * 1000
-
-          if(timeDiff > sixMonthsInMs){
-            this.$showMessage("该用户半年内已进行入户安检，无需再次安检",['confirm'])
-            // 超过6个月，结束方法
-            return
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+          //tag)
+          info['f_plan_meters'] = response.data
+          var pardate = {
+            _this: this,
+            tittle: '安检详情',
+            safe: true
           }
+          this.$dispatch('gotoson', pardate)
+          this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+        })
+      }else if(info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type == '民用'){
+        // 解析上次安检时间
+        let lastCheckDate = new Date(info.f_last_check_date)
+        let currentDate = new Date(newdate)
+        // 计算时间差（毫秒）
+        let timeDiff = currentDate.getTime() - lastCheckDate.getTime()
+
+        // 6个月 = 6 * 30 * 24 * 60 * 60 * 1000 毫秒（约15552000000毫秒）
+        // 更精确的计算：6个月 = 6 * 平均每月30.44天 * 24 * 60 * 60 * 1000
+        let sixMonthsInMs = 6 * 30 * 24 * 60 * 60 * 1000
+        if (timeDiff < sixMonthsInMs) {
+          this.$showMessage('该用户半年内已进行入户安检，是否继续安检?', ['confirm', 'cancel']).then((res) => {
+            if (res == 'confirm') {
+              info.id = ''
+              info.f_state = '未检'
+              info.f_no_checkplan = '无计划安检'
+              //tag
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+                //tag)
+                info['f_plan_meters'] = response.data
+                var pardate = {
+                  _this: this,
+                  tittle: '安检详情',
+                  safe: true
+                }
+                this.$dispatch('gotoson', pardate)
+                this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+              })
+            }
+          })
+        }else{
+          info.id = ''
+          info.f_state = '未检'
+          info.f_no_checkplan = '无计划安检'
+          //tag
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+            //tag)
+            info['f_plan_meters'] = response.data
+            var pardate = {
+              _this: this,
+              tittle: '安检详情',
+              safe: true
+            }
+            this.$dispatch('gotoson', pardate)
+            this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+          })
         }
+      }else {
         info.id = ''
         info.f_state = '未检'
         info.f_no_checkplan = '无计划安检'
         //tag
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
           //tag)
           info['f_plan_meters'] = response.data
           var pardate = {
-            _this:this,
-            tittle:'安检详情',
-            safe:true
+            _this: this,
+            tittle: '安检详情',
+            safe: true
           }
-          this.$dispatch('gotoson',pardate)
-          this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
-
+          this.$dispatch('gotoson', pardate)
+          this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
         })
-      },
-      Mreadibook(){
-        this.cbc=[]
-        let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
-          {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
-          {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
-          this.cbc = [{label: '全部', value: ''}]
-          //tag
-          //tag)
-          //tag
-          getMeterReadingBooks.data.meterbooks.forEach((res) => {
-            this.cbc.push({label: res.f_book_name, value: res.id})
-            /*if(res.f_book_slice_area){
-              if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
-                this.sliceArea.push(res.f_book_slice_area)
-              }
-            }*/
-          })
+      }
+
+    },
+    Mreadibook(){
+      this.cbc=[]
+      let http = new HttpResetClass()
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
+        {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
+        {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
+        this.cbc = [{label: '全部', value: ''}]
+        //tag
+        //tag)
+        //tag
+        getMeterReadingBooks.data.meterbooks.forEach((res) => {
+          this.cbc.push({label: res.f_book_name, value: res.id})
+          /*if(res.f_book_slice_area){
+            if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
+              this.sliceArea.push(res.f_book_slice_area)
+            }
+          }*/
         })
+      })
 
 
-      }
     }
   }
+}
 </script>
 <style scoped>
-  .app-row {
-    background-color: white;
-    padding: 10px 10px 0 10px;
-    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-  }
-  .search_input {
-    border: 0;
-    outline: none;
-  }
-  .font{
-    font: 15px PingFang-SC-Medium;
-    color: #666666;
-  }
-  .input-font{
-    font: 15px PingFang-SC-Medium;
-    color: #333333;
-  }
-  .btn-font{
-    font:600 16px PingFang-SC-Bold;
-    color: #499EDF;
-  }
-  .btn-color{
-    background-color: #FFFFFF;
-    border-radius: 10px ;
-    border: 1px solid #499EDF;
-  }
-  .app-text {
-    font-size: 12px;
-  }
-  .panel-self{
-    border-radius: 10px;
-    border:1px solid #499EDF;
-    background-color: #F8F8F8;
-  }
-  .yybtn-color{
-    border-radius: 4px ;
-    border: 1px solid #499EDF;
-  }
-  .qxbtn-color{
-    background-color: #FFFFFF;
-    border-radius: 4px ;
-    border: 1px solid #499EDF;
-  }
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
 </style>

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

@@ -325,6 +325,7 @@ export default {
         this.$showMessage('签名必须上传')
         return
       }
+      this.deal.f_other_dealpath = this.deal.f_deal_path
       HostApp.__this__ = this
       HostApp.logicWithHint({'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
         'data': this.deal, 'backresult':1