safecheck-client 4.0.2-5 → 4.0.2-51

package/src/components/report/CheckByPlan.vue

@@ -1,118 +1,118 @@
-<template>
-  <div id='app' class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
-        <div novalidate class="form-inline 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="f_checker_name = '{}'">
-              </role-selector-safe>
-            </div>
-            <div class="col-sm-2 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 HH:mm:ss'"
-                          :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="结束日期"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-3 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>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' 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;">
-              <h3 style="text-align: center">安检数据报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' 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;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel} from 'vue-client'
-  import * as Util from "../Util";
-
-  export default {
-    title: '安检员安检情况报表',
-    data() {
-      let model = new DataModel('/api/af-safecheck/report/checkByPlan')
-      model.f_filialeid = this.$login.f.orgid
-      return {
-        filialeNameStr: '',
-        filialeCodeStr: '',
-        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);
-      },
-      search(args){
-        if (this.model.f_filialeid) {
-          args.condition += ` and tcp.f_filialeid in ${this.model.f_filialeid}`
-        }
-        if (args.model.startDate){
-          args.condition += ` and tcp.f_offsite_time >= '${args.model.startDate}'`
-        }
-        if (args.model.endDate){
-          args.condition += ` and tcp.f_offsite_time <= '${args.model.endDate}'`
-        }
-        this.model.search(args.condition,args.model)
-      }
-    },
-    ready() {
-      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
-    },
-    computed: {
-      selected() {
-        return this.$refs.grid.selected
-      },
-    }
-  }
-</script>
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
+        <div novalidate class="form-inline 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="f_checker_name = '{}'">
+              </role-selector-safe>
+            </div>
+            <div class="col-sm-2 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 HH:mm:ss'"
+                          :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="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-3 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>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' 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;">
+              <h3 style="text-align: center">安检数据报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' 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;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel} from 'vue-client'
+  import * as Util from "../Util";
+
+  export default {
+    title: '安检员安检情况报表',
+    data() {
+      let model = new DataModel('/api/af-safecheck/report/checkByPlan')
+      model.f_filialeid = this.$login.f.orgid
+      return {
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        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);
+      },
+      search(args){
+        if (this.model.f_filialeid) {
+          args.condition += ` and tcp.f_filialeid in ${this.model.f_filialeid}`
+        }
+        if (args.model.startDate){
+          args.condition += ` and tcp.f_offsite_time >= '${args.model.startDate}'`
+        }
+        if (args.model.endDate){
+          args.condition += ` and tcp.f_offsite_time <= '${args.model.endDate}'`
+        }
+        this.model.search(args.condition,args.model)
+      }
+    },
+    ready() {
+      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
+    },
+    computed: {
+      selected() {
+        return this.$refs.grid.selected
+      },
+    }
+  }
+</script>

package/src/components/report/CheckPlanAreaList.vue

@@ -1,6 +1,6 @@
 <template>
   <div  class="flex">
-    <criteria-paged :model="model" v-ref:paged :pager="false">
+    <criteria-paged :model="model" v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
@@ -41,6 +41,18 @@
                         close-on-select clear-button></v-select>
 
             </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select class="select_list select"
+                        placeholder='片区/管理站' style="width: 60%"
+                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_slice_area='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
             <!--<div  :class="{
             'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">安&ensp;检&ensp;员</label>
@@ -62,9 +74,12 @@
                                                      sqlurl="api/af-safecheck/logic/exportfile" sql-name="getCheckPlanAreaList"
                                                      template-name='安检汇总' :choose-col="true">
                                 </export-excel>-->
-                <button id="btnaaaa" style="float: right" class="button_search"
-                        @click="$parent.$parent.exportexcel()"
-                        v-el:cx>导出</button>
+                <export-excel   :data="$parent.$parent.exportParameter"
+                                :field="$parent.$parent.exportExcelField"
+                                sqlurl="api/af-safecheck/logic/exportfile"
+                                sql-name="getCheckPlanAreaList"
+                                template-name='安检汇总' :choose-col="true">
+                </export-excel>
                 <button id="btnaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
                         v-el:cx>查询</button>
@@ -108,6 +123,8 @@
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
+              <input type="checkbox" id="f_safecheck_type" value="f_safecheck_type" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_checker_name">安检类型</label>
             </div>
           </div>
         </div>
@@ -125,6 +142,7 @@
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')"><nobr>计划名称</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')"><nobr>安检员</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><nobr>档案数量</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_safecheck_type')"><nobr>安检类型</nobr></th>
             <th>
               <nobr>计划总数</nobr>
             </th>
@@ -165,6 +183,7 @@
             <td style="text-align:center" :class="{'td-0':row.f_plan_name==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>
             <td style="text-align:center" :class="{'td-0':row && !row.f_checker_name,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_checker_name && row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name && row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_safecheck_type')">{{row.f_safecheck_type}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
             <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
@@ -203,12 +222,13 @@ import XLSX from 'xlsx'
 export default {
   data () {
     return {
-      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
+      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 50,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
       // 公司下拉
       curorgid: [this.$login.f.orgid],
       row: {},
       f_orgid: '',
       nameForSql: [],
+      sliceArea: [],
       groupNameForSql: '',
       listflag:false,
       nameflag:false,
@@ -239,9 +259,32 @@ export default {
     this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
     this.pl()
     // this.search()
+    this.Mreadibook(this.$login.f.orgid)
 
   },
   methods: {
+    Mreadibook(val){
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid = '${val}'`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.sliceArea.push({
+              label:ress.name,
+              value:ress.name
+            })
+          })
+        })
+      }
+    },
     exportexcel(){
       //tag
 // 以上四行也可以直接一行搞定，如果不需要对表格数据进行修改的话
@@ -284,6 +327,9 @@ export default {
         }if (ff==='f_user_number') {
           this.exportExcelField.f_user_number='档案数量'
         }
+        if (ff==='f_safecheck_type') {
+          this.exportExcelField.f_safecheck_type='安检类型'
+        }
       }
     },
     pl() {
@@ -359,7 +405,7 @@ export default {
 
     // 拼接groupName1
     getGroupName1 () {
-      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_safecheck_type']
       var newtemp=[]
 
       for (var i=0;i<temp.length;i++){
@@ -396,7 +442,7 @@ export default {
       }
       this.listflag=true
       //tag
-      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_safecheck_type']
       var newtemp=[]
       for (var i=0;i<temp.length;i++){
         for (var j=0;j<this.nameForSql.length;j++){