manage-client 3.2.104 → 3.2.105

package/src/filiale/qianneng/HandplanQuery.vue

@@ -8,30 +8,36 @@
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">录入日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                  <label for="startDate" class="font_normal_body">审核日期</label>
+                  <datepicker id="f_audit_date" placeholder="开始日期" style="width:60%"
+                              v-model="model.auditStartDate"
+                              :value.sync="model.auditStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
                               :show-reset-button="true"
-                              condition="f_input_date >= '{}'">
+                              condition="f_audit_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="f_audit_date" placeholder="结束日期" style="width:60%"
+                              v-model="model.auditEndDate"
+                              :value.sync="model.auditEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
                               :show-reset-button="true"
-                              condition="f_input_date <= '{}'">
+                              condition="f_audit_date <= '{}'">
                   </datepicker>
                 </div>
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -54,6 +60,9 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
+
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">下发日期</label>
                   <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
@@ -74,13 +83,6 @@
                               condition="f_hand_date <= '{}'">
                   </datepicker>
                 </div>
-
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-                </div>
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">抄表状态</label>
                   <v-select :value.sync="model.f_meter_state"
@@ -98,10 +100,46 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                  <label class="font_normal_body">是否缴费</label>
+                  <v-select :value.sync="model.f_whether_pay"
+                            v-model="model.f_whether_pay"
+                            :options='$parent.$parent.whetherPay' placeholder='请选择'
+                            condition="f_whether_pay = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">下账状态</label>
+                  <v-select :value.sync="model.f_accounts_state"
+                            :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_accounts_state"
+                            condition="f_accounts_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">录入日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_input_date >= '{}'">
+                  </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_input_date <= '{}'">
+                  </datepicker>
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body" title="旧客户编号">档案编号</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
+<!--                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">-->
+<!--                </div>-->
+
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小区名称</label>
@@ -127,27 +165,31 @@
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">审核日期</label>
-                  <datepicker id="f_audit_date" placeholder="开始日期" style="width:60%"
-                              v-model="model.auditStartDate"
-                              :value.sync="model.auditStartDate"
+                  <label class="font_normal_body">录入人员</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_input_person"
+                         condition="f_input_person like '%{}%'" placeholder='录入人员'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">收费日期</label>
+                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.sellStartDate"
+                              :value.sync="model.sellStartDate"
                               :format="'yyyy-MM-dd 00:00:00'"
                               :show-reset-button="true"
-                              condition="f_audit_date >= '{}'">
+                              condition="f_sellinggas_operate_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="f_audit_date" placeholder="结束日期" style="width:60%"
-                              v-model="model.auditEndDate"
-                              :value.sync="model.auditEndDate"
+                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.sellEndDate"
+                              :value.sync="model.sellEndDate"
                               :format="'yyyy-MM-dd 23:59:59'"
                               :show-reset-button="true"
-                              condition="f_audit_date <= '{}'">
+                              condition="f_sellinggas_operate_date <= '{}'">
                   </datepicker>
                 </div>
 
-
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -178,6 +220,18 @@
                             condition="f_price_name = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用&ensp;气&ensp;量</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_oughtamount_big" condition="f_oughtamount >= {}" placeholder='大于等于'>
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_oughtamount_small" condition="f_oughtamount <= {}" placeholder='小于等于'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&ensp;表&ensp;号&ensp;&ensp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}' " placeholder="表号">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_classify" multiple
@@ -193,43 +247,14 @@
                             condition="f_meter_brand in {}"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用&ensp;气&ensp;量</label>
-                  <input type="text" style="width:30%" class="input_search" title="大于等于"
-                         v-model="model.f_oughtamount_big" condition="f_oughtamount >= {}" placeholder='大于等于'>
-                  <input type="text" style="width:30%" class="input_search" title="小于等于"
-                         v-model="model.f_oughtamount_small" condition="f_oughtamount <= {}" placeholder='小于等于'>
-                </div>
+
                 <!--                <div class="col-sm-2 form-group">-->
                 <!--                  <label class="font_normal_body">气价名称</label>-->
                 <!--                  <v-select :value.sync="model.f_price_name" v-model="model.f_price_name" :options="$parent.$parent.prices"-->
                 <!--                            condition="f_price_name = '{}'" close-on-select></v-select>-->
                 <!--                </div>-->
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&ensp;表&ensp;号&ensp;&ensp;</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                         condition="f_meternumber = '{}' " placeholder="表号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">收费日期</label>
-                  <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.sellStartDate"
-                              :value.sync="model.sellStartDate"
-                              :format="'yyyy-MM-dd 00:00:00'"
-                              :show-reset-button="true"
-                              condition="f_sellinggas_operate_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.sellEndDate"
-                              :value.sync="model.sellEndDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true"
-                              condition="f_sellinggas_operate_date <= '{}'">
-                  </datepicker>
-                </div>
+
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
@@ -259,54 +284,37 @@
                             close-on-select
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                <label class="font_normal_body">录入人员</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_input_person"
-                       condition="f_input_person like '%{}%'" placeholder='录入人员'>
-              </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">是否缴费</label>
-                  <v-select :value.sync="model.f_whether_pay"
-                            v-model="model.f_whether_pay"
-                            :options='$parent.$parent.whetherPay' placeholder='请选择'
-                            condition="f_whether_pay = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group" >
-                  <label for="belongmonth" class="font_normal_body" >所属年月</label>
-                  <datepicker placeholder="所属年月" style="width:60%"
-                              v-model="model.belongmonth"
-                              :value.sync="model.belongmonth"
-                              :format="'yyyy-MM'"
-                              :show-reset-button="true"
-                              condition="belongmonth = '{}'"
-                              :select-month="true">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">银行名称</label>
-                  <v-select :value.sync="model.f_bank_name" v-model="model.f_bank_name"
-                            :options='$parent.$parent.banklist' placeholder='银行名称'
-                            style="width:60%"
-                            close-on-select
-                            condition="f_bank_name = '{}'"></v-select>
-                </div>
 
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">下账状态</label>
-                  <v-select :value.sync="model.f_accounts_state"
-                            :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_accounts_state"
-                            condition="f_accounts_state = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
-                  <v-select :value.sync="model.f_bgl"
-                            v-model="model.f_bgl"
-                            :options='$parent.$parent.bgl' placeholder='请选择'
-                            condition="f_bgl = '{}'"
-                            close-on-select></v-select>
-                </div>
+
+<!--                <div class="col-sm-2 form-group" >-->
+<!--                  <label for="belongmonth" class="font_normal_body" >所属年月</label>-->
+<!--                  <datepicker placeholder="所属年月" style="width:60%"-->
+<!--                              v-model="model.belongmonth"-->
+<!--                              :value.sync="model.belongmonth"-->
+<!--                              :format="'yyyy-MM'"-->
+<!--                              :show-reset-button="true"-->
+<!--                              condition="belongmonth = '{}'"-->
+<!--                              :select-month="true">-->
+<!--                  </datepicker>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">银行名称</label>-->
+<!--                  <v-select :value.sync="model.f_bank_name" v-model="model.f_bank_name"-->
+<!--                            :options='$parent.$parent.banklist' placeholder='银行名称'-->
+<!--                            style="width:60%"-->
+<!--                            close-on-select-->
+<!--                            condition="f_bank_name = '{}'"></v-select>-->
+<!--                </div>-->
+
+
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>-->
+<!--                  <v-select :value.sync="model.f_bgl"-->
+<!--                            v-model="model.f_bgl"-->
+<!--                            :options='$parent.$parent.bgl' placeholder='请选择'-->
+<!--                            condition="f_bgl = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
               </div>
             </div>
           </criteria>
@@ -743,10 +751,12 @@
     self.initmeterbook();
    // await self.$LoadParams.loadMeterBook(self.f_filialeid)
    // self.loadMeterBooks()
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
+   //  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+   //  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    // self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
+    // self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.auditStartDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.auditEndDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
 
     // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
@@ -1051,8 +1061,11 @@
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
-        if (this.$refs.paged.$refs.cri.model.handStartDate === ''|| this.$refs.paged.$refs.cri.model.handEndDate === '') {
-          this.$showMessage('请选择下发开始时间和下发结束时间!')
+
+        if (!((this.$refs.paged.$refs.cri.model.startDate != ''&& this.$refs.paged.$refs.cri.model.endDate != '')
+        ||(this.$refs.paged.$refs.cri.model.handStartDate != ''&& this.$refs.paged.$refs.cri.model.handEndDate != '')
+          || (this.$refs.paged.$refs.cri.model.auditStartDate != ''&& this.$refs.paged.$refs.cri.model.auditEndDate != ''))) {
+          this.$showMessage('请选择【下发、抄表或审核】其中之一开始时间和结束时间!')
           return
         }
         this.area =  this.$refs.paged.$refs.cri.model.f_residential_area

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -62,6 +62,16 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">型&emsp;&emsp;号</label>
+                  <v-select v-model="model.f_typenumber"
+                            placeholder='请选择'
+                            condition="f_typenumber = '{}'"
+                            :value.sync="model.f_typenumber"
+                            :options='$parent.$parent.typenumberList'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="其他收费收费类型查询">收费类型</label>
                   <v-select v-model="model.f_brand_spec"
@@ -83,26 +93,6 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">型&emsp;&emsp;号</label>
-                  <v-select v-model="model.f_typenumber"
-                            placeholder='请选择'
-                            condition="f_typenumber = '{}'"
-                            :value.sync="model.f_typenumber"
-                            :options='$parent.$parent.typenumberList'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                         condition="f_meternumber = '{}'" placeholder='表号'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
-                         condition="f_card_id = '{}'" placeholder='卡号'>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户类型</label>
                   <v-select id="f_user_type"
@@ -124,6 +114,17 @@
                             :options='$parent.$parent.gasproperties'
                             close-on-select clear-button></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
+
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收费状态</label>
                   <v-select id="f_state"
@@ -149,17 +150,6 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">服务人员</label>
-                  <v-select id="f_service_person"
-                            v-model="model.f_service_person"
-                            placeholder='请选择'
-                            condition="f_service_person ='{}'"
-                            :value.sync="model.f_service_person"
-                            :options='$parent.$parent.service_person'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_classify" multiple
@@ -175,6 +165,18 @@
                             condition="f_meter_brand in {}"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">服务人员</label>
+                  <v-select id="f_service_person"
+                            v-model="model.f_service_person"
+                            placeholder='请选择'
+                            condition="f_service_person ='{}'"
+                            :value.sync="model.f_service_person"
+                            :options='$parent.$parent.service_person'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+
               </div>
             </div>
           </criteria>

package/src/filiale/qianneng/SellDepReport.vue

@@ -47,8 +47,8 @@
                             <!--:model="$parent.$parent.data"-->
                             <!--:fee-str="$parent.model.data"-->
                             <!--:end-date="model.endDate" ></tie-an-account>-->
-            <report-print id='gasprice' top='1cm' left='0' width='100%' height='100%' :preview="true"
-            :style="styledata"
+            <report-print id='gasprice' top='1cm' left='0' width='100%' height='100%'
+                          :style="$parent.$parent.styledata"  :preview="true"
             ></report-print>
             <report-excel id='gasprice'></report-excel>
           </div>
@@ -146,14 +146,33 @@
         f_depid: this.$login.f.depids,
         f_operatorid: this.$login.f.id,
         operatorid: [],
-        styledata: '',
+        styledata: 'td {border-width: 1px;padding: 0.3px;border-style: solid; border-color:#000000;font-size: 0.9em;}  \n' +
+          'table{border-collapse:collapse; border}\n' +
+          '.noborder{border-width: 0px;}\n' +
+          '.tdleft{text-align: left;}\n' +
+          '.tdright{text-align: right;}  \n' +
+          '.tdcenter{text-align: center;}\n' +
+          '.fs10{font-size: 0.4em;}\n' +
+          '.fs11{font-size: 0.5em;}\n' +
+          '.fs12{font-size: 0.6em;}\n' +
+          '.fs13{font-size: 0.7em;}\n' +
+          '.fs15{font-size: 0.9em;}\n' +
+          '.fs17{font-size: 1.1em;}\n' +
+          '.fs19{font-size: 1.2em;}\n' +
+          '.fs24{font-size: 1.5em;}\n' +
+          '.fs26{font-size: 1.6em;}\n' +
+          '.b{font-weight: bold;}\n' +
+          '.td-border-right{BORDER-RIGHT: #000000 1px solid; }\n' +
+          '.td-border-top{BORDER-TOP: #000000 1px solid; }\n' +
+          '.td-border-left{BORDER-LEFT: #000000 1px solid;}\n' +
+          '.td-border-bottom{BORDER-BOTTOM: #000000 1px solid;}',
         depid: [],
         org: {
-          f_orgname:'',
+          f_orgname: '',
           f_depname: '',
           f_operator: ''
         },
-        tablen:0,
+        tablen: 0,
         noshow: false,
         datas: '',
         orgname: '',
@@ -163,7 +182,7 @@
         model: new DataModel('rs/report/sellDepReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
-        resshow:['company','department','operator'],
+        resshow: ['company', 'department', 'operator'],
         show: false,
         spans: 0,
         initres: {
@@ -177,7 +196,7 @@
       this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
       this.styledata =
-         'td {border-width: 1px;padding: 0.3px;border-style: solid; border-color:#000000;font-size: 0.375em;}  \n' +
+         'td {border-width: 1px;padding: 0.3px;border-style: solid; border-color:#000000;font-size: 0.9em;}  \n' +
           'table{border-collapse:collapse; border}\n' +
           '.noborder{border-width: 0px;}\n' +
           '.tdleft{text-align: left;}\n' +
@@ -198,6 +217,7 @@
           '.td-border-left{BORDER-LEFT: #000000 1px solid;}\n' +
           '.td-border-bottom{BORDER-BOTTOM: #000000 1px solid;}'
       console.log(this.$login.f)
+      console.log('styledata', this.styledata)
     },
     methods: {
       searchData () {