safecheck-client 3.0.33-13 → 3.0.33-130

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

@@ -275,13 +275,26 @@
               >
               </v-select>
             </div>
-            <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
-              <label class=" font_normal_body">选择站点</label>
+            <div class="form-group col-sm-4">
+              <label class=" font_normal_body">选择部门</label>
               <input style="width: 60%" type="text" v-show="false" v-model="createPlan.f_outlets">
               <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择站点">
 
               </right-tree>
             </div>
+            <div class="form-group col-sm-4" v-show="createPlan.isShare=='是'">
+              <label class=" font_normal_body">选择班组</label>
+              <v-select
+                class="select select_list"
+                :value.sync="createPlan.f_class"
+                v-model="createPlan.f_class"
+                :options='classes'
+                placeholder='请选择'
+                close-on-select
+                value-single
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -450,6 +463,7 @@
         title: '计划管理',
         data() {
           return {
+            classes:[],
             source:
               'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
               'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
@@ -528,19 +542,26 @@
             return
           }
           this.createPlan.f_outlets = val.res[0]
-          this.checker = []
-          let vali = {
+          if (this.createPlan.isShare=='否'){
+            this.checker = []
+            let vali = {
               source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$)!=-1)`,
               userid: `${val.resids[0]}`
-          }
-          let http = new HttpResetClass()
-          http.load('POST', '/rs/search', {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            }
+            let http = new HttpResetClass()
+            http.load('POST', '/rs/search', {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
               res.data.forEach((item) => {
                 if (item.state == '在职'){
                   this.checker.push({label:item.name,value:item})
                 }
               })
-          })
+            })
+          }else {
+            this.classes = this.$appdata.getParam(`工单-` + val.res[0]) ? [{
+              label: '请选择',
+              value: ''
+            }, ...this.$appdata.getParam(`工单-` + val.res[0])] : [{label: '请选择', value: ''}]
+          }
         },
       /*  ntoway() {
           /!* return AppData.getParam('安检类型')*!/

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

@@ -0,0 +1,333 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id">
+              </role-selector-safe>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_start"
+                placeholder='起始月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_end"
+                placeholder='结束月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" >
+              <label class="font_normal_body">安检状态</label>
+              <v-select :value.sync="model.f_last_check_state" :options='$parent.$parent.checkStates' placeholder='上次安检状态' close-on-select
+                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="i.f_last_check_state = '{}'">
+              </v-select>
+            </div>-->
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_start_time"
+                placeholder='安检起始' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_end_time"
+                placeholder='安检截止' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_check_type" v-model='model.f_check_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.checktype' placeholder='客户类型'
+                        close-on-select
+                        condition="f_check_type = '{}'"></v-select>
+            </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检起始</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_start_time"-->
+            <!--placeholder='起始时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检结束</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_end_time"-->
+            <!--placeholder='结束时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <export-excel-safe   :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
+              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <!--<div class="button_spacing"-->
+              <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
+              <!--@click="$parent.$parent.hidden()">-->
+              <!--</div>-->
+              <div class="button_spacing"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                   @click="$parent.$parent.hiddenr()"></div>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th>安检员</th>
+            <th>总入户量</th>
+            <th>总到访不遇量</th>
+            <th>总拒检量</th>
+            <th>安检总量</th>
+            <th>计划总数</th>
+            <th>入户</th>
+            <th>到访不遇</th>
+            <th>拒检</th>
+            <th>无计划总数</th>
+            <th>无计划入户</th>
+            <th>无计划到访不遇</th>
+            <th>无计划拒检</th>
+            <th>入户率</th>
+            <th>维修率</th>
+            <th>隐患消除率</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.ruhu_total}}</td>
+          <td style="text-align: center">{{row.daofang_total}}</td>
+          <td style="text-align: center">{{row.jujian_total}}</td>
+          <td style="text-align: center">{{row.total_sum}}</td>
+          <td style="text-align: center">{{row.plannum}}</td>
+          <td style="text-align: center">{{row.ruhu}}</td>
+          <td style="text-align: center">{{row.daofang}}</td>
+          <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.no_plan_num}}</td>
+          <td style="text-align: center">{{row.noruhu}}</td>
+          <td style="text-align: center">{{row.nodaofang}}</td>
+          <td style="text-align: center">{{row.nojujian}}</td>
+          <td style="text-align: center">{{row.rhl}}%</td>
+          <td style="text-align: center">{{row.wxl}}%</td>
+          <td style="text-align: center">{{row.cll}}%</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align: center">{{model.sums.ruhu_total}}</td>
+          <td style="text-align: center">{{model.sums.daofang_total}}</td>
+          <td style="text-align: center">{{model.sums.jujian_total}}</td>
+          <td style="text-align: center">{{model.sums.total_sum}}</td>
+          <td style="text-align: center">{{model.sums.plannum}}</td>
+          <td style="text-align: center">{{model.sums.ruhu}}</td>
+          <td style="text-align: center">{{model.sums.daofang}}</td>
+          <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{model.sums.no_plan_num}}</td>
+          <td style="text-align: center">{{model.sums.noruhu}}</td>
+          <td style="text-align: center">{{model.sums.nodaofang}}</td>
+          <td style="text-align: center">{{model.sums.nojujian}}</td>
+          <td style="text-align: center"></td>
+          <td style="text-align: center"></td>
+          <td style="text-align: center"></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+
+
+export default {
+  title: '安检计划查询',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for (let i = year - 8; i <= year + 1; i++)
+      options.push({label: i + '', value: i + ''})
+    let model = new PagedList('rs/sql/planCount', 20, {
+      f_filialeids: 'this.f_filialeids',
+      f_start_time: 'this.f_start_time',
+      condition1:'this.condition1',
+      condition2:'this.condition2',
+      condition3:'this.condition3',
+      f_end_time: 'this.f_end_time'
+    }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
+    model.f_filialeids = '('+this.$login.f.orgid+')'
+    return {
+      checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+      excelHeaders:{
+        'f_checker': '安检员',
+        'plannum': '计划总数',
+        // 'yrj': '计划中已入户',
+        // 'wrj': '计划中未入户',
+        'ruhu': '入户',
+        'jujian': '拒检',
+        'daofang': '到访不遇',
+        'no_plan_num': '无计划总数',
+        'noruhu': '无计划入户',
+        'nojujian': '无计划拒检',
+        'nodaofang': '无计划到访不遇',
+        'rhl':'入户率',
+        'wxl':'维修率',
+        'cll':'隐患消除率'
+      },
+      searchData:{
+        condition:"1=1",
+        condition1:"1=1",
+        condition2:"1=1",
+        condition3:"and 1=1",
+        f_plan_year:year[0],
+        f_checker:'',
+        f_filialeids:'('+this.$login.f.orgid+')',
+        f_start_time:'',
+        f_end_time:''
+      },
+      checker: this.$login.f,
+      checkers: [],
+      checkersname: [],
+      checkStates: this.$appdata.getParam('安检状态'),
+      f: this.$login.f,
+      criteriaShow: false,
+      model: model,
+      c_year_list: options,
+      f_check_start:'',
+      f_check_end: '',
+      f_start_time:'',
+      f_end_time:''
+    }
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+    search(args) {
+      let tempStr = args.condition
+      let condition1 =tempStr
+      let condition2 =tempStr
+      let condition3 = ' and 1=1 '
+      if (this.f_check_start) {
+        condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+        condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+      }
+      if (this.f_check_end) {
+        condition1 += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+        condition1 += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+      }
+      if(this.f_start_time){
+        condition2 += ` AND f_offsite_time >= '${this.f_start_time} 00:00:00'`
+      }
+      if (this.f_end_time){
+        condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id){
+        condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+        condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+      }
+      this.model.f_start_time=this.f_start_time
+      this.model.f_end_time=this.f_end_time
+      this.model.condition1=condition1
+      this.model.condition2=condition2
+      this.model.condition3=condition3
+
+      this.searchData.condition1=condition1
+      this.searchData.condition2=condition2
+      this.searchData.condition3=condition3
+
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj){
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      //tag
+    }
+  },
+  ready() {
+    this.model.id = this.$login.f.id
+    this.model.f_subcompany = this.$login.f.f_fengongsi
+    this.model.f_filialeid = this.$login.f.orgid
+  },
+
+  watch: {
+    'model.condition'(val) {
+      if(val){
+        this.searchData.condition = val
+      }
+    },
+    'model.f_checker'(val) {
+      if(val){
+        this.searchData.f_checker = val
+      }
+    },
+    'f_start_time'(val) {
+      if(val){
+        this.searchData.f_start_time = val
+      }
+    },
+    'f_end_time'(val) {
+      if(val){
+        this.searchData.f_end_time = val
+      }
+    },
+    'checker'() {
+      // //tag
+      //tag
+      this.model.chosenOrg = this.checker[0]
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1 &&this. model.sums){
+        this.model.sums.yrj = 0
+        this.model.sums.no_plan_num = 0
+        this.model.sums.wrj = 0
+        this.model.sums.ruhu = 0
+        this.model.sums.jujian = 0
+        this.model.sums.daofang = 0
+        this.model.sums.ruhu_total=0
+        this.model.sums.daofang_total=0
+        this.model.sums.jujian_total=0
+        this.model.sums.total_sum=0
+      }
+    }
+  },
+  computed: {
+    selected() {
+      // //tag
+      // this.$parent.showItem=!this.$parent.showItem
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>

package/src/filiale/bayan/pc.js

@@ -7,6 +7,12 @@ let specialComp = {
   'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper.vue'], resolve) },
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
+  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) },
+  'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
+  'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
+  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
 }
 exports.specialComp = specialComp
 

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

@@ -737,7 +737,7 @@ export default {
     },
     getGasAberrantNumber(val) {
       //tag
-      if(!this.f_table_base.index || !this.f_gas_balance.index){
+      if(!this.f_table_base.index || !this.f_gas_balance.index || !this.f_gas_aberrant_number.index){
         //tag
         return
       }