safecheck-client 3.0.33-64 → 3.0.33-68

package/src/filiale/yongzhou/pc/NoCheckplanSafecheck.vue

@@ -16,34 +16,6 @@
                     condition="f_checker_name = '{}'">
                   </role-selector-safe>
                 </div>
-                <div class="col-sm-3 form-group form-input-group" style="width: 20%;">
-                  <label for="startDate" class="font_normal_body">起始时间</label>
-                  <datepicker
-                    class="select_list select"
-                    :value.sync="model.startDate"
-                    id="startDate"
-                    placeholder='开始时间' style="width: 60%"
-                    :disabled-days-of-week="[]"
-                    :format="'yyyy-MM-dd 00:00:00'"
-                    :show-rest-button="reset"
-                    v-model="model.startDate"
-                    condition="f_upload_date > ='{} '">
-                  </datepicker>
-                </div>
-                <div class="col-sm-3 form-group form-input-group" style="width: 20%;">
-                  <label for="endDate" class="font_normal_body">结束时间</label>
-                  <datepicker
-                    class="select_list select"
-                    :value.sync="model.endDate"
-                    id="endDate"
-                    placeholder='结束日期' style="width: 60%"
-                    :disabled-days-of-week="[]"
-                    :format="'yyyy-MM-dd 23:59:59'"
-                    :show-rest-button="reset"
-                    v-model="model.endDate"
-                    condition="f_upload_date <='{} '">
-                  </datepicker>
-                </div>
                 <div class="form-group col-sm-3 form-input-group" style="width: 20%;">
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
@@ -57,7 +29,7 @@
                   <print-data-safe :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.print_model"
                               :field="$parent.$parent.excelHeaders"
                               :defaultfield="$parent.$parent.defaultPrint"
-                              :titletable="'无计划安检汇总'" :starthead="$parent.$parent.getstart"
+                              :titletable="'安检员考核'" :starthead="$parent.$parent.getstart"
                   ></print-data-safe>
                   <export-excel-safe :data="$parent.$parent.searchData"
                                      :field="$parent.$parent.excelHeaders"
@@ -69,79 +41,125 @@
                   <button type="button" name="button" class="button_search" style="margin-left: 9px" @click="search">查询</button>
                 </div>
               </div>
+              <div class="row">
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">计划创建开始日期:</label>
+                  <datepicker
+                    placeholder='计划创建开始日期'
+                    style="width:60%"
+                    :disabled-days-of-week="[]"
+                    :format="'yyyy-MM-dd'"
+                    :show-rest-button="reset"
+                    :value.sync="model.start_time"
+                    v-model="model.start_time"
+                    condition="tcp.f_create_time >= '{} 00:00:00'">
+                  </datepicker>
+                </div>
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">计划创建结束日期:</label>
+                  <datepicker
+                    placeholder='计划创建结束日期'
+                    :disabled-days-of-week="[]"
+                    style="width:60%"
+                    :format="'yyyy-MM-dd'"
+                    :show-rest-button="reset"
+                    :value.sync="model.end_time"
+                    v-model="model.end_time"
+                    condition="tcp.f_create_time <= '{} 23:59:59'">
+                  </datepicker>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-4 form-group">
+                  <label for="startDate" class="font_normal_body">安检日期开始:</label>
+                  <datepicker id="startDate" placeholder="安检日期开始"
+                              v-model="model.checkstart"
+                              :value.sync="model.checkstart"
+                              style="width: 60%;"
+                              :disabled-days-of-Week="[]"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              condition="tcpi.f_last_check_date >= '{}'"
+                              :show-reset-button="reset">
+                  </datepicker>
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label for="endDate" class="font_normal_body">安检日期结束:</label>
+                  <datepicker id="endDate" placeholder="安检日期结束"
+                              v-model="model.checkend"
+                              :value.sync="model.checkend"
+                              :disabled-days-of-Week="[]"
+                              style="width: 60%;"
+                              condition="tcpi.f_last_check_date <= '{}'"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="reset">
+                  </datepicker>
+                </div>
+              </div>
             </div>
           </criteria>
           <data-grid :model="model" partial='list' class="list_area table_sy" id="tongchuan" v-ref:grid >
             <template partial='head'>
               <tr>
-<!--                <th>-->
-<!--                  <nobr>序号</nobr>-->
-<!--                </th>-->
-<!--                <th>-->
-<!--                  <nobr>安检月份</nobr>-->
-<!--                </th>-->
+                <th>
+                  <nobr>序号</nobr>
+                </th>
                 <th>
                   <nobr>安检员</nobr>
                 </th>
                 <th>
-                  <nobr>已检</nobr>
+                  <nobr>计划安检总户数</nobr>
+                </th>
+                <th>
+                  <nobr>未检户数</nobr>
+                </th>
+                <th>
+                  <nobr>已检户数</nobr>
+                </th>
+                <th>
+                  <nobr>入户户数</nobr>
                 </th>
                 <th>
-                  <nobr>入户</nobr>
+                  <nobr>三次到访不遇户数</nobr>
                 </th>
                 <th>
-                  <nobr>到访不遇</nobr>
+                  <nobr>拒检户数</nobr>
                 </th>
                 <th>
-                  <nobr>拒检</nobr>
+                  <nobr>安检率</nobr>
                 </th>
-<!--                <th>-->
-<!--                  <nobr>隐患数</nobr>-->
-<!--                </th>-->
                 <th>
-                  <nobr>入户率</nobr>
+                  <nobr>申请安检户数</nobr>
+                </th>
+                <th>
+                  <nobr>总入户数</nobr>
                 </th>
               </tr>
             </template>
             <template partial='body'>
-              <tr>
-<!--                <td style="text-align:center">{{$index + 1}}</td>-->
-<!--                <td style="text-align:center">-->
-<!--                  <nobr>{{ row.yuefeng }}</nobr>-->
-<!--                </td>-->
-                <td style="text-align:center">
-                  <nobr>{{ row.f_checker_name }}</nobr>
-                </td>
-                <td style="text-align:center">
-                  <nobr>{{ row.yijian }}</nobr>
-                </td>
-                <td style="text-align:center">
-                  <nobr>{{ row.ruhu }}</nobr>
-                </td>
-                <td style="text-align:center">
-                  <nobr>{{ row.daofang }}</nobr>
-                </td>
-                <td style="text-align:center">
-                  <nobr>{{ row.jujian }}</nobr>
-                </td>
-<!--                <td style="text-align:center">-->
-<!--                  <nobr>{{ row.yinhuan }}</nobr>-->
-<!--                </td>-->
-                <td style="text-align:center">
-                  <nobr>{{ row.ruhu_bv }}</nobr>
-                </td>
-              </tr>
+
+              <td style="text-align: center">{{ $index + 1 }}</td>
+              <td style="text-align: center">{{ row.checker }}</td>
+              <td style="text-align: center">{{ row.data1 }}</td>
+              <td style="text-align: center">{{ row.data2 }}</td>
+              <td style="text-align: center">{{ row.data3 }}</td>
+              <td style="text-align: center">{{ row.data4 }}</td>
+              <td style="text-align: center">{{ row.data5 }}</td>
+              <td style="text-align: center">{{ row.data6 }}</td>
+              <td style="text-align: center">{{ row.data7 }}</td>
+              <td style="text-align: center">{{ row.data8 }}</td>
+              <td style="text-align: center">{{ row.data9 }}</td>
             </template>
             <template partial="foot">
-              <td style="text-align: center"><span><b>合计：</b></span></td>
-<!--              <td style="text-align: center"><span><b> </b></span></td>-->
-<!--              <td style="text-align: center"><span><b> </b></span></td>-->
-              <td style="text-align: center">{{model.sums.yijian}}</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.yinhuan}}</td>-->
-              <td style="text-align: center">{{ (model.sums.ruhu && model.sums.yijian) ? (model.sums.ruhu / model.sums.yijian * 100.0).toFixed(2) : 0.00}}%</td>
+              <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
+              <td style="text-align: center">{{ model.sums.data1 }}</td>
+              <td style="text-align: center">{{ model.sums.data2 }}</td>
+              <td style="text-align: center">{{ model.sums.data3 }}</td>
+              <td style="text-align: center">{{ model.sums.data4 }}</td>
+              <td style="text-align: center">{{ model.sums.data5 }}</td>
+              <td style="text-align: center">{{ model.sums.data6 }}</td>
+              <td style="text-align: center">{{ (model.sums.data3/model.sums.data1 * 100.0).toFixed(2)}}%</td>
+              <td style="text-align: center">{{ model.sums.data8 }}</td>
+              <td style="text-align: center">{{ model.sums.data9 }}</td>
             </template>
           </data-grid>
         </criteria-paged>
@@ -154,11 +172,11 @@ import {PagedList, HttpResetClass} from 'vue-client'
 import * as Util from '../../Util'
 
 export default {
-  title: '无计划安检汇总',
+  title: '安检员考核',
   data () {
     let model = new PagedList('rs/sql/SafecheckSummary', 20, {
       f_filiale_id: 'this.f_filiale_id'
-    },{yijian:'',ruhu:'',daofang:'',jujian:'',yinhuan:''})
+    },{data1:'',data2:'',data3:'',data4:'',data5:'',data6:'',data8:'',data9:''})
     model.f_filiale_id = `('${this.$login.f.orgid}')`
     return {
       user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
@@ -174,14 +192,18 @@ export default {
       },
       print_model:{},
       excelHeaders: {
-        'f_checker_name': '安检员',
-        'yijian': '已检',
-        'ruhu': '入户',
-        'daofang': '到访不遇',
-        'jujian': '拒检',
-        'ruhu_bv': '入户率'
+        'checker': '安检员',
+        'data1': '计划安检总户数',
+        'data2': '未检户数',
+        'data3': '已检户数',
+        'data4': '入户户数',
+        'data5': '三次到访不遇户数',
+        'data6': '拒检户数',
+        'data7': '安检率',
+        'data8': '申请安检户数',
+        'data9': '总入户数'
       },
-      defaultPrint: ['f_checker_name', 'yijian', 'ruhu', 'daofang', 'jujian', 'ruhu_bv'],
+      defaultPrint: ['checker','data1','data2','data3','data4','data5','data6','data7','data8','data9'],
 
     }
   },
@@ -190,13 +212,6 @@ export default {
       this.f_filiale_id = this.$login.convertToIn(obj.resids)
       this.orgname = obj.res[0]
       this.$set('orgname', obj.res[0])
-      console.log(
-        `%c 无计划安检汇总公司名 %c 呼叫模块 %c`,
-        'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
-        'background:#41b883 ; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff',
-        'background:transparent',
-        this.orgname
-      )
     },
     async selfSearch (args) {
       if (!this.f_filiale_id) {
@@ -210,19 +225,23 @@ export default {
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
       this.print_model = JSON.parse(JSON.stringify(this.$refs.paged.$refs.grid.model))
       this.print_model.rows.push({
-        f_checker_name: '合计',
-        yijian: this.sumsmodel.yijian,
-        ruhu: this.sumsmodel.ruhu,
-        daofang: this.sumsmodel.daofang,
-        jujian: this.sumsmodel.jujian,
-        ruhu_bv:`${(this.sumsmodel.ruhu && this.sumsmodel.yijian) ? (this.sumsmodel.ruhu / this.sumsmodel.yijian * 100.0).toFixed(2) : 0.00}%`
+        checker: '合计',
+        data1: this.sumsmodel.data1,
+        data2: this.sumsmodel.data2,
+        data3: this.sumsmodel.data3,
+        data4: this.sumsmodel.data4,
+        data5: this.sumsmodel.data5,
+        data6: this.sumsmodel.data6,
+        data7: `${(this.sumsmodel.data3/this.sumsmodel.data1*100.0).toFixed(2)}%`,
+        data8: this.sumsmodel.data8,
+        data9: this.sumsmodel.data9
       })
       this.print_model.totalPage = 0
     }
   },
   computed: {
     excelTitle() {
-      return `${this.orgname }无计划安检汇总`
+      return `${this.orgname }安检员考核`
     },
     getstart() {
       return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`