safecheck-client 3.0.30-8 → 3.0.30-80

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

@@ -6,7 +6,7 @@
           <div partial>
             <div class="row">
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">开始时间:</label>
+                <label class="font_normal_body">时间选择:</label>
                 <datepicker
                   placeholder='请选择'
                   style="width:60%"
@@ -16,27 +16,36 @@
                   :show-rest-button="reset"
                   :value.sync="model.start_time"
                   v-model="model.start_time"
-                  condition="tcp.f_upload_date >= '{}-01-01 00:00:00'">
-                </datepicker>
-              </div>
-              <div class="form-group col-sm-4">
-                <label class="font_normal_body">结束时间:</label>
-                <datepicker
-                  placeholder='请选择'
-                  :select-year="true"
-                  :disabled-days-of-week="[]"
-                  style="width:60%"
-                  :format="'yyyy'"
-                  :show-rest-button="reset"
-                  :value.sync="model.end_time"
-                  v-model="model.end_time"
-                  condition="tcp.f_upload_date <= '{}-12-31 23:59:59'">
+                  condition="tcpi.f_last_check_date >= '{}-01-01 00:00:00' and tcpi.f_last_check_date <= '{}-12-31 23:59:59'">
                 </datepicker>
               </div>
+<!--              <div class="form-group col-sm-4">-->
+<!--                <label class="font_normal_body">结束时间:</label>-->
+<!--                <datepicker-->
+<!--                  placeholder='请选择'-->
+<!--                  :select-year="true"-->
+<!--                  :disabled-days-of-week="[]"-->
+<!--                  style="width:60%"-->
+<!--                  :format="'yyyy'"-->
+<!--                  :show-rest-button="reset"-->
+<!--                  :value.sync="model.end_time"-->
+<!--                  v-model="model.end_time"-->
+<!--                  condition="">-->
+<!--                </datepicker>-->
+<!--              </div>-->
             <div class="col-sm-4 form-group">
                 <label class="font_normal_body">小区名称：</label>
-                  <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
+                  <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="tcpi.f_residential_area like '%{}%'">
             </div>
+              <div class="form-group col-sm-4">
+                <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.user_types' placeholder='用户类型'
+                          close-on-select
+                          condition="tcpi.f_user_type = '{}'"></v-select>
+              </div>
               <div class="col-sm-4 form-group" style="margin: 0">
               <role-selector-safe
                 role-name="安检员"
@@ -45,7 +54,7 @@
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="tcp.f_checker_name = '{}'">
+                condition="tcp.f_checker = '{}'">
               </role-selector-safe>
               </div>
               <div style="float: right">
@@ -54,11 +63,11 @@
                                       progress="safeGetExportProgress"
                                       sqlurl="rs/logic/SafeExportExcel" sql-name="safeStatisticsMonth" template-name='安检报表月' :choose-col="true"></export-excel-safe>
               </div>
-                            <print-data :sum-field="$parent.$parent.excelHeaders" :model="$parent.$parent.model"
+                            <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"
-                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                          :titletable="'安检月报表'" :starthead="$parent.$parent.getstart"
+                          ></print-data-safe>
               <button class="button_spacing button_search" @click="search()">查询</button>
             </div>
           </div>
@@ -108,6 +117,9 @@
               <th>
                 <nobr>12月</nobr>
               </th>
+              <th>
+                <nobr>小计</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -126,6 +138,7 @@
             <td style="text-align: center">{{ row.month10 }}</td>
             <td style="text-align: center">{{ row.month11 }}</td>
             <td style="text-align: center">{{ row.month12 }}</td>
+            <td style="text-align: center">{{ row.countarea }}</td>
           </template>
           <template partial="foot">
             <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
@@ -141,6 +154,7 @@
             <td style="text-align: center">{{ model.sums.month10 }}</td>
             <td style="text-align: center">{{ model.sums.month11 }}</td>
             <td style="text-align: center">{{ model.sums.month12 }}</td>
+            <td style="text-align: center">{{ model.sums.countarea }}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -169,13 +183,16 @@ export default {
         month9: '',
         month10: '',
         month11: '',
-        month12: ''
+        month12: '',
+        countarea: ''
       }),
             resids:{},
       searchData:{
         condition: "1=1",
         orgid: this.$login.f.orgid
       },
+      print_model:{},
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
       excelHeaders:{
         'f_residential_area': '小区名称',
         'month1': '1月',
@@ -190,20 +207,39 @@ export default {
         'month10': '10月',
         'month11': '11月',
         'month12': '12月',
+        'countarea':'小计'
       },
       printshow: false,
-      defaultPrint: ['f_residential_area', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12',],
+      defaultPrint: ['f_residential_area', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12','countarea'],
       sumsmodel: {},
     }
   },
   ready() {
-    this.model.search('1=1')
+    // this.model.search('1=1')
   },
   methods: {
-    selfSearch(args) {
-      this.model.search(args.condition, args.model, args.condValue)
+    async selfSearch(args) {
+      await this.model.search(args.condition, args.model, args.condValue)
       this.searchData.condition = args.condition
       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_residential_area': '合计',
+        'month1': this.sumsmodel.month1,
+        'month2': this.sumsmodel.month2,
+        'month3': this.sumsmodel.month3,
+        'month4': this.sumsmodel.month4,
+        'month5': this.sumsmodel.month5,
+        'month6': this.sumsmodel.month6,
+        'month7': this.sumsmodel.month7,
+        'month8': this.sumsmodel.month8,
+        'month9': this.sumsmodel.month9,
+        'month10': this.sumsmodel.month10,
+        'month11': this.sumsmodel.month11,
+        'month12': this.sumsmodel.month12,
+        'countarea':this.sumsmodel.countarea
+      })
+      this.print_model.totalPage = 0
     },
     getRes(obj) {
       //tag
@@ -220,7 +256,7 @@ export default {
   },
   computed: {
     getstart() {
-      return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
+      return `时间：${this.$refs.paged.$refs.criteria.model.start_time ? this.$refs.paged.$refs.criteria.model.start_time : ''}`
     },
   }
 }

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

@@ -35,31 +35,40 @@
               <input type="text" class="input_search" v-model="model.f_residential_area"
                      style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
             </div>
+            <div class="form-group col-sm-2">
+              <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.user_types' placeholder='用户类型'
+                        close-on-select
+                        condition="tcpi.f_user_type = '{}'"></v-select>
+            </div>
             <div class="col-sm-4 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+              <report-print id='yearPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+              <report-excel id='yearPrint'></report-excel>
             </div>
           </div>
         </div>
       </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+      <div partial='list' id='yearPrint' class="list_area" style="overflow-y: scroll">
         <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
-            <th colspan='5' style="font-weight: normal; text-align: left;">
+            <th colspan='12' style="font-weight: normal; text-align: left;">
               <h3 style="text-align: center">安检年报表</h3>
             </th>
           </tr>
           <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
+            <th colspan='12' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
               结束时间：{{ model.model.endDate }}
             </th>
           </tr>
           </thead>
           <tr>
-            <th colspan='5' style="font-weight: normal;">
+            <th colspan='12' style="font-weight: normal;">
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
@@ -79,6 +88,7 @@
       let model = new DataModel('rs/report/safeStatisticsYear', {})
       // model.f_filialeid = '(' + this.$login.f.orgid + ')'
       return {
+        user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
         model: model

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

@@ -14,7 +14,10 @@
         隐患类型明细表民用
       </button>
       <button class="button_spacing button_search" @click="showaudio(5)" :class="{color:searchs.search5}">
-        安检员明细
+        安检员明细(有计划)
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(9)" :class="{color:searchs.search9}">
+        安检员明细(无计划)
       </button>
       <button class="button_spacing button_search" @click="showaudio(6)" :class="{color:searchs.search6}">
         安检日报表
@@ -58,6 +61,10 @@
     <div v-if="searchs.search8">
       <safe-statistics-year ></safe-statistics-year>
     </div>
+<!--安检年报表-->
+  <div v-if="searchs.search9">
+    <no-checkplan-safecheck ></no-checkplan-safecheck>
+  </div>
 </template>
 
 
@@ -77,7 +84,8 @@ export default {
         search5: false,
         search6: false,
         search7: false,
-        search8: false
+        search8: false,
+        search9: false
       },
       currentActiveSearch:''
     }

package/src/filiale/yongzhou/pc.js

@@ -3,18 +3,23 @@ import Vue from "vue";
 
 //手机特殊目录注册到该文件中
 let specialComp = {
-  "plan-manage":(resolve) => { require(['./pc/PlanManage.vue'], resolve) },
-  "role-selector-safe":(resolve) => { require(['./pc/RoleSelector.vue'], resolve) },
-  "check-user-list":(resolve) => { require(['./pc/checkUserList.vue'], resolve) },
-  "safe-table":(resolve) => { require(['./pc/safeTable.vue'], resolve) },
-  "safe-detail":(resolve) => { require(['./pc/safeDetail.vue'], resolve) },
-  "community-detail":(resolve) => { require(['./pc/communityDetail.vue'], resolve) },
-  "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG.vue'], resolve) },
-  "community-type-detail-m":(resolve) => { require(['./pc/communityTypeDetailM.vue'], resolve) },
-  "safe-statistics":(resolve) => { require(['./pc/safeStatistics.vue'], resolve) },
-  "safe-statistics-day":(resolve) => { require(['./pc/safeStatisticsDay.vue'], resolve) },
-  "safe-statistics-month":(resolve) => { require(['./pc/safeStatisticsMonth.vue'], resolve) },
-  "safe-statistics-year":(resolve) => { require(['./pc/safeStatisticsYear.vue'], resolve) },
+  "plan-manage":(resolve) => { require(['./pc/PlanManage'], resolve) },
+  "role-selector-safe":(resolve) => { require(['./pc/RoleSelector'], resolve) },
+  "check-user-list":(resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  "safe-table":(resolve) => { require(['./pc/safeTable'], resolve) },
+  "safe-detail":(resolve) => { require(['./pc/safeDetail'], resolve) },
+  'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
+  "community-detail":(resolve) => { require(['./pc/communityDetail'], resolve) },
+  "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG'], resolve) },
+  "community-type-detail-m":(resolve) => { require(['./pc/communityTypeDetailM'], resolve) },
+  "safe-statistics":(resolve) => { require(['./pc/safeStatistics'], resolve) },
+  "safe-statistics-day":(resolve) => { require(['./pc/safeStatisticsDay'], resolve) },
+  "safe-statistics-month":(resolve) => { require(['./pc/safeStatisticsMonth'], resolve) },
+  "safe-statistics-year":(resolve) => { require(['./pc/safeStatisticsYear'], resolve) },
+  "no-checkplan-safecheck":(resolve) => { require(['./pc/NoCheckplanSafecheck'], resolve) },
+  "print-data-safe":(resolve) => { require(['./pc/PrintData'], resolve) },
+  "print-table-safe":(resolve) => { require(['./pc/PrintTable'], resolve) },
 }
 exports.specialComp = specialComp