manage-client 3.1.8-aode → 3.1.8-ls

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -7,46 +7,53 @@
             <criteria @condition-changed='$parent.search' partial='criteria' v-ref:cri>
               <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
                 <div class="row" width="100%">
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input  style="width:60%" class="input_search" condition="h.f_meternumber = '{}'" placeholder='表号' type="text"
-                           v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
-                    >
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">组织机构</label>
-                    <res-select :initresid="$parent.$parent.orgid"
-                                style="width:60%"
-                                @res-select="$parent.$parent.getRes"
-                                restype='organization'>
-                    </res-select>
-                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户编号</label>
-                    <input  style="width:60%" class="input_search" condition="u.f_userinfo_code like '%{}%'" placeholder='客户编号' type="text"
+                    <input  style="width:60%" class="input_search" condition="f_userinfo_code like '%{}%'" placeholder='客户编号' type="text"
                            v-el:meternumber v-model="model.f_userinfo_code" v-next-el='f_userinfo_code'
                     >
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
-                    <input  style="width:60%" class="input_search" condition="u.f_user_name like '%{}%'" placeholder='客户名称' type="text"
+                    <input  style="width:60%" class="input_search" condition="f_user_name like '%{}%'" placeholder='客户名称' type="text"
                            v-el:username v-model="model.f_username" v-next-el='userid'>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                    <v-select :value.sync="model.f_residential_area"
+                              class="select_list select"
+                              v-model="model.f_residential_area"
+                              style="width: 60%"
+                              multiple
+                              condition="f_residential_area in {}"
+                              :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                              close-on-select>
 
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用气地址</label>
+                    <input  style="width:60%" class="input_search" condition="f_address like '%{}%'" placeholder='用气地址' type="text"
+                            v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
+                    >
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表&emsp;&emsp;号</label>
+                    <input  style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
+                            v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
+                    >
+                  </div>
                   <div class="col-sm-4 form-group button-range">
                     <button @click="search()" class="button_search button_spacing">查询</button>
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
+                    <export-excel :data="$parent.$parent.getCondition()"
+                                  :field="$parent.$parent.getfield"
+                                  sqlurl="rs/logic/exportfile" sql-name="webmeter_getUserGasList" template-name='用气分析'
+                                  v-ref:exports
+                                  :choose-col="true"></export-excel>
                     <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()" >显示汇总</button>
 <!--                    <button class="btn btn-success" @click="$parent.$parent.showEcharts()">显示图表</button>-->
                     <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                    <export-excel-hand :data="$parent.$parent.getCondition"
-                                  :defaultselect="$parent.$parent.selectfields"
-                                  :field="$parent.$parent.getfield"
-                                  :other-data="$parent.$parent.other"
-                                  :footer-data="$parent.$parent.footer" v-ref:exports
-                                  :sumname="$parent.$parent.sumName"
-                                  sqlurl="rs/logic/reportExportfile" sql-name="webmeter_getUserGasList" template-name='物联网用气分析查询导出'
-                                  :choose-col="true"></export-excel-hand>
                   </div>
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
@@ -62,19 +69,29 @@
                       close-on-select condition="uf.f_gasproperties2 {}">
                     </v-select>
                   </div>-->
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">用气地址</label>
-                    <input  style="width:60%" class="input_search" condition="a.f_address like '%{}%'" placeholder='用气地址' type="text"
-                           v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
-                    >
+<!--                  <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+
+                  <div class="col-sm-2">
+                    <label class="font_normal_body">公&emsp;&emsp;司</label>
+                    <right-tree @re-res="$parent.$parent.getorg"
+                                :initresid='$parent.$parent.orgid'></right-tree>
                   </div>
+<!--                  <div class="col-sm-2 form-group">-->
+<!--                    <label class="font_normal_body">组织机构</label>-->
+<!--                    <res-select :initresid="$parent.$parent.orgid"-->
+<!--                                style="width:60%"-->
+<!--                                @res-select="$parent.$parent.getRes"-->
+<!--                                restype='organization'>-->
+<!--                    </res-select>-->
+<!--                  </div>-->
+
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户类型</label>
                     <v-select :options='$parent.$parent.Gasusertype'
                               :value.sync="model.f_user_type"
                               close-on-select
                               style="width:60%"
-                              condition="uf.f_user_type = '{}'"
+                              condition="f_user_type = '{}'"
                               id="f_user_type"
                               placeholder='客户类型'
                               v-model="model.f_user_type"
@@ -86,7 +103,7 @@
                     <v-select :options='$parent.$parent.Gasproperties'
                               :value.sync="model.f_gasproperties"
                               close-on-select
-                              condition="uf.f_gasproperties = '{}'"
+                              condition="f_gasproperties = '{}'"
                               id="f_gasproperties"
                               placeholder='用气性质'
                               style="width:60%"
@@ -107,7 +124,6 @@
                     <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
                                 :show-reset-button="reset"
                                 :value.sync="model.startDate"
-                                condition="h.f_hand_date >= '{}'"
                                 id="startDate"
                                 style="width:60%"
                                 placeholder="开始时间"
@@ -120,14 +136,22 @@
                                 :show-reset-button="reset"
                                 :value.sync="model.endDate"
                                 style="width:60%"
-                                condition="h.f_hand_date <= '{}'"
                                 id="endDate"
                                 style="width:60%"
                                 placeholder="结束日期"
                                 v-model="model.endDate">
                     </datepicker>
                   </div>
-
+                  <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;用气量&nbsp;</label>
+                    <div class="row">
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
+                             condition="f_oughtamount >= {} " placeholder="">
+                      <label class="font_normal_body"> ≤ x ≤ </label>
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
+                             condition="f_oughtamount <= {} " placeholder="">
+                    </div>
+                  </div>
                   <!--<div class="col-sm-2 form-group">
                     <label class="font_normal_body">用&nbsp;气&nbsp;量&nbsp;</label>
                     <input  type="text" style="width:60%" class="input_search"
@@ -140,6 +164,41 @@
                            v-model="model.f_end_oughtamount" placeholder='结束气量'
                     >
                   </div>-->
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">壁&ensp;挂&ensp;炉</label>
+                    <v-select id="f_meter_brand"
+                              v-model="model.f_usetype"
+                              placeholder=''
+                              :value.sync="model.f_usetype"
+                              :options='$parent.$parent.usetypes'
+                              condition="f_usetype {}" :search="false"
+                              close-on-select style="width: 60%">
+                    </v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">房屋类型</label>
+                    <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"
+                              :options='$parent.$parent.houseTypes' placeholder='请选择'
+                              close-on-select
+                              condition="f_house_type = '{}'"></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">安装位置</label>
+                    <v-select :value.sync="model.f_position" v-model="model.f_position"
+                              :options='$parent.$parent.positions' placeholder='请选择'
+                              condition="f_position = '{}'"
+                              close-on-select></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                    <label class="font_normal_body">期末结余</label>
+                    <div class="row">
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_curbalance1"
+                             condition="f_curbalance >= {} " placeholder="">
+                      <label class="font_normal_body"> ≤ x ≤ </label>
+                      <input type="text" style="width:27%" class="input_search" v-model="model.f_curbalance2"
+                             condition="f_curbalance <= {} " placeholder="">
+                    </div>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -155,22 +214,34 @@
                   <th style="text-align:center">
                     <nobr>用气性质</nobr>
                   </th>
+                  <th style="text-align:center">
+                    <nobr>用户电话</nobr>
+                  </th>
                   <!--<th style="text-align:center"><nobr>用气属性</nobr></th>-->
                   <th style="text-align:center">
                     <nobr>客户名称</nobr>
                   </th>
                   <th style="text-align:center">
-                    <nobr>用气地址</nobr>
+                    <nobr>小区</nobr>
                   </th>
                   <th style="text-align:center">
-                    <nobr>气表品牌</nobr>
+                    <nobr>用气单价</nobr>
                   </th>
                   <th style="text-align:center">
-                    <nobr>起始时间~终止时间</nobr>
+                    <nobr>累购气量</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>累购金额</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>账号结余</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>气表名称</nobr>
+                  </th>
+                  <th style="text-align:center">
+                    <nobr>用气地址</nobr>
                   </th>
-<!--                  <th style="text-align:center">-->
-<!--                    <nobr>终止时间</nobr>-->
-<!--                  </th>-->
                   <th style="text-align:center">
                     <nobr>表号</nobr>
                   </th>
@@ -196,9 +267,6 @@
                   <th style="text-align:center">
                     <nobr>期末结余(元)</nobr>
                   </th>
-                  <th style="text-align:center">
-                    <nobr>组织</nobr>
-                  </th>
                 </tr>
 
 
@@ -207,22 +275,24 @@
                 <td>{{row.f_userinfo_code}}</td>
                 <td style="text-align:center">{{row.f_user_type}}</td>
                 <td style="text-align:center">{{row.f_gasproperties}}</td>
+                <td style="text-align:center">{{row.f_user_phone}}</td>
                 <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
                 <td style="text-align:center">
                   <nobr>{{row.f_user_name}}</nobr>
                 </td>
-                <td>
-                  <nobr>{{row.f_address}}</nobr>
+                <td style="text-align:center">
+                  <nobr>{{row.f_residential_area}}</nobr>
                 </td>
-                <td>
-                  <nobr>{{row.f_meter_brand}}</nobr>
+                <td style="text-align:center">
+                  <nobr>{{row.f_price}}</nobr>
                 </td>
+                <td style="text-align:center">{{row.f_total_gas}}</td>
+                <td style="text-align:center">{{row.f_total_fee}}</td>
+                <td style="text-align:center">{{row.f_balance_amount}}</td>
+                <td style="text-align:center">{{row.f_meter_brand}}</td>
                 <td>
-                  <nobr>{{row.f_hand_date}}</nobr>
+                  <nobr>{{row.f_address}}</nobr>
                 </td>
-<!--                <td>-->
-<!--                  <nobr>{{row.f_end_hand_date}}</nobr>-->
-<!--                </td>-->
                 <td>{{row.f_meternumber}}</td>
                 <td style="text-align:center">{{row.f_balance}}</td>
                 <td style="text-align:center">{{row.f_last_tablebase}}</td>
@@ -232,10 +302,32 @@
                 <td style="text-align:center">{{row.f_oughtfee}}</td>
 <!--                <td style="text-align:center">{{row.f_collection}}</td>-->
                 <td style="text-align:center">{{row.f_curbalance}}</td>
-                <td style="text-align:center">{{row.f_organization_name}}</td>
               </template>
             </data-grid>
           </criteria-paged>
+          <table class="table-hover">
+            <tr style="position: relative" class="table-bordered">
+              <td
+                style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+                汇总信息
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              总累购气量:&emsp;{{model.sums.f_total_gas}}
+            </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                总累购金额:&emsp;{{model.sums.f_total_fee}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                总账户结余:&emsp;{{model.sums.f_balance_amount}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                本期用气量合计:&emsp;{{model.sums.f_oughtamount}}
+              </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+                本期用气金额合计:&emsp;{{model.sums.f_oughtfee}}
+              </td>
+            </tr>
+          </table>
         </div>
       </div>
     </div>
@@ -245,41 +337,52 @@
                       :groupname="groupname[0]" :startdate="startDate"></user-gas-echarts>
   </div>
   <!--汇总表显示模板-->
-  <div v-show="isActiveTotalForm">
+  <div v-if="isActiveTotalForm">
     <user-gas-eform :condition="condition"></user-gas-eform>
   </div>
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import UserGasEcharts from './UserGasEcharts'
   import * as Util from '../../../Util'
   import getLodop from '../../../plugins/LodopFuncs'
   import plugins from '../../../plugins/GetLoginInfoService'
-  import exportConfig from "../../sale/config/exportConfig";
-  let readySomething = async function (self) {
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+  let readyGen = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initParams()
+    self.getaddress()
   }
+
   export default {
     title: '用气分析',
     props: ['data'],
     components: {UserGasEcharts},
     data() {
       return {
-        other:[],
-        footer:[],
-        sumName: [],
-        model: new PagedList('rs/sql/webmeter_getUserGasList', 20),
+        model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+          f_oughtamount: 0,
+          f_oughtfee: 0,
+          f_total_gas: 0,
+          f_total_fee: 0,
+          f_balance_amount: 0
+        }),
         getGroupNameByDate: [
           {label: '年份', value: 'year'},
           {label: '月份', value: 'month'},
           {label: '周', value: 'week'}
         ],
         meterbrands: [],
+        residentialArea: [],
         criteriaShow: false,
         reportStr: null,
         show: false,
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
         outlets: [],
         operator: [],
         filename: '',
@@ -289,6 +392,28 @@
         echarts: false,
         isActiveTotalForm: false,
         condition: '1=1',
+        getfield: {},
+        config: {
+          excelHeaders: {
+            'f_userinfo_code':'客户编号',
+            'f_user_type':'客户类型',
+            'f_gasproperties': '用气性质',
+            'f_user_name': '客户名称',
+            'f_user_phone':'客户电话',
+            'f_residential_area': '小区',
+            'f_price':'用气单价',
+            'f_address':'用气地址',
+            'f_meternumber': '表号',
+            'f_meter_brand':'气表品牌',
+            'f_balance':'期初余额(元)',
+            'f_last_tablebase': '上期底数',
+            'f_tablebase':'本期底数',
+            'f_oughtamount':'用气量(m³)',
+            'f_oughtfee':'用气金额(元)',
+            'f_curbalance':'期末结余(元)'
+
+          }
+        },
         groupname: ['year'],
         getgroupname: [
           {label: '年份', value: 'year'},
@@ -296,43 +421,38 @@
           {label: '周', value: 'week'},
           {label: '日', value: 'day'}
         ],
+        // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         orgid:[this.$login.f.orgid],
-        selectfields:[],
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
       }
     },
     ready() {
+        readyGen(this)
         this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
         this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-        this.$refs.paged.$refs.cri.search();
-        for(var item in exportConfig.webmeterusergasConfig){
-          this.selectfields.push(item)
-        }
-        readySomething(this);
+        this.$refs.paged.$refs.cri.search()
+        this.getfield = this.config.excelHeaders
     },
     methods: {
-      getotherfooter(){
-        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
-        otherInData.push(`导出人：${this.$login.f.name}`)
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       // 查询开关
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
+      async  getaddress(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
       SaveAsFile(str) {
         this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
@@ -354,10 +474,12 @@
         // 初始化气表品牌
         let brandArr = []
         this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
-          temp.value = item.value.f_meter_brand
-          brandArr.push(temp)
+          if (item.value.f_meter_type == '物联网表') {
+            let temp = {}
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp)
+          }
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
 
@@ -368,10 +490,11 @@
         if (this.endDate == '' || this.startDate == '') {
           return this.$showMessage("时间区间的开始和结束时间不能为空！")
         }
+        // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
         if (this.orgCondtionStr)
-          this.condition = this.$refs.paged.$refs.cri.condition + `and h.f_orgid in ${this.orgCondtionStr}`
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
-          this.condition = this.$refs.paged.$refs.cri.condition
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -400,6 +523,21 @@
       getRes(obj) {
         this.orgCondtionStr = plugins.convertToIn(obj)
       },
+      getorg(obj) {
+        this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
+      },
+      getCondition () {
+        return {
+          condition: this.condition,
+          startDate: this.startDate,
+          endDate: this.endDate
+        }
+      }
+      // getRes(condition,obj) {
+      //   this.orgCondtionStr = condition
+      //   this.orgname = obj.orgnames[0]
+      //   this.depname = obj.depnames[0]
+      // }
     },
     watch: {
       'data'(val) {
@@ -408,20 +546,14 @@
         } else {
           this.reportStr = null
         }
-      },
-      sumsmodel: {
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
       }
     },
     computed: {
-      getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition} and h.f_orgid in ` + this.orgCondtionStr}
+      houseTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
       },
-      getfield() {
-        return exportConfig.webmeterusergasConfig
+      positions() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
       },
       Gasusertype() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]

package/src/components/webmeter/DrillData/UserGasEform.vue

@@ -51,7 +51,7 @@
                       width='100%'></report-print></span>
     </div>
   </div>
-    <div id="table">
+    <div id="table" style="height:600px;overflow:scroll;">
       <table class="table table-bordered">
         <thead class="text-left">
         <tr style="text-align:center">
@@ -81,6 +81,7 @@
         </tr>
         </thead>
         <tbody>
+
         <tr v-for="item in model2">
           <td style="text-align:center" v-if="nameForSql.includes('year')">{{item.year}}</td>
           <td style="text-align:center" v-if="nameForSql.includes('month')">{{item.month}}</td>
@@ -103,6 +104,7 @@
       </table>
     </div>
   </div>
+
 </template>
 
 <script>
@@ -131,6 +133,7 @@
     data() {
       return {
         model2: null,
+
         conditionForSql: '1=1',
         nameForSql: [],
         groupNameForSql: '',
@@ -141,6 +144,7 @@
     ready() {
       this.nameForSql=['year']
       this.groupNameForSql= 'year'
+      this.conditionForSql = this.condition
       this.searchData()
     },
     methods: {
@@ -198,9 +202,6 @@
       'nameForSql'() {
         // this.nameForSql =this.groupNameByDate;
         this.getGroupName1()
-      },
-      '$parent.condition'(val) {
-        this.conditionForSql = val
       }
     }
   }