safecheck-client 3.0.33-61 → 3.0.33-63

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

@@ -6,9 +6,9 @@
           <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='请选择'
+                  placeholder='计划创建开始日期'
                   style="width:60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
@@ -19,9 +19,9 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">结束时间:</label>
+                <label class="font_normal_body">计划创建结束日期:</label>
                 <datepicker
-                  placeholder='请选择'
+                  placeholder='计划创建结束日期'
                   :disabled-days-of-week="[]"
                   style="width:60%"
                   :format="'yyyy-MM-dd'"
@@ -163,126 +163,135 @@
       <header slot="modal-header" class="modal-header" style="text-align: center">
       </header>
       <article slot="modal-body" class="modal-body">
-        <criteria partial='criteria' class="search_area" 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%"
-                  :disabled-days-of-week="[]"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  :value.sync="$parent.$parent.modalSearchData.start_time"
-                  v-model="$parent.$parent.modalSearchData.start_time"
-                >
-                </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="$parent.$parent.modalSearchData.end_time"
-                  v-model="$parent.$parent.modalSearchData.end_time">
-                </datepicker>
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">用户编号</label>
-                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_userinfo_code">
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">用户名称</label>
-                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_user_name">
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">用户地址</label>
-                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_address">
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">用户电话</label>
-                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_user_phone">
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">安检员</label>
-                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_checker">
-              </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">安检状态</label>
-                <v-select :value.sync="$parent.$parent.modalSearchData.f_last_check_state" v-model='$parent.$parent.modalSearchData.f_last_check_state'
-                          :value-single="true" style="width: 60%"
-                          class="select_list select"
-                          :options='$parent.$parent.last_check_states' placeholder='安检状态'
-                          close-on-select
-                ></v-select>
-              </div>
-              <div class="form-group col-sm-4">
-                <label class="font_normal_body">用户类型</label>
-                <v-select :value.sync="$parent.$parent.modalSearchData.f_user_type" v-model='$parent.$parent.modalSearchData.f_user_type'
-                          :value-single="true" style="width: 60%"
-                          class="select_list select"
-                          :options='$parent.$parent.user_types' placeholder='用户类型'
-                          close-on-select
-                ></v-select>
+        <criteria-paged :model="modalModel" v-ref:paged2>
+          <criteria partial='criteria' class="search_area" v-ref:criteria2>
+            <div partial>
+              <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="$parent.$parent.modalSearchData.start_time"
+                    v-model="$parent.$parent.modalSearchData.start_time"
+                  >
+                  </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="$parent.$parent.$parent.modalSearchData.end_time"
+                    v-model="$parent.$parent.$parent.modalSearchData.end_time">
+                  </datepicker>
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户编号</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_userinfo_code">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户名称</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_user_name">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户地址</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_address">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">用户电话</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_user_phone">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">安检员</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_checker">
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">安检状态</label>
+                  <v-select :value.sync="$parent.$parent.$parent.modalSearchData.f_last_check_state" v-model='$parent.$parent.$parent.modalSearchData.f_last_check_state'
+                            :value-single="true" style="width: 60%"
+                            class="select_list select"
+                            :options='$parent.$parent.$parent.last_check_states' placeholder='安检状态'
+                            close-on-select
+                  ></v-select>
+                </div>
+                <div class="form-group col-sm-4">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select :value.sync="$parent.$parent.$parent.modalSearchData.f_user_type" v-model='$parent.$parent.$parent.modalSearchData.f_user_type'
+                            :value-single="true" style="width: 60%"
+                            class="select_list select"
+                            :options='$parent.$parent.$parent.user_types' placeholder='用户类型'
+                            close-on-select
+                  ></v-select>
+                </div>
+                <div class="col-sm-4 form-group">
+                  <label class="font_normal_body">到访不遇次数</label>
+                  <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_check_version">
+                </div>
+                <div style="float: right">
+                  <button class="button_spacing button_search" @click="$parent.$parent.$parent.modalSearch()">查询</button>
+                  <export-excel-safe :data="$parent.$parent.$parent.modalSearchExcelData"
+                                     :field="$parent.$parent.$parent.modalExcelHeaders"
+                                     progress="safeGetExportProgress"
+                                     sqlurl="rs/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy" template-name='安检情况明细'
+                                     :choose-col="true"></export-excel-safe>
+                </div>
               </div>
-              <div class="col-sm-4 form-group">
-                <label class="font_normal_body">到访不遇次数</label>
-                <input style="width: 60%" class="input_search" v-model="$parent.$parent.modalSearchData.f_check_version">
-              </div>
-              <button class="button_spacing button_search" @click="$parent.$parent.modalSearch()">查询</button>
             </div>
-          </div>
-        </criteria>
-        <data-grid class="list_area table_sy" :model="modalModel" v-ref:modalgrid partial='list'>
-          <template partial='head'>
-            <th>
-              <nobr>用户编号</nobr>
-            </th>
-            <th>
-              <nobr>用户名称</nobr>
-            </th>
-            <th>
-              <nobr>小区</nobr>
-            </th>
-            <th>
-              <nobr>地址</nobr>
-            </th>
-            <th>
-              <nobr>客户电话</nobr>
-            </th>
-            <th>
-              <nobr>到访不遇次数</nobr>
-            </th>
-            <th>
-              <nobr>安检时间</nobr>
-            </th>
-            <th>
-              <nobr>安检员</nobr>
-            </th>
-            <th>
-              <nobr>用户类型</nobr>
-            </th>
-            <th v-if="$parent.$parent.$parent.$parent.type === '1'">
-              <nobr>安检状态</nobr>
-            </th>
-          </template>
-          <template partial='body'>
-            <td style="text-align:center">{{row.f_userinfo_code}}</td>
-            <td style="text-align:center">{{row.f_user_name }}</td>
-            <td style="text-align:center">{{row.f_residential_area}}</td>
-            <td style="text-align:center">{{row.f_address}}</td>
-            <td style="text-align:center">{{row.f_user_phone}}</td>
-            <td style="text-align:center">{{row.f_check_version}}</td>
-            <td style="text-align:center">{{row.f_last_check_date}}</td>
-            <td style="text-align:center">{{row.f_checker}}</td>
-            <td style="text-align:center">{{row.f_user_type}}</td>
-            <td style="text-align:center" v-if="$parent.$parent.$parent.$parent.type === '1'">{{row.f_last_check_state}}</td>
-          </template>
-        </data-grid>
+          </criteria>
+          <data-grid class="list_area table_sy" :model="$parent.$parent.modalModel" v-ref:modalgrid partial='list'>
+            <template partial='head'>
+              <th>
+                <nobr>用户编号</nobr>
+              </th>
+              <th>
+                <nobr>用户名称</nobr>
+              </th>
+              <th>
+                <nobr>小区</nobr>
+              </th>
+              <th>
+                <nobr>地址</nobr>
+              </th>
+              <th>
+                <nobr>客户电话</nobr>
+              </th>
+              <th>
+                <nobr>到访不遇次数</nobr>
+              </th>
+              <th>
+                <nobr>安检时间</nobr>
+              </th>
+              <th>
+                <nobr>安检员</nobr>
+              </th>
+              <th>
+                <nobr>用户类型</nobr>
+              </th>
+              <th v-if="$parent.$parent.$parent.$parent.$parent.type === '1'">
+                <nobr>安检状态</nobr>
+              </th>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">{{row.f_userinfo_code}}</td>
+              <td style="text-align:center">{{row.f_user_name }}</td>
+              <td style="text-align:center">{{row.f_residential_area}}</td>
+              <td style="text-align:center">{{row.f_address}}</td>
+              <td style="text-align:center">{{row.f_user_phone}}</td>
+              <td style="text-align:center">{{row.f_check_version}}</td>
+              <td style="text-align:center">{{row.f_last_check_date}}</td>
+              <td style="text-align:center">{{row.f_checker}}</td>
+              <td style="text-align:center">{{row.f_user_type}}</td>
+              <td style="text-align:center" v-if="$parent.$parent.$parent.$parent.$parent.type === '1'">{{row.f_last_check_state}}</td>
+            </template>
+          </data-grid>
+        </criteria-paged>
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-default" @click='modal_show = false'>关闭</button>
@@ -314,12 +323,30 @@ export default {
         jjcount: ''
       }),
       resids: {},
-      modalModel: new PagedList('rs/sql/singleTable_OrderBy', 99999, {
+      modalModel: new PagedList('rs/sql/safe_singleTable_OrderBy', 20, {
         items: '"tcpi.*,tcp.f_checker"',
         tablename: '"t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id"',
         orderitem: '"1"'
       }),
       modalSearchData:{},
+      modalSearchExcelData:{
+        items: "tcpi.*,tcp.f_checker",
+        tablename: "t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id",
+        orderitem: "f_userinfo_code"
+      },
+      modalExcelHeaders:{
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户名称',
+        'f_residential_area': '小区',
+        'f_address': '地址',
+        'f_user_phone': '客户电话',
+        'f_check_version': '到访不遇次数',
+        'f_last_check_date': '安检时间',
+        'f_checker': '安检员',
+        'f_user_type': '用户类型',
+        'f_last_check_state': '安检状态'
+
+      },
       searchData: {
         condition: "1=1",
         orgid: this.$login.f.orgid
@@ -397,6 +424,7 @@ export default {
       if (this.type == '0') {
         modalCondition += ` and tcp.f_safecheck_type = '临时安检'`
       }
+      this.modalSearchExcelData.condition = modalCondition
       this.modalModel.search(modalCondition, this.modalModel)
     },
     async selfSearch(args) {

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

@@ -14,9 +14,25 @@
                 condition="tcp.f_checker = '{}'">
               </role-selector-safe>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
+            <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="form-group col-sm-4"  >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
+            </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.startDate"
                           :value.sync="model.startDate"
                           style="width: 60%;"
@@ -26,9 +42,9 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
+            <div class="col-sm-4 form-group">
+              <label for="endDate" class="font_normal_body">计划创建结束日期:</label>
+              <datepicker id="endDate" placeholder="计划创建结束日期"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
@@ -38,20 +54,6 @@
                           :show-reset-button="reset">
               </datepicker>
             </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="form-group col-sm-2"  >
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input type="text" class="input_search" v-model="model.f_residential_area"
-                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
-            </div>
             <div class="col-sm-4 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
               <report-print id='checkerPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
@@ -70,8 +72,8 @@
           </tr>
           <tr>
             <th colspan='9' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
+              计划创建开始日期：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              计划创建结束日期：{{ model.model.endDate }}
             </th>
           </tr>
           </thead>

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

@@ -4,9 +4,25 @@
       <criteria partial='criteria' @condition-changed='search' class="search_area">
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <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-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>
+          <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.startDate"
                           :value.sync="model.startDate"
                           style="width: 60%;"
@@ -17,9 +33,9 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
+            <div class="col-sm-4 form-group">
+              <label for="endDate" class="font_normal_body">计划创建结束日期:</label>
+              <datepicker id="endDate" placeholder="计划创建结束日期"
                           v-model="model.endDate"
                           :select-year="true"
                           :value.sync="model.endDate"
@@ -30,20 +46,6 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="form-group col-sm-2"  >
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <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 id='yearPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
@@ -62,8 +64,8 @@
           </tr>
           <tr>
             <th colspan='12' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
+              计划创建开始日期：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              计划创建结束日期：{{ model.model.endDate }}
             </th>
           </tr>
           </thead>

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('yongzhou')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('fugou')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})