safecheck-client 3.0.30-4 → 3.0.30-41

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

@@ -1,231 +1,248 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <criteria-paged :model="model" v-ref:paged>
-        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
-          <div partial>
-            <div class="row">
-              <div class="form-group col-sm-4">
-                <label class="font_normal_body">开始时间:</label>
-                <datepicker
-                  placeholder='请选择'
-                  style="width:60%"
-                  :select-year="true"
-                  :disabled-days-of-week="[]"
-                  :format="'yyyy'"
-                  :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'">
-                </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 '%{}%'">
-            </div>
-              <div class="col-sm-4 form-group" style="margin: 0">
-              <role-selector-safe
-                role-name="安检员"
-                :resobjprop.sync="$parent.$parent.resids"
-                role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="tcp.f_checker_name = '{}'">
-              </role-selector-safe>
-              </div>
-              <div style="float: right">
-                  <export-excel-safe   :data="$parent.$parent.searchData"
-                                      :field="$parent.$parent.excelHeaders"
-                                      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"
-                          :field="$parent.$parent.excelHeaders"
-                          :defaultfield="$parent.$parent.defaultPrint"
-                          titletable="安检报表月" :starthead="$parent.$parent.getstart"
-                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-              <button class="button_spacing button_search" @click="search()">查询</button>
-            </div>
-          </div>
-        </criteria>
-        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th>
-                <nobr>序号</nobr>
-              </th>
-              <th>
-                <nobr>小区名称</nobr>
-              </th>
-              <th>
-                <nobr>1月</nobr>
-              </th>
-              <th>
-                <nobr>2月</nobr>
-              </th>
-              <th>
-                <nobr>3月</nobr>
-              </th>
-              <th>
-                <nobr>4月</nobr>
-              </th>
-              <th>
-                <nobr>5月</nobr>
-              </th>
-              <th>
-                <nobr>6月</nobr>
-              </th>
-              <th>
-                <nobr>7月</nobr>
-              </th>
-              <th>
-                <nobr>8月</nobr>
-              </th>
-              <th>
-                <nobr>9月</nobr>
-              </th>
-              <th>
-                <nobr>10月</nobr>
-              </th>
-              <th>
-                <nobr>11月</nobr>
-              </th>
-              <th>
-                <nobr>12月</nobr>
-              </th>
-            </tr>
-          </template>
-          <template partial='body'>
-
-            <td style="text-align: center">{{ $index + 1 }}</td>
-            <td style="text-align: center">{{ row.f_residential_area }}</td>
-            <td style="text-align: center">{{ row.month1 }}</td>
-            <td style="text-align: center">{{ row.month2 }}</td>
-            <td style="text-align: center">{{ row.month3 }}</td>
-            <td style="text-align: center">{{ row.month4 }}</td>
-            <td style="text-align: center">{{ row.month5 }}</td>
-            <td style="text-align: center">{{ row.month6 }}</td>
-            <td style="text-align: center">{{ row.month7 }}</td>
-            <td style="text-align: center">{{ row.month8 }}</td>
-            <td style="text-align: center">{{ row.month9 }}</td>
-            <td style="text-align: center">{{ row.month10 }}</td>
-            <td style="text-align: center">{{ row.month11 }}</td>
-            <td style="text-align: center">{{ row.month12 }}</td>
-          </template>
-          <template partial="foot">
-            <td style="text-align: center" colspan="2"><span><b>合计：</b></span></td>
-            <td style="text-align: center">{{ model.sums.month1 }}</td>
-            <td style="text-align: center">{{ model.sums.month2 }}</td>
-            <td style="text-align: center">{{ model.sums.month3 }}</td>
-            <td style="text-align: center">{{ model.sums.month4 }}</td>
-            <td style="text-align: center">{{ model.sums.month5 }}</td>
-            <td style="text-align: center">{{ model.sums.month6 }}</td>
-            <td style="text-align: center">{{ model.sums.month7 }}</td>
-            <td style="text-align: center">{{ model.sums.month8 }}</td>
-            <td style="text-align: center">{{ model.sums.month9 }}</td>
-            <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>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-import {PagedList} from "vue-client";
-
-export default {
-  name: "safeStatisticsMonth",
-  title: "安检报表月",
-  data() {
-
-    return {
-      model: new PagedList("/rs/sql/safeStatisticsMonth", 999, {orgid: this.$login.f.orgid}, {
-        month1: '',
-        month2: '',
-        month3: '',
-        month4: '',
-        month5: '',
-        month6: '',
-        month7: '',
-        month8: '',
-        month9: '',
-        month10: '',
-        month11: '',
-        month12: ''
-      }),
-            resids:{},
-      searchData:{
-        condition: "1=1",
-        orgid: this.$login.f.orgid
-      },
-      excelHeaders:{
-        'f_residential_area': '小区名称',
-        'month1': '1月',
-        'month2': '2月',
-        'month3': '3月',
-        'month4': '4月',
-        'month5': '5月',
-        'month6': '6月',
-        'month7': '7月',
-        'month8': '8月',
-        'month9': '9月',
-        'month10': '10月',
-        'month11': '11月',
-        'month12': '12月',
-      },
-      printshow: false,
-      defaultPrint: ['f_residential_area', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12',],
-      sumsmodel: {},
-    }
-  },
-  ready() {
-    this.model.search('1=1')
-  },
-  methods: {
-    selfSearch(args) {
-      this.model.search(args.condition, args.model, args.condValue)
-      this.searchData.condition = args.condition
-      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-    },
-    getRes(obj) {
-      //tag
-      this.resids = {res: obj.res[0], resids: obj.resids[0]}
-      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-    },
-    // 打印
-    stamp() {
-      this.printshow = true
-    },
-    close() {
-      this.printshow = false
-    }
-  },
-  computed: {
-    getstart() {
-      return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div partial>
+            <div class="row">
+              <div class="form-group col-sm-4">
+                <label class="font_normal_body">开始时间:</label>
+                <datepicker
+                  placeholder='请选择'
+                  style="width:60%"
+                  :select-year="true"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy'"
+                  :show-rest-button="reset"
+                  :value.sync="model.start_time"
+                  v-model="model.start_time"
+                  condition="tcpi.f_last_check_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="tcpi.f_last_check_date <= '{}-12-31 23:59:59'">
+                </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="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="安检员"
+                :resobjprop.sync="$parent.$parent.resids"
+                role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                condition="tcp.f_checker_name = '{}'">
+              </role-selector-safe>
+              </div>
+              <div style="float: right">
+                  <export-excel-safe   :data="$parent.$parent.searchData"
+                                      :field="$parent.$parent.excelHeaders"
+                                      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"
+                          :field="$parent.$parent.excelHeaders"
+                          :defaultfield="$parent.$parent.defaultPrint"
+                          titletable="安检报表月" :starthead="$parent.$parent.getstart"
+                          :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+              <button class="button_spacing button_search" @click="search()">查询</button>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>小区名称</nobr>
+              </th>
+              <th>
+                <nobr>1月</nobr>
+              </th>
+              <th>
+                <nobr>2月</nobr>
+              </th>
+              <th>
+                <nobr>3月</nobr>
+              </th>
+              <th>
+                <nobr>4月</nobr>
+              </th>
+              <th>
+                <nobr>5月</nobr>
+              </th>
+              <th>
+                <nobr>6月</nobr>
+              </th>
+              <th>
+                <nobr>7月</nobr>
+              </th>
+              <th>
+                <nobr>8月</nobr>
+              </th>
+              <th>
+                <nobr>9月</nobr>
+              </th>
+              <th>
+                <nobr>10月</nobr>
+              </th>
+              <th>
+                <nobr>11月</nobr>
+              </th>
+              <th>
+                <nobr>12月</nobr>
+              </th>
+              <th>
+                <nobr>小计</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+
+            <td style="text-align: center">{{ $index + 1 }}</td>
+            <td style="text-align: center">{{ row.f_residential_area }}</td>
+            <td style="text-align: center">{{ row.month1 }}</td>
+            <td style="text-align: center">{{ row.month2 }}</td>
+            <td style="text-align: center">{{ row.month3 }}</td>
+            <td style="text-align: center">{{ row.month4 }}</td>
+            <td style="text-align: center">{{ row.month5 }}</td>
+            <td style="text-align: center">{{ row.month6 }}</td>
+            <td style="text-align: center">{{ row.month7 }}</td>
+            <td style="text-align: center">{{ row.month8 }}</td>
+            <td style="text-align: center">{{ row.month9 }}</td>
+            <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>
+            <td style="text-align: center">{{ model.sums.month1 }}</td>
+            <td style="text-align: center">{{ model.sums.month2 }}</td>
+            <td style="text-align: center">{{ model.sums.month3 }}</td>
+            <td style="text-align: center">{{ model.sums.month4 }}</td>
+            <td style="text-align: center">{{ model.sums.month5 }}</td>
+            <td style="text-align: center">{{ model.sums.month6 }}</td>
+            <td style="text-align: center">{{ model.sums.month7 }}</td>
+            <td style="text-align: center">{{ model.sums.month8 }}</td>
+            <td style="text-align: center">{{ model.sums.month9 }}</td>
+            <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>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from "vue-client";
+
+export default {
+  name: "safeStatisticsMonth",
+  title: "安检报表月",
+  data() {
+
+    return {
+      model: new PagedList("/rs/sql/safeStatisticsMonth", 999, {orgid: this.$login.f.orgid}, {
+        month1: '',
+        month2: '',
+        month3: '',
+        month4: '',
+        month5: '',
+        month6: '',
+        month7: '',
+        month8: '',
+        month9: '',
+        month10: '',
+        month11: '',
+        month12: '',
+        countarea: ''
+      }),
+            resids:{},
+      searchData:{
+        condition: "1=1",
+        orgid: this.$login.f.orgid
+      },
+      user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+      excelHeaders:{
+        'f_residential_area': '小区名称',
+        'month1': '1月',
+        'month2': '2月',
+        'month3': '3月',
+        'month4': '4月',
+        'month5': '5月',
+        'month6': '6月',
+        'month7': '7月',
+        'month8': '8月',
+        'month9': '9月',
+        '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','countarea'],
+      sumsmodel: {},
+    }
+  },
+  ready() {
+    this.model.search('1=1')
+  },
+  methods: {
+    selfSearch(args) {
+      this.model.search(args.condition, args.model, args.condValue)
+      this.searchData.condition = args.condition
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
+    },
+    getRes(obj) {
+      //tag
+      this.resids = {res: obj.res[0], resids: obj.resids[0]}
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+    },
+    // 打印
+    stamp() {
+      this.printshow = true
+    },
+    close() {
+      this.printshow = false
+    }
+  },
+  computed: {
+    getstart() {
+      return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -35,6 +35,15 @@
               <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>
@@ -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

@@ -1,23 +1,25 @@
-// 分公司特殊组件页面注册
-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) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+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) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], 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) },
+  "no-checkplan-safecheck":(resolve) => { require(['./pc/NoCheckplanSafecheck.vue'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+