safecheck-client 4.0.2-5 → 4.0.2-50

package/src/filiale/meihekou/pc/CheckPlanAreaList.vue

@@ -0,0 +1,505 @@
+<template>
+  <div  class="flex">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <!--<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">组织机构</label>
+              <res-select restype='organization'
+                          class="select select_list"
+                          style="width: 60%"
+                          @res-select="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>-->
+            <div :class="{'col-sm-6':$parent.$parent.$parent.isdetail,'col-sm-4':!$parent.$parent.$parent.isdetail}">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getorg"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                condition="f_checker_name like '%{}%'">
+              </role-selector-safe>
+            </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">小区名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
+                     condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
+            </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">计划名称</label>
+              <v-select class="select_list select"
+                        placeholder='计划名称' style="width: 60%"
+                        :search="true"
+                        v-model="model.f_plan_name"
+                        :value.sync="model.f_plan_name"
+                        :options='$parent.$parent.planName'
+                        condition="f_plan_id = '{}'"
+                        :value-single="true"
+                        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">安&ensp;检&ensp;员</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_building" placeholder='楼栋'
+                     condition="f_building like '%{}%'" v-next-el="cx" v-el:qjmc>
+            </div>-->
+            <div class="form-group col-sm-2" v-if="!$parent.$parent.$parent.isdetail"></div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" style="float:right; padding-right: 25px">
+              <div class="span" style="float:right;">
+                <div style="float: right;margin-left:10px" class="button_spacing"
+                     :class="{'button_shrink_left':!$parent.$parent.$parent.isdetail,'button_shrink_right':$parent.$parent.$parent.isdetail}"
+                     @click="$parent.$parent.hiddenr()"></div>
+                <div class="button_spacing" style="float: right;margin-left:10px"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()">
+                </div>
+                <!--                <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="btnaaaa" style="float: right" class="button_search"
+                        @click="$parent.$parent.exportexcel()"
+                        v-el:cx>导出</button>
+                <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>
+              </div>
+            </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">起始时间</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_start"
+                placeholder='起始时间' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">结束时间</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_end"
+                placeholder='结束时间' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-12">
+              <label class="control-label" style="color: #c7254e">汇 总 项</label>
+              <input type="checkbox" id="f_plan_month" value="f_plan_month"  v-model="$parent.$parent.nameForSql"/>
+              <label for="f_plan_month">计划月份</label>
+              <input type="checkbox" id="f_no_checkplan" value="f_no_checkplan" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_no_checkplan">计划类型</label>
+              <input type="checkbox" id="f_residential_area" value="f_residential_area" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_residential_area">小区名称</label>
+              <input type="checkbox" id="f_plan_name" value="f_plan_name" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_plan_name">计划名称</label>
+              <input type="checkbox" id="f_building" value="f_building" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_building">楼栋</label>
+              <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_building">档案数量</label>
+            </div>
+          </div>
+        </div>
+
+      </criteria>
+      <data-grid id="excelid" :model="model" partial='list' class="list_area table_sy excelid"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <nobr>序号</nobr>
+            </th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_month')"><nobr>计划月份</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_no_checkplan')"><nobr>计划类型</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"><nobr>小区名称</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')"><nobr>计划名称</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_building')"><nobr>楼栋</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><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>-->
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center;border-right: 1px solid ">{{$index + 1}}</td>
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_month')">{{row.f_plan_month.indexOf('*&')!=-1?'':row.f_plan_month}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_no_checkplan')">{{row.f_no_checkplan.indexOf('*&')!=-1?'':row.f_no_checkplan}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area.indexOf('*&')!=-1?'':row.f_residential_area}}</td>-->
+            <!--            <td style="text-align:center"  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"  v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_building')">{{row.f_building && row.f_building.indexOf('*&')!=-1?'':row.f_building}}</td>-->
+            <td style="text-align:center" :class="{'td-0':row.f_plan_month==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_plan_month.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_plan_month.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_plan_month.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_plan_month.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_month')">{{row.f_plan_month.indexOf('*&')!=-1?'':row.f_plan_month}}</td>
+            <td style="text-align:center" :class="{'td-0':row.f_no_checkplan==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_no_checkplan.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_no_checkplan.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_no_checkplan.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_no_checkplan.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_no_checkplan')">{{row.f_no_checkplan.indexOf('*&')!=-1?'':row.f_no_checkplan}}</td>
+            <td style="text-align:center" :class="{'td-0':row.f_residential_area==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area.indexOf('*&')!=-1?'':row.f_residential_area}}</td>
+            <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_building,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_building && row.f_building.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_building &&row.f_building.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_building &&row.f_building.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_building &&row.f_building.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_building')">{{row.f_building && row.f_building.indexOf('*&')!=-1?'':row.f_building}}</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">{{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>
+            <td style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
+            <td style="text-align:center">{{row.f_buyu}}</td>
+            <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
+          </tr>
+        </template>
+        <template partial="foot">
+          <tr>
+            <td  style="text-align:center"><strong>合计：</strong></td>
+            <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_weijian}}</strong></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_yijian}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jujian}}</strong></nobr></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_yijian/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
+          </tr >
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+/**
+ *阶梯气价查询列表
+ */
+import {PagedList} from 'vue-client'
+import { HttpResetClass } from 'vue-client'
+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:''}),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      row: {},
+      f_orgid: '',
+      nameForSql: [],
+      groupNameForSql: '',
+      listflag:false,
+      nameflag:false,
+      criteriaShow: false,
+      f_check_start:new Date().getFullYear() + '-01',
+      f_check_end:new Date().getFullYear() + '-12',
+      planName:[{label: '全部', value: ''}],
+      exportExcelField: {
+        'f_weijian':'未检',
+        'f_yijian':'已检',
+        'f_ruhu':'入户',
+        'f_buyu':'到访不遇',
+        'f_jujian':'拒检',
+        'f_check_bv':'安检率'
+      }
+    }
+  },
+  props: {
+    row: {},
+    config: {},
+    ispartial: false,
+    f_filialeid: {
+      type: String
+    }
+  },
+  ready () {
+    this.nameForSql = ['f_plan_month', 'f_plan_name']
+    this.groupNameForSql = 'f_plan_month', 'f_plan_name'
+    debugger
+    this.pl()
+    // this.search()
+
+  },
+  methods: {
+    exportexcel(){
+      //tag
+// 以上四行也可以直接一行搞定，如果不需要对表格数据进行修改的话
+      const aa = document.getElementsByClassName("list_area table_sy excelid")[0]
+      console.log(aa)
+      let workbook = XLSX.utils.table_to_book(document.getElementsByClassName("list_area table_sy excelid")[0])
+      try {
+        XLSX.writeFile(workbook, '安检情况汇总导出.xlsx');
+      } catch(e) {
+        //tag;
+      }
+    },
+    // 获取导出列
+    getexportExcelField(){
+      this.exportExcelField = {
+        'f_weijian':'未检',
+        'f_yijian':'已检',
+        'f_ruhu':'入户',
+        'f_buyu':'到访不遇',
+        'f_jujian':'拒检',
+        'f_check_bv':'安检率',
+        'f_plan_total':'计划总数'
+      }
+      let forName = this.groupNameForSql.split(",")
+      for (let i = 0; i < forName.length; i++) {
+        let ff = forName[i]
+        if (ff==='f_plan_month') {
+          this.exportExcelField.f_plan_month='计划月份'
+        }
+        if (ff==='f_no_checkplan') {
+          this.exportExcelField.f_no_checkplan='计划类型'
+        }
+        if (ff==='f_plan_name') {
+          this.exportExcelField.f_plan_name='计划名称'
+        }
+        if (ff==='f_building') {
+          this.exportExcelField.f_building='楼栋'
+        }if (ff==='f_residential_area') {
+          this.exportExcelField.f_residential_area='小区名称'
+        }if (ff==='f_user_number') {
+          this.exportExcelField.f_user_number='档案数量'
+        }
+      }
+    },
+    pl() {
+      let getGasman = new HttpResetClass()
+      getGasman.load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "id,f_plan_name",
+          tablename: "t_check_plan",
+          condition: `f_filialeid = '${this.curorgid}'`,
+          orderitem: "id"
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then((plne) => {
+        //tag
+        //tag
+        //tag
+        for (let i = 0; i < plne.data.length; i++) {
+          this.planName.push({label: plne.data[i].f_plan_name, value: plne.data[i].id})
+        }
+        //tag
+      })
+    },
+    hiddenr() {
+      this.$parent.isdetail = !this.$parent.isdetail
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+      this.$dispatch('search')
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val.resids)
+      this.f_filialeid = val[0]
+
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+        args.condition = `f_filialeid  in ('${this.$login.f.orgid}') and ${args.condition}`
+      }
+      if (this.f_orgid) {
+        args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+      }
+      if(this.f_check_start && this.f_check_end){
+        if(new Date(this.f_check_start).getFullYear() == new Date(this.f_check_end).getFullYear() ){
+          args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
+        }else {
+          args.condition += ` and (
+              (f_year = ${new Date(this.f_check_start).getFullYear()} and f_month >= ${new Date(this.f_check_start).getMonth()+1})
+              or
+               ( f_year > ${new Date(this.f_check_start).getFullYear()} and  f_year < ${new Date(this.f_check_end).getFullYear()})
+              or
+               (f_year = ${new Date(this.f_check_end).getFullYear()} and f_month <= ${new Date(this.f_check_end).getMonth()+1}))`
+        }
+      } else {
+        if(this.f_check_start){
+          args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1}`
+        }
+        if(this.f_check_end){
+          args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
+        }
+      }
+      this.$refs.paged.$refs.grid.$el.scrollTop = 0
+      if (this.groupNameForSql=='undefined'){
+        //tag
+        this.$showMessage("请至少选择一项进行汇总")
+        return
+      }
+      this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
+      this.model.search(args.condition, args.model)
+    },
+
+    // 拼接groupName1
+    getGroupName1 () {
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_building','f_user_number']
+      var newtemp=[]
+
+      for (var i=0;i<temp.length;i++){
+        for (var j=0;j<this.nameForSql.length;j++){
+          //tag
+          if(temp[i]==this.nameForSql[j]){
+            newtemp.push(this.nameForSql[j])
+          }
+        }
+      }
+      let str = ''
+
+      for (var i=0;i < newtemp.length - 1; i++) {
+        str += newtemp[i] + ','
+      }
+      str += newtemp[i]
+      this.groupNameForSql = str.trim()
+    }
+  },
+  watch: {
+    // 'nameForSql' () {
+    //
+    //   this.getGroupName1()
+    // },
+    'nameForSql' () {
+      var e = document.createEvent("MouseEvents");
+      e.initEvent("click", true, true);
+      document.getElementById("btnaaa").dispatchEvent(e);
+    },
+    'model.rows'(){
+      //tag
+      if(this.listflag){
+        return;
+      }
+      this.listflag=true
+      //tag
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_building','f_user_number']
+      var newtemp=[]
+      for (var i=0;i<temp.length;i++){
+        for (var j=0;j<this.nameForSql.length;j++){
+          //tag
+          if(temp[i]==this.nameForSql[j]){
+            newtemp.push(this.nameForSql[j])
+          }
+        }
+      }
+      if((newtemp.includes('f_user_number')&&newtemp.length==2)||(!newtemp.includes('f_user_number')&&newtemp.length==1)){
+        return
+      }
+      var temp=JSON.parse(JSON.stringify(this.model.rows))
+
+      //遍历查询结果 为指定列增加样式
+      for (var i=0;i<newtemp.length-1;i++){
+        if(newtemp[i]=='f_user_number'){
+          return;
+        }
+        //tag
+        var ss=''
+        for (var j=0;j<temp.length;j++){
+          if(j>0&&i>0){
+            var flag=false
+            for(var t=i-1;t>-1;t--){
+              //tag
+              //tag
+              //tag
+              //tag
+              if(temp[j-1][newtemp[t]]!=temp[j][newtemp[t]]&&(temp[j][newtemp[t]] !=null && temp[j][newtemp[t]].indexOf('*&') )==-1){
+                flag=true
+                break
+              }
+            }
+            //tag
+            if(flag){
+              ss=temp[j][newtemp[i]]
+              continue
+            }
+          }
+          if(temp[j][newtemp[i]]==ss){
+            temp[j][newtemp[i]]=temp[j][newtemp[i]]+'*&'
+          }else {
+            ss=temp[j][newtemp[i]]
+          }
+        }
+      }
+      //tag
+      this.model.rows=JSON.parse(JSON.stringify(temp))
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1){
+        this.model.sums.f_plan_total = 0
+        this.model.sums.f_weijian = 0
+        this.model.sums.f_yijian = 0
+        this.model.sums.f_ruhu = 0
+        this.model.sums.f_buyu = 0
+        this.model.sums.f_jujian = 0
+      }
+    }
+  },
+  computed:{
+    exportParameter(){
+      // excel 导出条件拼接
+      return {
+        condition: this.$refs.paged.model.condition,
+        groupName: this.groupNameForSql
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+.td-0{
+  border: 1px solid #000000;
+}
+
+.td-1{
+  border: none;
+  border-top: 1px solid #000000;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+}
+
+.td-2{
+  border: none;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+}
+.td-4{
+  border: none;
+  border-top: 1px solid #000000;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+  border-bottom: 1px solid #000000;
+}
+.td-3{
+  border: none;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+  border-bottom: 1px solid #000000;
+}
+</style>

package/src/filiale/meihekou/pc/NewCheckpaper.vue

@@ -1184,6 +1184,7 @@ export default {
         operator: "success",
         audit_time: Util.getNowDate(),
         user_name: this.$login.f.name,
+        ename: this.$login.f.ename,
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }
@@ -1201,7 +1202,6 @@ export default {
       this.showModel = true;
     },
     auditFailOK() {
-
       this.loading = true;
       var reqdata = {
         message: this.message,
@@ -1209,6 +1209,7 @@ export default {
         operator: "fail",
         audit_time: Util.getNowDate(),
         user_name: this.$login.f.name,
+        ename: this.$login.f.ename,
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }

package/src/filiale/meihekou/pc/NewCheckpaperNew.vue

@@ -1228,6 +1228,7 @@ export default {
         operator: "fail",
         audit_time: Util.getNowDate(),
         user_name: this.$login.f.name,
+        ename: this.$login.f.ename,
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }

package/src/filiale/meihekou/pc/NewCheckpaperTemp.vue

@@ -581,6 +581,7 @@
           operator: "fail",
           audit_time: Util.getNowDate(),
           user_name: this.$login.f.name,
+          ename: this.$login.f.ename,
           id: this.item.id,
           f_check_item_id: this.item.f_check_item_id
         }