safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/querycheckpaper/PaperItems.vue

@@ -46,7 +46,7 @@
     name: 'CheckPaperItems',
     props: ['row'],
     data () {
-      let model = new PagedList('rs/sql/CheckPaperSearchItem', 100, {
+      let model = new PagedList('api/af-safecheck/sql/CheckPaperSearchItem', 100, {
         f_paper_id: 'this.f_paper_id',
         f_device_type: 'this.f_device_type[0]'
       })

package/src/components/report/CheckPlanAreaList.vue

@@ -4,71 +4,64 @@
       <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="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+            <div class="col-sm-2">
               <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}">
+            <!--            <div class="col-sm-2">-->
+            <!--              <label class="font_normal_body">计划名称</label>-->
+            <!--              <input type="text" class="input_search" style="width:60%" v-model="model.f_plan_name" placeholder='计划名称'-->
+            <!--                     condition="f_plan_name like '%{}%'" v-next-el="cx" v-el:qjmc>-->
+            <!--            </div>-->
+            <div  class="col-sm-2">
               <label class="font_normal_body">计划名称</label>
-              <v-select class="select_list select"
-                        placeholder='计划名称' style="width: 60%"
-                        v-model="model.f_plan_name"
-                        :value.sync="$parent.$parent.planName"
-                        :options='$parent.$parent.planName'
-                        condition="f_plan_name like '%{}%'"
-                        :value-single="true"
-                        close-on-select clear-button></v-select>
-
+              <v-select
+                placeholder='计划名称'
+                class="select select_list"
+                style="width: 60%"
+                :value-single="true"
+                v-model='model.f_plan_name'
+                :value.sync="model.f_plan_name"
+                :options='$parent.$parent.f_plan_namex'
+                v-next-el="cx" v-el:qjmc
+                condition="f_plan_name = '{}'"
+                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_checker_name" placeholder='安检员'
-                     condition="f_checker_name like '%{}%'" v-next-el="cx" v-el:qjmc>
+            <div class="col-sm-4">
+              <role-selector
+                role-name="安检员"
+                role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                v-next-el="cx" v-el:qjmc>
+              </role-selector>
             </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>
-                <button id="btnaaa" style="float: right" class="button_search" @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false" v-el:cx>查询</button>
-              </div>
+            <div  class="col-sm-2">
+              <label class="font_normal_body">用气性质</label>
+              <v-select
+                placeholder='用气性质'
+                class="select select_list"
+                style="width: 60%"
+                :value-single="true"
+                v-model='model.f_gasproperties'
+                :value.sync="model.f_gasproperties"
+                :options='$parent.$parent.f_gaspropertieses'
+                v-next-el="cx" v-el:qjmc
+                condition="f_gasproperties = '{}'"
+                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}" 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 class="span" style="float:left;">
+              <button id="btnaaa" class="button_search" @click="$parent.$parent.getGroupName1(),search() ,$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false" v-el:cx>查询</button>
+              <button class="button_search" @click="$parent.$parent.exportexcel()" v-el:cx>导出Excel</button>
             </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 class="row">
+            <div class="col-sm-2">
+              <label class="font_normal_body">计划年份</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_plan_year" placeholder='计划年份'
+                     v-next-el="cx" v-el:qjmc>
             </div>
           </div>
           <div class="row">
@@ -86,12 +79,16 @@
               <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_year_number" value="f_year_number" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_checker_name">应检数</label>
+              <input type="checkbox" id="f_gasproperties" value="f_gasproperties" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_checker_name">用气性质</label>
             </div>
           </div>
         </div>
 
       </criteria>
-      <data-grid :model="model" partial='list'  class="list_area table_sy"  v-ref:grid>
+      <data-grid :model="model" partial='list'  class="list_area table_sy"  v-ref:grid id="planid">
         <template partial='head'>
           <tr>
             <th>
@@ -103,8 +100,16 @@
             <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_year_number')"><nobr>应检数</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_gasproperties')"><nobr>用气性质</nobr></th>
+            <th>
+              <nobr>应检户数</nobr>
+            </th>
+            <th>
+              <nobr>已检户数</nobr>
+            </th>
             <th>
-              <nobr>计划总数</nobr>
+              <nobr>未下发数</nobr>
             </th>
             <th>
               <nobr>未检</nobr>
@@ -131,19 +136,23 @@
         </template>
         <template partial='body'>
           <tr>
-            <td style="text-align:center;border-right: 1px solid ">{{$index + 1}}</td>
+            <td style="text-align:center">{{$index + 1}}</td>
             <td style="text-align:center" :class="{'td-0':row.f_plan_month==undefined,'td-1':model.rows.length!=($index+1)&&row.f_plan_month.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_plan_month.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_plan_month.indexOf('*&')!=-1,'td-4':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.length!=($index+1)&&row.f_no_checkplan.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_no_checkplan.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_no_checkplan.indexOf('*&')!=-1,'td-4':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.length!=($index+1)&&row.f_residential_area.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-4':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.length!=($index+1)&&row.f_plan_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-4':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.f_checker_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('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">{{row.f_plan_total}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_year_number')">{{row.f_year_number}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_gasproperties')">{{row.f_gasproperties}}</td>
+            <td style="text-align:center">{{row.yingjianhushu}}</td>
+            <td style="text-align:center">{{row.yijianhushu}}</td>
+            <td style="text-align:center">{{row.weixiafahushu}}</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">{{row.f_yijian}}</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_buyu}}</nobr></td>
+            <td style="text-align:center">{{row.f_jujian}}</td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
             <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
@@ -157,225 +166,246 @@
 </template>
 
 <script>
-  /**
-   *阶梯气价查询列表
-   */
-  import {PagedList} from 'vue-client'
-  import { HttpResetClass } from 'vue-client'
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        row: {},
-        f_orgid: '',
-        nameForSql: [],
-        groupNameForSql: '',
-        listflag:false,
-        nameflag:false,
-        criteriaShow: false,
-        f_check_start:'',
-        f_check_end:'',
-        planName:[{label: '全部', value: ''}],
-      }
-    },
-    props: {
+/**
+ *阶梯气价查询列表
+ */
+import {PagedList,HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+import XLSX from 'xlsx';
+
+export default {
+  data () {
+    return {
+      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
       row: {},
-      config: {},
-      ispartial: false,
-      f_filialeid: {
-        type: String
+      planAll:[],
+      f_orgid: '',
+      nameForSql: [],
+      groupNameForSql: '',
+      listflag:false,
+      f_plan_namex:[],
+      nameflag:false,
+      f_gaspropertieses: [{label:"全部",value:""},{label:"商业用气",value:"商业用气"},{label:"民用用气",value:"民用用气"},{label:"工业用气",value:"工业用气"}]
+    }
+  },
+  props: {
+    row: {},
+    config: {},
+    ispartial: false,
+    f_filialeid: {
+      type: String
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.cri.model.f_plan_year = new Date().getFullYear()
+    //写一个方法  向后台发送请求，查询当前登陆人所在分公司的所有安检计划
+    //返回计划名称数组，组装数据   [{label:'',value:''},{label:'',value:''}]
+    new HttpResetClass().load('POST', '/api/af-safecheck/sql/safe_singleTable_OrderBy', {
+      data: {
+        items: 'f_plan_name,f_checker,id,f_filialeid',
+        tablename: 't_check_plan',
+        condition: '1=1',
+        orderitem:'f_filialeid'
+      }
+    }, {resolveMsg: null, rejectMsg: null}).then((res=>{
+      this.planAll=res.data
+    }))
+    this.nameForSql = ['f_residential_area','f_user_number','f_year_number','f_gasproperties']
+    this.groupNameForSql = 'f_residential_area,f_user_number,f_year_number','f_gasproperties'
+    this.search()
+  },
+  methods: {
+    // 前台Excel导出
+    exportexcel(){
+      // 以上四行也可以直接一行搞定，如果不需要对表格数据进行修改的话
+      let workbook = XLSX.utils.table_to_book(document.getElementById('planid'))
+      try {
+        XLSX.writeFile(workbook, '安检情况汇总导出.xlsx');
+      } catch(e) {
       }
     },
-    ready () {
-      this.nameForSql = ['f_plan_month', 'f_plan_name','f_checker_name']
-      this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
-      this.pl()
-      this.search()
-
-    },
-    methods: {
-       pl() {
-        let getGasman = new HttpResetClass()
-        let plne= getGasman.load('POST', `rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "id,f_plan_name",
-            tablename: "t_check_plan",
-            condition: `f_filialeids= '${this.curorgid}'`,
-            orderitem: "id"
+    getplan(resids){
+      this.f_plan_namex=[]
+      this.planAll.forEach(plan => {
+        if (resids.indexOf(plan.f_filialeid) != -1) {
+          if (!plan.f_checker){
+            plan.f_checker='共享计划'
           }
-        }, {resolveMsg: null, rejectMsg: null})
-         console.log(this.planName)
-         for (let i = 0; i < plne.length; i++) {
-           this.planName.push({label: plne[i].f_plan_name, value: plne[i].id})
-         }
-
-        console.log(this.planName)
-      },
-      hiddenr() {
-        this.$parent.isdetail = !this.$parent.isdetail
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-       },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-        this.$dispatch('search')
+          this.f_plan_namex.push({label: plan.f_plan_name+":"+plan.f_checker, value: plan.f_plan_name})
+        }
+      })
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+      this.$dispatch('search')
 
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeid = val[0]
+    },
+    getRes(obj) {
+      this.f_orgid = this.$login.convertToIn(obj.resids);
+      this.getplan(this.f_orgid)
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeid = val[0]
+      if(this.f_orgid){
+        //this.getplan(this.f_orgid)
+      }
 
-      },
-      selfSearch (args) {
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-        if (this.f_orgid) {
-          args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
-        }
-        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'){
-          console.log("777777777")
-          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_checker_name','f_user_number']
-        var newtemp=[]
+      // for(var i=0;i<val.length;i++){
+      //   var getcurorg = val[i].f_filialeid.toString();
+      // }
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      if (this.f_orgid) {
+        args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+      }
+      this.$refs.paged.$refs.grid.$el.scrollTop = 0
+      if (this.groupNameForSql=='undefined'){
+        this.$showMessage("请至少选择一项进行汇总")
+        return
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id) {
+        args.condition += `AND (f_checker_name = '${ this.$refs.paged.$refs.cri.model.f_checker_id}' OR f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}')`
+      }
+      let f_plan_year = 0
+      if (this.$refs.paged.$refs.cri.model.f_plan_year){
+         f_plan_year = this.$refs.paged.$refs.cri.model.f_plan_year
+      }
+      this.model.paramSource = {
+        groupName : `'${this.groupNameForSql}'`,
+        f_plan_year : f_plan_year,
+      }
+      this.model.search(args.condition, args.model)
+    },
+    // 拼接groupName1
+    getGroupName1 () {
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_year_number','f_gasproperties']
+      var newtemp=[]
 
-        for (var i=0;i<temp.length;i++){
+      for (var i=0;i<temp.length;i++){
 
-          for (var j=0;j<this.nameForSql.length;j++){
-            console.log(temp[i],this.nameForSql[j],'asd')
-            if(temp[i]==this.nameForSql[j]){
-              newtemp.push(this.nameForSql[j])
-            }
+        for (var j=0;j<this.nameForSql.length;j++){
+          if(temp[i]==this.nameForSql[j]){
+            newtemp.push(this.nameForSql[j])
           }
         }
-        let str = ''
+      }
+      let str = ''
 
-        for (var i=0;i < newtemp.length - 1; i++) {
-          str += newtemp[i] + ','
-        }
-        str += newtemp[i]
-        this.groupNameForSql = str.trim()
+      for (var i=0;i < newtemp.length - 1; i++) {
+        str += newtemp[i] + ','
       }
+      str += newtemp[i]
+      this.groupNameForSql = str.trim()
+    }
+  },
+  watch: {
+    'nameForSql' () {
+      var e = document.createEvent("MouseEvents");
+      e.initEvent("click", true, true);
+      document.getElementById("btnaaa").dispatchEvent(e);
     },
-    watch: {
-      // 'nameForSql' () {
-      //
-      //   this.getGroupName1()
-      // },
-      'nameForSql' () {
-        var e = document.createEvent("MouseEvents");
-        e.initEvent("click", true, true);
-        document.getElementById("btnaaa").dispatchEvent(e);
-      },
-      'model.rows'(){
-        console.log("this.model.rows发生变化")
-        if(this.listflag){
-          return;
-        }
-        this.listflag=true
-        console.log(this.model.rows)
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
-        var newtemp=[]
-        for (var i=0;i<temp.length;i++){
-
-          for (var j=0;j<this.nameForSql.length;j++){
-            console.log(temp[i],this.nameForSql[j],'asd')
-            if(temp[i]==this.nameForSql[j]){
-              newtemp.push(this.nameForSql[j])
-            }
+    'f_orgid' (resids) {
+      //this.getplan(resids)
+    },
+    'model.rows'(){
+      if(this.listflag){
+        return;
+      }
+      this.listflag=true
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var newtemp=[]
+      for (var i=0;i<temp.length;i++){
+        for (var j=0;j<this.nameForSql.length;j++){
+          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
+      }
+      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;
         }
-        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;
-          }
-          console.log(newtemp[i])
-          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--){
-                console.log("jjjjjjjjjjj--:"+j)
-                console.log("iiiiiiiiiii---:"+i)
-                console.log("temp[j-1][newtemp[t]]:"+temp[j-1][newtemp[t]])
-                console.log("temp[j][newtemp[t]]:"+temp[j][newtemp[t]])
-                if(temp[j-1][newtemp[t]]!=temp[j][newtemp[t]]&&temp[j][newtemp[t]].indexOf('*&')==-1){
-                  flag=true
-                  break
-                }
-              }
-              console.log(j,i,flag)
-              if(flag){
-                ss=temp[j][newtemp[i]]
-                continue
+        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--){
+              if(temp[j-1][newtemp[t]]!=temp[j][newtemp[t]]&&temp[j][newtemp[t]].indexOf('*&')==-1){
+                flag=true
+                break
               }
             }
-            if(temp[j][newtemp[i]]==ss){
-              temp[j][newtemp[i]]=temp[j][newtemp[i]]+'*&'
-            }else {
+            if(flag){
               ss=temp[j][newtemp[i]]
+              continue
             }
+
           }
+
+          //  if(j>0&&(temp[j-1][newtemp[i-1]]!=temp[j][newtemp[i-1]]&&temp[j][newtemp[i-1]].indexOf('*&')==-1)){
+          //    ss=temp[j][newtemp[i]]
+          //    continue;
+          //  }
+          // if(j>0&&i>1&&(temp[j-1][newtemp[i-1]]==temp[j][newtemp[i-1]]&&temp[j][newtemp[i-1]].indexOf('*&')==-1)&&(temp[j-1][newtemp[i-1]]==temp[j][newtemp[i-1]]&&temp[j][newtemp[i-1]].indexOf('*&')==-1)){
+          //   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]]
+          }
+
         }
-        console.log(temp,'chulijieshu')
-        this.model.rows=JSON.parse(JSON.stringify(temp))
       }
+      this.model.rows=JSON.parse(JSON.stringify(temp))
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .td-0{
-    border: 1px solid #000000;
-  }
+.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-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;
-  }
+.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/components/report/CheckPlanAreaManage.vue

@@ -51,8 +51,6 @@
         this.f_userinfo_id = val.f_userinfo_id
       },
       selected (obj) {
-        console.log("obj:"+JSON.stringify(obj))
-        console.log("checkrow:"+JSON.stringify(this.checkrow))
         this.checkrow = obj.val
         this.parentData = this.checkrow.id
         this.isdetail = true