safecheck-client 3.0.33-75 → 3.0.33-76

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'"
@@ -209,7 +209,7 @@
                   <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>
+                  <label class="font_normal_body">安&nbsp;检&nbsp;员</label>
                   <input style="width: 60%" class="input_search" v-model="$parent.$parent.$parent.modalSearchData.f_checker">
                 </div>
                 <div class="col-sm-4 form-group">
@@ -231,7 +231,7 @@
                   ></v-select>
                 </div>
                 <div class="col-sm-4 form-group">
-                  <label class="font_normal_body">到访不遇次数</label>
+                  <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">
@@ -271,6 +271,9 @@
               <th>
                 <nobr>安检员</nobr>
               </th>
+              <th>
+                <nobr>计划名称</nobr>
+              </th>
               <th>
                 <nobr>用户类型</nobr>
               </th>
@@ -287,6 +290,7 @@
               <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_plan_name}}</td>
               <td style="text-align:center">{{row.f_user_type}}</td>
               <td style="text-align:center">{{row.f_last_check_state}}</td>
             </template>
@@ -324,7 +328,7 @@ export default {
       }),
       resids: {},
       modalModel: new PagedList('rs/sql/safe_singleTable_OrderBy', 15, {
-        items: '"tcpi.*,tcp.f_checker"',
+        items: '"tcpi.*,tcp.f_checker,tcp.f_plan_name"',
         tablename: '"t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id"',
         orderitem: '"1"'
       }),
@@ -335,7 +339,7 @@ export default {
       }),
       modalSearchData:{},
       modalSearchExcelData:{
-        items: "tcpi.*,tcp.f_checker",
+        items: "tcpi.*,tcp.f_checker,tcp.f_plan_name",
         tablename: "t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id",
         orderitem: "f_userinfo_code"
       },
@@ -348,6 +352,7 @@ export default {
         'f_check_version': '到访不遇次数',
         'f_last_check_date': '安检时间',
         'f_checker': '安检员',
+        'f_plan_name':"计划名称",
         'f_user_type': '用户类型',
         'f_last_check_state': '安检状态'
 
@@ -395,7 +400,7 @@ export default {
     },
     modalSearch () {
       this.modalModel = new PagedList('rs/sql/safe_singleTable_OrderBy', 15, {
-        items: '"tcpi.*,tcp.f_checker"',
+        items: '"tcpi.*,tcp.f_checker,tcp.f_plan_name"',
         tablename: '"t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id"',
         orderitem: '"1"'
       })

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

@@ -1,175 +1,175 @@
-<template>
-  <div id='app' class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false'>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' class="search_area">
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-4 form-group">
-              <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"
-                condition="tcp.f_checker = '{}'">
-              </role-selector-safe>
-            </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="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="tcpi.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%;"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          condition="tcp.f_create_time >= '{}'"
-                          :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.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          condition="tcp.f_create_time <= '{}'"
-                          :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </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>
-              <report-excel id='checkerPrint'></report-excel>
-            </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>
-      <div partial='list' id='checkerPrint' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='9' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">安检员明细报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='9' style="font-weight: normal; text-align: center;">
-              计划创建开始日期：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              计划创建结束日期：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='9' style="font-weight: normal;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-          <tr style="height: 100px"></tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel, HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '安检员明细报表',
-    data () {
-      let model = new DataModel('rs/report/checkerReport', {})
-      // 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
-      }
-    },
-    methods: {
-      getRes (obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
-      },
-      selfSearch (args) {
-        let condition = {
-          condition1 : args.condition,
-          condition2 : `1=1 and f_entry_status = '入户'`
-        }
-        if (args.model.f_checker_id){
-          condition.condition2 += ` and f_checker_name = '${args.model.f_checker_id}'`
-        }
-        if (args.model.f_user_type){
-          condition.condition2 += ` and f_check_type = '${args.model.f_user_type}'`
-        }
-        if (args.model.f_residential_area){
-          condition.condition2 += ` and f_residential_area = '${args.model.f_residential_area}'`
-        }
-        if (args.model.checkstart){
-          condition.condition2 += ` and f_offsite_time >= '${args.model.checkstart}'`
-        }
-        if (args.model.checkend){
-          condition.condition2 += ` and f_offsite_time <= '${args.model.checkend}'`
-        }
-        this.model.search(condition, args.model)
-      }
-    },
-    ready () {
-    },
-    computed: {
-      selected () {
-        return this.$refs.grid.selected
-      }
-      // outlets () {
-      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
-      // },
-      // operator () {
-      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
-      // }
-    }
-  }
-</script>
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' class="search_area">
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <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"
+                condition="tcp.f_checker = '{}'">
+              </role-selector-safe>
+            </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="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="tcpi.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%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          condition="tcp.f_create_time >= '{}'"
+                          :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.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          condition="tcp.f_create_time <= '{}'"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </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>
+              <report-excel id='checkerPrint'></report-excel>
+            </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>
+      <div partial='list' id='checkerPrint' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='9' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">安检员明细报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='9' style="font-weight: normal; text-align: center;">
+              计划开始日期：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              计划结束日期：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='9' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+          <tr style="height: 100px"></tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '安检员明细报表',
+    data () {
+      let model = new DataModel('rs/report/checkerReport', {})
+      // 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
+      }
+    },
+    methods: {
+      getRes (obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
+      },
+      selfSearch (args) {
+        let condition = {
+          condition1 : args.condition,
+          condition2 : `1=1 and f_entry_status = '入户'`
+        }
+        if (args.model.f_checker_id){
+          condition.condition2 += ` and f_checker_name = '${args.model.f_checker_id}'`
+        }
+        if (args.model.f_user_type){
+          condition.condition2 += ` and f_check_type = '${args.model.f_user_type}'`
+        }
+        if (args.model.f_residential_area){
+          condition.condition2 += ` and f_residential_area = '${args.model.f_residential_area}'`
+        }
+        if (args.model.checkstart){
+          condition.condition2 += ` and f_offsite_time >= '${args.model.checkstart}'`
+        }
+        if (args.model.checkend){
+          condition.condition2 += ` and f_offsite_time <= '${args.model.checkend}'`
+        }
+        this.model.search(condition, args.model)
+      }
+    },
+    ready () {
+    },
+    computed: {
+      selected () {
+        return this.$refs.grid.selected
+      }
+      // outlets () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+      // },
+      // operator () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+      // }
+    }
+  }
+</script>