safecheck-client 3.0.34-78 → 3.0.34-80

package/src/filiale/siyang/android.js

@@ -1,13 +1,14 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'phone-record-info': (resolve) => { require(['./android/PhoneRecordInfo.vue'], resolve) },
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) },
-  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
-  'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },
-}
-
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'phone-record-info': (resolve) => { require(['./android/PhoneRecordInfo.vue'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
+  'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'app-check-plan': (resolve) => { require(['./android/AppCheckPlan'], resolve) },
+}
+
+exports.specialComp = specialComp
+

package/src/filiale/siyang/pc/CheckBookList.vue

@@ -0,0 +1,396 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row" v-show="!$parent.$parent.$parent.showItemAll">
+            <div :class="$parent.$parent.style2" style="margin: 0px">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                :value-multiple="true"
+                condition=" f_checker_name in {}">
+              </role-selector-safe>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">片区名称</label>
+              <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.checkBooks' placeholder='片区名称'
+                        close-on-select
+                        condition="tcb.id ='{}'"></v-select>
+            </div>
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <label class="font_normal_body">表册类型</label>-->
+<!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
+<!--                        :value-single="true" style="width: 60%"-->
+<!--                        class="select_list select"-->
+<!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
+<!--                        close-on-select-->
+<!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
+<!--            </div>-->
+<!--            <div :class="$parent.$parent.style">-->
+<!--              <label class="font_normal_body">用户类型</label>-->
+<!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
+<!--                        :value-single="true" style="width: 60%"-->
+<!--                        class="select_list select"-->
+<!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
+<!--                        close-on-select-->
+<!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
+<!--            </div>-->
+            <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
+              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增片区</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">片区用户管理</button>
+              <div style="float: right" class="button_spacing"
+                   v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
+                   @click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
+              </div>
+
+
+          </div>
+
+
+          <div class="row" v-show="$parent.$parent.$parent.showItemAll">
+            <div :class="$parent.$parent.style2" style="margin: 0px">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                :value-multiple="true"
+                condition=" f_checker_name in {}">
+              </role-selector-safe>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">片区名</label>
+              <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.checkBooks' placeholder='片区名称'
+                        close-on-select
+                        condition="tcb.id ='{}'"></v-select>
+            </div>
+            <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
+              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增片区</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">片区用户管理</button>
+              <div style="float: right" class="button_spacing"
+                   v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
+                   @click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
+<!--              <div style="float: right" class="button_spacing"-->
+<!--                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
+<!--                   @click="$parent.$parent.hidden()">-->
+<!--              </div>-->
+            </div>
+
+          </div>
+
+        </div>
+      </criteria>
+      <data-grid :model="model" partial="list" class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <nobr>所属安检员11</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>
+            <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 v-show="$parent.$parent.$parent.showCaoZuo">-->
+<!--              <nobr>操作</nobr>-->
+<!--            </th>-->
+          </tr>
+        </template>
+        <template partial='body' >
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_checker_name }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_check_book_name }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_user_type }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_create_date }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_create_person }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_run_date }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_around_time }}{{ row.f_around_unit }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.f_user_type==='民用'?row.num2:row.num3}}</b></button></td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.xiafa }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.yijian }}</td>
+          <td  :style="{ textAlign: 'center', color:$parent.$parent.$parent.setbackgroundColor(row.f_run_date) ? 'red' : ''}">{{ row.weijian }}</td>
+<!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showModal" :backdrop="false" id="checkbookEntryShow">
+      <article slot="modal-body" class="modal-body">
+        <check-book-entry v-if="showModal" @select-changed="selectedEntry"></check-book-entry>
+      </article>
+      <footer slot="modal-footer">
+      </footer>
+
+    </modal>
+    <modal :show.sync="showSendModal" :backdrop="false" width="90%" height="90%">
+      <article slot="modal-body" class="modal-body" style="height: 80vh">
+        <check-book-search-user-list  v-if="showSendModal" :row="checkBookRow" :bookrow="checkBookRow" :needprops="needprops":userlogin="userlogin"></check-book-search-user-list>
+      </article>
+      <footer slot="modal-footer">
+      </footer>
+
+    </modal>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import bus from '../../../bus'
+export default {
+  title: '用户安检情况',
+  data () {
+    return {
+      showSendModal:false,
+      searchData: {
+        condition: '1=1'
+      },
+      showCaoZuo:false,
+      userlogin:{
+        id:this.$login.f.id,
+        name:this.$login.f.name,
+        orgid:this.$login.f.orgid,
+        orgstr:this.$login.f.orgs,
+      },
+      checkBooks:[],
+      bookTypes: [{label: '全部', value: ''}, {label: '用户', value: '用户'}, {label: '小区', value: '小区'}],
+      userTypes: [{label: '全部', value: ''}, {label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
+      aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '日'}],
+      showModal:false,
+      excelHeaders: {
+
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户名称',
+        'f_user_phone': '用户电话',
+        'f_meternumber': '用户表号',
+        'f_user_type': '用户类型',
+        'f_last_checker': '安检员',
+        'f_residential_area': '小区名称',
+        'f_address': '地址',
+        'f_last_check_date': '安检日期',
+        'f_last_check_state': '安检状态',
+        'f_last_check_result': '安检结果'
+      },
+      model: new PagedList('rs/sql/QueryCheckBook', 20),
+      checkBookRow:{},
+      checkBook :{
+        f_check_book_name: '',
+        f_run_date: '',
+        f_around_time: '',
+        f_around_unit: '',
+        f_create_date: '',
+        f_create_person: '',
+        f_orgid: '',
+        f_checker_name: ''
+      }
+    }
+  },
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    style2: {
+      type: String,
+      default: 'col-sm-4 form-group'
+    },
+    needprops:{
+      type: Object,
+      default:{}
+    },
+    showtype:{
+      type: String
+    }
+  },
+  ready () {
+    bus.$on('fresh-main',()=>{
+      console.log("进入方法")
+      this.$refs.paged.$refs.criteria.search()
+    })
+    this.freshCheckBook()
+  },
+  beforeDestroy() {
+    //tag
+    bus.$off('fresh-main')
+  },
+  methods: {
+      setbackgroundColor(val) {
+        var t = this.$appdata.getSingleValue('安检册提醒时间');
+        //将t转为数字
+        t = parseInt(t);
+        if (typeof t !== 'number' || isNaN(t)) {
+          console.error('获取的安检册提醒时间不是一个有效的数字');
+          return false;
+        }
+        // 将传入的日期字符串转换为 Date 对象
+        var inputDate = new Date(val);
+        if (isNaN(inputDate.getTime())) {
+          console.error('传入的日期不是一个有效的日期格式');
+          return false;
+        }
+        // 获取当前日期
+        var currentDate = new Date();
+        // 计算两个日期之间的月份差
+        var monthsDifference = (currentDate.getFullYear() - inputDate.getFullYear()) * 12 + (currentDate.getMonth() - inputDate.getMonth());
+        // 判断月份差是否大于 t
+        return monthsDifference <= t;
+
+    },
+    send(row){
+      console.log("7758521",row)
+      this.checkBookRow = row
+      this.showSendModal = true
+    },
+    freshCheckBook () {
+      this.checkBooks = []
+      new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id,f_check_book_name',
+          tablename: 't_check_book',
+          condition: this.$refs.paged.$refs.criteria.model.f_orgid?`f_orgid in ${this.$refs.paged.$refs.criteria.model.f_orgid} and f_user_type ='${this.showtype}' `:`f_user_type ='${this.showtype}'`,
+          orderitem: 'id desc'
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(res => {
+        this.checkBooks.push({label: '全部', value: ''})
+        res.data.forEach(ress => {
+            this.checkBooks.push({
+              label: ress.f_check_book_name,
+              value: ress.id
+            })
+        })
+      })
+    },
+    selectedEntry(){
+      console.log("666666666666666666")
+    },
+    details(row){
+      this.$emit('showdetails' ,row)
+    },
+    add(){
+      this.$emit('addbook')
+    },
+    ok (){
+      //tag
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
+        {resolveMsg: '更新片区信息成功', rejectMsg: '保存片区信息成功'}).then(res=>{
+          if (res.data.code===200){
+            this.$showMessage('修改成功')
+            this.showModal = false
+            this.checkBook= {}
+          }
+      })
+    },
+    cancel () {
+      this.showModal = false
+      this.checkBook= {}
+    },
+    updateCheckBook(val){
+      this.checkBook=val
+      this.showModal = true
+    },
+    search (args) {
+      // //tag
+      this.$parent.showItem = false
+      this.$parent.showItemUser = false
+      args.condition += ` and f_orgid in ${this.model.f_filialeids}`
+      args.condition += ` and tcb.f_user_type ='${this.showtype}' `
+      return this.model.search(args.condition, args.model)
+    },
+    getRes (obj) {
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids)
+    },
+    async deleteCheckBook (val) {
+      try {
+        //tag
+        let http = new HttpResetClass()
+        let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
+        let delCheckBook= `delete from t_check_book where id ='${val.id}'`
+        await http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
+          {resolveMsg: null, rejectMsg: '删除片区失败'})
+        await http.load('POST', 'rs/logic/runSQL', {data: {sql: delCheckBook}},
+          {resolveMsg: null, rejectMsg: '删除片区失败'})
+        this.$showMessage('删除成功')
+        this.$refs.paged.$refs.criteria.search()
+      }catch (e) {
+        this.$showMessage('删除失败',e)
+      }
+    }
+  },
+
+  watch: {
+    'model.rows'(val){
+      console.log("997997",val)
+      this.showCaoZuo = val.filter(item=>item.f_check_book_type!='小区').length>0
+    }
+  },
+  computed: {
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>
+<style scoped>
+.newcolor {
+  color: red;
+}
+
+.table th {
+  background-color: #f2f6fa;
+  color: black;
+}
+</style>
+<style lang="less">
+#checkbookEntryShow {
+  .modal-dialog {
+    width: 80%;
+  }
+}
+</style>

package/src/filiale/siyang/pc/CheckBookSearchArea.vue

@@ -12,8 +12,12 @@
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">小区名称</label>
-                <input type="text" class="input_search" v-model="model.f_residential_area"
-                       style="width: 60%" placeholder="小区名称" condition="f_residential_area like '%{}%'">
+                <v-select :value.sync="model.f_residential_area" v-model='model.f_residential_area'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.residential_areas' placeholder='街道'
+                          close-on-select
+                          condition="f_residential_area = '{}''"></v-select>
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">街&emsp;&emsp;道</label>
@@ -231,6 +235,7 @@ export default {
       })
     return {
       streetList:[{label: '全部', value: ''}],
+      residential_areas:[{label: '全部', value: ''}],
       sliceAreaList:[{label: '全部', value: ''}],
       areaAddressList:[{label: '全部', value: ''}],
       model: model,
@@ -322,6 +327,22 @@ export default {
         })
       })
     },
+    async initResidentialAreas(){
+      let res = await new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_GroupBy`, {
+        data: {
+          items: 'f_residential_area',
+          tablename: 't_area',
+          condition: `1=1`,
+          groupitem: 'f_residential_area'
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      res.data.forEach(item => {
+        this.residential_areas.push({
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        })
+      })
+    },
     async initSliceAreaList(){
       let res = await new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_GroupBy`, {
         data: {
@@ -624,6 +645,7 @@ export default {
     await this.initStreetList()
     await this.initSliceAreaList()
     await this.initAreaAddressList()
+    await this.initResidentialAreas()
     bus.$on('fresh-area',()=>{
       console.log("进入方法",this.bookAll,this.bookList)
       this.bookAll = false

package/src/filiale/siyang/pc.js

@@ -13,6 +13,7 @@ let specialComp = {
   'new-check-paper':(resolve) => {require(['./pc/NewCheckpaper'], resolve)},
   'check-user-list':(resolve) => { require(['./pc/checkUserList'], resolve) },
   'paper-defect-main':(resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+  'check-book-list':(resolve) => { require(['./pc/CheckBookList'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/yangchunboneng/android/SafecheckDevices.vue

@@ -659,15 +659,15 @@ export default {
               if (options[i].value == val) {
                 // 如果有隐患，拍图片
                 if (options[i].isdefect) {
-                  let value = '未处理'
-                  if (this.device.device == '热水器' || this.device.device == '燃具连接管' || this.device.device == '灶具'){
-                    value = '自行处理'
-                  }
+                  // let value = '未处理'
+                  // if (this.device.device == '热水器' || this.device.device == '燃具连接管' || this.device.device == '灶具'){
+                  //   value = '自行处理'
+                  // }
                   this.f_items[n].f_is_defect = true
                   this.f_items[n].f_defect_level = options[i].level
                   this.f_items[n].f_path = Vue.nopic
                   this.f_items[n].f_live_dispose = '否'
-                  this.f_items[n].f_deal_dispose = value
+                  // this.f_items[n].f_deal_dispose = value
                   this.f_items[n].tooltip = options[i].tooltip
                   //tag)
                   return
@@ -1022,6 +1022,10 @@ export default {
         checkmust: this.config[this.device.device].items[item].checkmust,
         f_item_value: f_item_value,
         f_is_defect: '',
+        dispatchType: this.config[this.device.device].items[item].dispatchType ? this.config[this.device.device].items[item].dispatchType : '',
+        f_repairman: this.config[this.device.device].items[item].f_repairman ? this.config[this.device.device].items[item].f_repairman : '',
+        f_meetunit: this.config[this.device.device].items[item].f_meetunit ? this.config[this.device.device].items[item].f_meetunit : '',
+        f_reciever: this.config[this.device.device].items[item].f_reciever ? this.config[this.device.device].items[item].f_reciever : '',
         f_deal_dispose: this.config[this.device.device].items[item].dealDispose ? this.config[this.device.device].items[item].dealDispose : '',
         multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,