safecheck-client 3.0.33-6 → 3.0.33-61

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

@@ -522,7 +522,7 @@ export default {
       checker_name:'',
       defectType:[],
       defectLeave:'',
-      defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'}],
+      defectLeaveList:[{label:'全部',value:''},{label:'重大',value:'重大'},{label:'一般',value:'一般'}],
       repaired:[{label: '全部', value: ''},{label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
       deals:[{label: '全部', value: ''},{label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}],
       f: this.$login.f,
@@ -972,6 +972,12 @@ export default {
         if(this.defectLeave=='三级隐患'){
           args.condition += ` and f_third_count > 0`
         }
+        if(this.defectLeave=='一般'){
+          args.condition += ` and f_yiban_count > 0`
+        }
+        if(this.defectLeave=='重大'){
+          args.condition += ` and f_zhongda_count > 0`
+        }
       }
       if(this.defectType.length>0){
         args.condition += ` and (`

package/src/filiale/weinan/pc.js

@@ -33,6 +33,7 @@ let specialComp = {
   'person-track':(resolve)=> {require(['./pc/PersonTrack'], resolve)},
   'check-plan':(resolve)=> {require(['./pc/CheckPlan'], resolve)},
   'check-plan-area-manage':(resolve)=> {require(['./pc/CheckPlanAreaManage'], resolve)},
+  'check-search-user':(resolve)=> {require(['./pc/CheckSearchUser'], resolve)},
   'select-check-plan_outhelp':(resolve)=> {require(['./pc/SelectCheckPlanOutHelp'], resolve)},
   'check-detail_outhelp':(resolve)=> {require(['./pc/CheckDetailOutHelp'], resolve)},
   'check-plan_outhelp':(resolve)=> {require(['./pc/CheckPlanOutHelp'], resolve)},

package/src/filiale/wensu/pc/CheckSearchUser.vue

@@ -689,6 +689,8 @@ export default {
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
     this.getAllGasproperties()
+    this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
     // this.getAllOutlets()
   },
   methods: {

package/src/filiale/wensu/pc/PrintMaterialBill.vue

@@ -1,172 +1,172 @@
-<template>
-  <style id="style">
-    td{
-      height: 30px;
-      padding: 0px;
-      text-align: center;
-    }
-    table{
-      margin: auto;
-      width: 100%;
-      border-collapse:collapse;
-      border: 1px solid black;
-    }
-    h1,h2,h3,h4,h5,h6 {
-      text-align: center;
-    }
-    .top{
-      display: flex;
-      justify-content: space-around;
-      margin: 0px;
-    }
-    .bottom{
-      display: flex;
-      justify-content: space-around;
-      margin: 5px 0 0 0;
-    }
-  </style>
-  <div id="print">
-    <h4 style="margin: 0 0 5px 0"><b>安检员考核单</b></h4>
-    <table border="1">
-      <tr>
-        <td colspan="12"><b>公司：{{gongsi}}</b></td>
-      </tr>
-      <tr>
-        </tr>
-      <tr>
-        <td>安检员</td>
-        <td>总入户量</td>
-        <td>总到访不遇量</td>
-        <td>总拒检量</td>
-        <td>安检总量</td>
-        <td>计划总数</td>
-        <td>入户</td>
-        <td>到访不遇</td>
-        <td>拒检</td>
-        <td>无计划总数</td>
-        <td>无计划入户</td>
-        <td>无计划到访不遇</td>
-        <td>无计划拒检</td>
-      </tr>
-      <tr v-for="item in data">
-        <td style="text-align: center">{{item.f_checker}}</td>
-        <td style="text-align: center">{{item.ruhu_total}}</td>
-        <td style="text-align: center">{{item.daofang_total}}</td>
-        <td style="text-align: center">{{item.jujian_total}}</td>
-        <td style="text-align: center">{{item.total_sum}}</td>
-        <td style="text-align: center">{{item.plannum}}</td>
-        <td style="text-align: center">{{item.ruhu}}</td>
-        <td style="text-align: center">{{item.daofang}}</td>
-        <td style="text-align: center">{{item.jujian}}</td>
-        <td style="text-align: center">{{item.no_plan_num}}</td>
-        <td style="text-align: center">{{item.noruhu}}</td>
-        <td style="text-align: center">{{item.nodaofang}}</td>
-        <td style="text-align: center">{{item.nojujian}}</td>
-       </tr>
-      <tr >
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-      </tr>
-      <tr>
-      </tr>
-    </table>
-    <p class="bottom">
-      <span><b>打印人：{{ Printpeople}}</b></span>
-      <span><b>打印时间：{{ PrintTime}}</b></span><br>
-      <span><b>确定打印安检员考核单？</b></span>
-    </p>
-  </div>
-
-<!--  <button type="button" class="btn btn-cancel" @click="cancel()">取消</button>-->
-<!--  <print-element class="btn btn-primary" id="print1" styleid='style1' top='40' left='60' width='100%' height='100%' v-ref:printelement>打印</print-element>-->
-
-</template>
-<script>
-
-import co from 'co'
-import { PagedList } from 'vue-client'
-import * as Util from '../../Util'
-import {toStandardTimeString} from '../../Util'
-
-export default {
-  title: '安检信息',
-  data () {
-    return {
-      deviceCollects:[],
-      isBack:false,
-      datareslut:'',
-      PrintTime:Util.toStandardTimeString(),
-      Printpeople:this.$login.f.name,
-      gongsi:this.$login.f.orgs
-    }
-  },
-  props: ['data','show'],
-  ready () {
-    console.log("公司"+this.gongsi)
-  },
-  methods: {
-
-    cancel(){
-      this.showcheckmsg = false
-    },
-
-    //获取当前时间
-    getNowFormatDate() {
-      var date = new Date(this.userinfo.f_check_date);
-      var month = date.getMonth() + 1;
-      var strDate = date.getDate();
-      if (month >= 1 && month <= 9) {
-        month = "0" + month;
-      }
-      if (strDate >= 0 && strDate <= 9) {
-        strDate = "0" + strDate;
-      }
-      var currentdate = date.getFullYear() +'年'+ month + '月' + strDate
-        + "日" + date.getHours() + "时" + date.getMinutes()+'分'
-      return currentdate;
-    },
-    // getId(){
-    //   //tag
-    // },
-    //获取隐患信息
-    getHidden(){
-      //清空所有数据
-      this.deviceCollects=[]
-      for (let  datas of this.data) {
-          this.datareslut=datas
-      }
-
-      /*setTimeout(()=> {
-        //tag
-        this.$parent.showcheckmsg = false
-      }, 1000)*/
-    },
-  }
-}
-</script>
-<style media="screen" scoped>
-.divtext {
-  min-width: 50px;
-  max-width: 200px;
-  border: 1px solid green;
-  display: inline-block;
-}
-.bg-info{
-  border-left: 5px solid #5989be;
-}
-.bg-cus-body {
-  margin-left: 5px;
-}
-
-</style>
+<template>
+  <style id="style">
+    td{
+      height: 30px;
+      padding: 0px;
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+    .top{
+      display: flex;
+      justify-content: space-around;
+      margin: 0px;
+    }
+    .bottom{
+      display: flex;
+      justify-content: space-around;
+      margin: 5px 0 0 0;
+    }
+  </style>
+  <div id="print">
+    <h4 style="margin: 0 0 5px 0"><b>安检员考核单</b></h4>
+    <table border="1">
+      <tr>
+        <td colspan="12"><b>公司：{{gongsi}}</b></td>
+      </tr>
+      <tr>
+        </tr>
+      <tr>
+        <td>安检员</td>
+        <td>总入户量</td>
+        <td>总到访不遇量</td>
+        <td>总拒检量</td>
+        <td>安检总量</td>
+        <td>计划总数</td>
+        <td>入户</td>
+        <td>到访不遇</td>
+        <td>拒检</td>
+        <td>无计划总数</td>
+        <td>无计划入户</td>
+        <td>无计划到访不遇</td>
+        <td>无计划拒检</td>
+      </tr>
+      <tr v-for="item in data">
+        <td style="text-align: center">{{item.f_checker}}</td>
+        <td style="text-align: center">{{item.ruhu_total}}</td>
+        <td style="text-align: center">{{item.daofang_total}}</td>
+        <td style="text-align: center">{{item.jujian_total}}</td>
+        <td style="text-align: center">{{item.total_sum}}</td>
+        <td style="text-align: center">{{item.plannum}}</td>
+        <td style="text-align: center">{{item.ruhu}}</td>
+        <td style="text-align: center">{{item.daofang}}</td>
+        <td style="text-align: center">{{item.jujian}}</td>
+        <td style="text-align: center">{{item.no_plan_num}}</td>
+        <td style="text-align: center">{{item.noruhu}}</td>
+        <td style="text-align: center">{{item.nodaofang}}</td>
+        <td style="text-align: center">{{item.nojujian}}</td>
+       </tr>
+      <tr >
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+      <tr>
+      </tr>
+    </table>
+    <p class="bottom">
+      <span><b>打印人：{{ Printpeople}}</b></span>
+      <span><b>打印时间：{{ PrintTime}}</b></span><br>
+      <span><b>确定打印安检员考核单？</b></span>
+    </p>
+  </div>
+
+<!--  <button type="button" class="btn btn-cancel" @click="cancel()">取消</button>-->
+<!--  <print-element class="btn btn-primary" id="print1" styleid='style1' top='40' left='60' width='100%' height='100%' v-ref:printelement>打印</print-element>-->
+
+</template>
+<script>
+
+import co from 'co'
+import { PagedList } from 'vue-client'
+import * as Util from '../../Util'
+import {toStandardTimeString} from '../../Util'
+
+export default {
+  title: '安检信息',
+  data () {
+    return {
+      deviceCollects:[],
+      isBack:false,
+      datareslut:'',
+      PrintTime:Util.toStandardTimeString(),
+      Printpeople:this.$login.f.name,
+      gongsi:this.$login.f.orgs
+    }
+  },
+  props: ['data','show'],
+  ready () {
+    console.log("公司"+this.gongsi)
+  },
+  methods: {
+
+    cancel(){
+      this.showcheckmsg = false
+    },
+
+    //获取当前时间
+    getNowFormatDate() {
+      var date = new Date(this.userinfo.f_check_date);
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
+      }
+      var currentdate = date.getFullYear() +'年'+ month + '月' + strDate
+        + "日" + date.getHours() + "时" + date.getMinutes()+'分'
+      return currentdate;
+    },
+    // getId(){
+    //   //tag
+    // },
+    //获取隐患信息
+    getHidden(){
+      //清空所有数据
+      this.deviceCollects=[]
+      for (let  datas of this.data) {
+          this.datareslut=datas
+      }
+
+      /*setTimeout(()=> {
+        //tag
+        this.$parent.showcheckmsg = false
+      }, 1000)*/
+    },
+  }
+}
+</script>
+<style media="screen" scoped>
+.divtext {
+  min-width: 50px;
+  max-width: 200px;
+  border: 1px solid green;
+  display: inline-block;
+}
+.bg-info{
+  border-left: 5px solid #5989be;
+}
+.bg-cus-body {
+  margin-left: 5px;
+}
+
+</style>