manage-client 3.3.210 → 3.3.211-by

package/src/components/sale/common/PrintTableManage.vue

@@ -0,0 +1,242 @@
+<template>
+  <button  class="btn btn-default" @click='PrintAsFile()' :id="'vc-printtable-'+attach">打印表格</button>
+</template>
+
+<script>
+  import co from 'co'
+  import getLodop from '../../../plugins/LodopFuncs'
+
+  let printGen = function * (self, pageNo) {
+
+    console.log('开始打印', self.isSelected, self.model, self.tfoot)
+    //是否分页打印
+    if(pageNo){
+      self.PrintSinglePage()
+      return
+    }
+    if (self.isSelected) {
+      // 判断是否选择行数据进行打印
+      self.PrintSelectedPage()
+      return
+    }
+
+    let lodop = getLodop()
+    lodop.PRINT_INIT(self.printName+'打印')
+    var style
+    if (!self.style) {
+      style = `<style>table{font-size:${self.fontSize}px;border-width: 2px;border-collapse: collapse;border:solid 2px ; border-color:black;}` +
+        'table th {border-width: 1px;padding: 2px;border-style: solid;}table td {border-width: 1px;padding: 2px;border-style: solid;}</style>'
+    } else {
+      style = self.style
+    }
+    let tHtml = style + '<table class="table table-hover"><thead>' + self.thead + '</thead><tbody>'
+
+    for (var i = 1; i <= self.model.totalPage; i++) {
+      console.log('pageIndex = ' + i)
+      yield self.model.loadPage(i)
+      for (let row of self.model.rows) {
+        tHtml += '<tr>'
+        for (let field of self.fields) {
+          if (field && (row[field] || row[field] === 0) ) {
+            tHtml += '<td>' + row[field] + '</td>'
+          } else {
+            tHtml += '<td></td>'
+          }
+          // console.log(row[field])
+        }
+        tHtml += '</tr>'
+      }
+    }
+    // 加入合计数据 (最后一页显示)
+    if (self.sumhtml) {
+      tHtml += self.sumhtml
+    }
+    // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
+    if (self.tfoot) {
+      self.tfoot += `<tr><td width="100%" colspan=${self.fields.length} style="text-align: center;border-width: 0;">第<font tdata="PageNO" format="#" color="blue">#</font>页</span>/共<font tdata="PageCount" format="#" color="blue">##</font></span>页</td></tr>`
+      tHtml += `</tbody><tfoot>${self.tfoot}</tfoot></table>`
+    } else {
+      tHtml += '</tbody></table>'
+    }
+
+    lodop.ADD_PRINT_TABLE(self.top, self.left, 'RightMargin:' + self.right, 'BottomMargin:' + self.bottom, tHtml)
+    lodop.SET_PRINT_STYLEA(0, 'HOrient', 3)
+    lodop.SET_PRINT_STYLEA(0, 'VOrient', 3)
+    // 指定打印方向 0--可通过打印机选择纵向或横向，1--锁定为纵向打印，2---锁定为横向打印
+    LODOP.SET_PRINT_PAGESIZE(self.xyprint, 0, 0, "A4");
+
+    if(self.printview==null){
+      // 打印维护
+      lodop.PRINT_SETUP()
+    }else if(self.printview){
+      // 使用打印预览是为了方便调整打印格式。例如：横向打印
+      lodop.PREVIEW()
+    }else if(!self.printview){
+      // 直接打印
+      lodop.PRINT()
+    }
+
+  }
+
+  export default {
+    // props: ['model', 'thead', 'fields', 'top', 'left', 'right', 'bottom', 'tfoot'],
+    props: {
+      model: Object,
+      thead: String,
+      tfoot: String,
+      sumhtml: String,
+      fields: Array,
+      //null 打印维护， true 打印预览 false 直接打印
+      printview:{},
+      // 指定打印方向 0--可通过打印机选择纵向或横向，1--锁定为纵向打印，2---锁定为横向打印
+      xyprint:{
+        default : 0
+      },
+      top: {},
+      left: {},
+      right: {},
+      bottom: {},
+      attach: {
+        type: String,
+        default: 'name'
+      },
+      style: {
+        type: String
+      },
+      isSelected: {
+        type:Boolean,
+        default:false
+      },
+      //是否分页打印
+      printpage:{
+        type:Boolean,
+        default:false
+      },
+      // 打印名称,在同一个名称下的打印可以统一风格(打印维护界面点击应用即可)
+      printName: {
+        type: String
+      }
+    },
+    data(){
+      return{
+        //打印任务的JOB代码,用于获得打印状态信息及最终结果。
+        P_ID:"",
+        //第几次任务
+        loop:0,
+        fontSize: this.$appdata.getSingleValue('打印字体大小') ? this.$appdata.getSingleValue('打印字体大小') : 15
+      }
+    },
+    methods: {
+      PrintAsFile () {
+        console.log(this.model)
+        let gen = printGen(this,this.printpage)
+        co(gen)
+      },
+      async PrintSinglePage(){
+        let lodop = getLodop()
+        lodop.PRINT_INIT('打印表格'+(this.loop+1))
+        var style
+        if (!this.style) {
+          style = `<style>table{font-size:${this.fontSize}px;border-width: 2px;border-collapse: collapse;border:solid 2px ; border-color:black;}` +
+            'table th {border-width: 1px;padding: 2px;border-style: solid;}table td {border-width: 1px;padding: 2px;border-style: solid;}</style>'
+        } else {
+          style = this.style
+        }
+        let tHtml = style + '<table class="table table-hover"><thead>' + this.thead + '</thead><tbody>'
+
+        //所有数据全部打印,打印任务结束
+        if(this.loop+1>this.model.totalPage){
+          this.printinit()
+          console.log('打印结束')
+          return
+        }
+        console.log('获取数据pageIndex = ' + (this.loop+1))
+        await this.model.loadPage(this.loop+1)
+        for (let row of this.model.rows) {
+          tHtml += '<tr>'
+          for (let field of this.fields) {
+            if (field && (row[field] || row[field] === 0) ) {
+              tHtml += '<td>' + row[field] + '</td>'
+            } else {
+              tHtml += '<td></td>'
+            }
+          }
+          tHtml += '</tr>'
+        }
+        //插入页码
+        let page = `<tr><th width="100%" colspan=${this.fields.length} style="border-width: 0;">当前是第<font format="ChineseNum" color="blue">${this.loop+1}</font>页/共<font format="ChineseNum" color="blue">${this.model.totalPage}</font>页`
+        // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
+        if (this.tfoot) {
+          tHtml += `</tbody><tfoot>${this.tfoot}${page}</tfoot></table>`
+        } else {
+          tHtml += '</tbody></table>'
+        }
+
+        lodop.ADD_PRINT_TABLE(this.left, this.top, 'RightMargin:' + this.right, 'BottomMargin:' + this.bottom, tHtml)
+        lodop.SET_PRINT_STYLEA(0, 'HOrient', 3)
+        lodop.SET_PRINT_STYLEA(0, 'VOrient', 3)
+        //设置打印机为默认打印机
+        lodop.SET_PRINTER_INDEX(-1)
+
+        this.P_ID=lodop.PRINT()
+        if(this.P_ID){
+          this.loop+=1
+          console.log("正打印第"+this.loop+"个任务(JOB代码"+this.P_ID)
+        }
+        //延迟循环缓解压力
+        await this.timeout(1500)
+        this.PrintSinglePage()
+      },
+
+      async PrintSelectedPage () {
+        console.log('选择列打印开始', this.model)
+
+        if (this.model.rows.length > 100) {
+          this.$showAlert('您选择的数据过大，请选择少于100条数据进行打印', 'warning', 3000)
+          return
+        }
+
+        let lodop = getLodop()
+        lodop.PRINT_INIT('打印表格'+(this.loop+1))
+        var style
+        if (!this.style) {
+          style = `<style>table{font-size:${this.fontSize}px;border-width: 2px;border-collapse: collapse;border:solid 2px ; border-color:black;}` +
+            'table th {border-width: 1px;padding: 2px;border-style: solid;}table td {border-width: 1px;padding: 2px;border-style: solid;}</style>'
+        } else {
+          style = this.style
+        }
+        let tHtml = style + '<table class="table table-hover"><thead>' + this.thead + '</thead><tbody>'
+        for (let row of this.model.rows) {
+          tHtml += '<tr>'
+          for (let field of this.fields) {
+            tHtml += '<td style="text-align: center;">' + row[field] + '</td>'
+          }
+          tHtml += '</tr>'
+        }
+        // // 如果有表尾，则添加表尾，如果内容翻页的话，表尾每一页都要打印
+        if (this.tfoot) {
+          tHtml += `</tbody><tfoot>${this.tfoot}</tfoot></table>`
+        } else {
+          tHtml += '</tbody></table>'
+        }
+        console.log('选择列打印的html', tHtml)
+        lodop.ADD_PRINT_TABLE(this.left, this.top, 'RightMargin:' + this.right, 'BottomMargin:' + this.bottom, tHtml)
+        lodop.SET_PRINT_STYLEA(0, 'HOrient', 3)
+        lodop.SET_PRINT_STYLEA(0, 'VOrient', 3)
+        //设置打印机为默认打印机
+        lodop.SET_PRINTER_INDEX(-1)
+        console.log('开始调用打印。。')
+        this.P_ID=lodop.PRINT()
+      },
+      printinit(){
+        this.P_ID="",
+          this.loop=0
+      },
+      async timeout(ms){
+        return new Promise((resolve, reject) => {
+          setTimeout(resolve, ms)
+        })
+      }
+    }
+  }
+</script>

package/src/components/sale/config/exportConfig.js

@@ -901,7 +901,6 @@ export default {
     'f_last_tablebase': '上期底数',
     'f_tablebase': '本期底数',
     'f_oughtamount': '用气量',
-    'overdue': '违约金',
     'f_oughtfee': '用气金额',
     'f_debt_money': '已交金额',
     'f_actual_arrears': '欠费金额',

package/src/components/sale/config/tableConfig.js

@@ -51,7 +51,8 @@ export default {
     '补偿状态': 'f_compensatestate',
     '气表品牌': 'f_meter_brand',
     '气表型号': 'f_meter_style',
-    '分公司': 'f_orgname'
+    '分公司': 'f_orgname',
+    '部门': 'f_depname'
 
   }
 

package/src/components/sale/filesquery/FireQuery.vue

@@ -97,7 +97,26 @@
                                  condition="f_deliver_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
-
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="操作日期大于">操作日期</label>
+                    <datepicker  placeholder="操作日期大于" style="width:60%"
+                                 v-model="model.f_operate_start_date"
+                                 :value.sync="model.f_operate_start_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_operate_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="操作日期小于">操作日期</label>
+                    <datepicker  placeholder="操作日期小于" style="width:60%"
+                                 v-model="model.f_operate_end_date"
+                                 :value.sync="model.f_operate_end_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_operate_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" >抄表员&emsp;</label>
                     <v-select :value.sync="model.f_inputtor"

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

@@ -128,6 +128,26 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" title="开户时间大于">开户时间</label>
+              <datepicker  placeholder="开户时间大于" style="width:60%"
+                           v-model="model.f_open_start_date"
+                           :value.sync="model.f_open_start_date"
+                           :format="'yyyy-MM-dd'"
+                           :show-reset-button="true"
+                           condition="f_open_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" title="开户时间小于">开户时间</label>
+              <datepicker  placeholder="开户时间小于" style="width:60%"
+                           v-model="model.f_open_end_date"
+                           :value.sync="model.f_open_end_date"
+                           :format="'yyyy-MM-dd'"
+                           :show-reset-button="true"
+                           condition="f_open_date <= '{} 23:59:59'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -140,6 +160,9 @@
             <th style="text-align:center">
               <nobr>未上报日期</nobr>
             </th>
+            <th style="text-align:center">
+              <nobr>开户时间</nobr>
+            </th>
             <th style="text-align:center">
               <nobr>客户编号</nobr>
             </th>
@@ -178,6 +201,7 @@
         <template partial='body'>
           <td style="text-align:center">{{$index+1}}</td>
           <td style="text-align:center">{{row.f_date}}</td>
+          <td style="text-align:center">{{row.f_open_date}}</td>
           <td style="text-align: center;"><nobr>
             <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
@@ -233,7 +257,7 @@
           endDate: 'this.model.endDate'
         }),
         getfield:{
-          'f_userinfo_code':'客户编号','f_user_name':'客户名称', 'f_date': '未上报日期',
+          'f_userinfo_code':'客户编号','f_user_name':'客户名称', 'f_date': '未上报日期', 'f_open_date': '开户时间',
           'f_address':'客户地址','f_user_type':'客户类型','f_gasproperties':'用气性质',
           'f_meternumber':'表号',
           'f_meter_brand':'气表厂家','f_orgname':'组织机构'},

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -6,7 +6,7 @@
                     <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
                         <div class="row">
                             <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">客户编号</label>
+                                <label  class="font_normal_body">客户编号</label>
                                 <input style="width:60%" type="text" class="input_search"
                                        v-model="model.f_userinfo_code"
                                        placeholder='客户编号'
@@ -16,7 +16,7 @@
                                        v-el:username>
                             </div>
                             <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">客户名称</label>
+                                <label  class="font_normal_body">客户名称</label>
                                 <input style="width:60%" type="text" class="input_search"
                                        v-model="model.username"
                                        @keyup.enter="search"
@@ -26,7 +26,7 @@
                                        v-el:username>
                             </div>
                             <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">客户地址</label>
+                                <label  class="font_normal_body">客户地址</label>
                                 <input style="width:60%" type="text" class="input_search"
                                        v-model="model.address" placeholder='地址'
                                        condition="address like '%{}%'"
@@ -35,7 +35,7 @@
                                 >
                             </div>
                             <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                                <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
                                 <input style="width:60%" type="text" class="input_search"
                                        v-model="model.f_meternumber" placeholder='表号'
                                        @keyup.enter="search"
@@ -57,103 +57,68 @@
                         </div>
                         <div class="row" v-show="$parent.$parent.criteriaShow">
                             <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+                                <label  class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
                                 <right-tree @re-res="$parent.$parent.getorg"
                                             :initresid='$parent.$parent.org'></right-tree>
                             </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">余额&nbsp;&nbsp;大于</label>
-                                <input style="width:60%" type="number" class="input_search"
-                                       v-model="model.f_balance_amount_sta" placeholder='账户余额'
-                                       condition="f_balance_amount>{}"
-                                       @keyup.enter="search"
-                                       v-el:xq v-next-el='f_day' v-el:area
-                                >
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">小于</label>
-                                <input style="width:60%" type="number" class="input_search"
-                                       v-model="model.f_balance_amount_end" placeholder='账户余额'
-                                       condition="f_balance_amount < {}"
-                                       @keyup.enter="search"
-                                       v-el:xq v-next-el='f_day' v-el:area
-                                >
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">气表品牌</label>
-                                <v-select :value.sync="model.f_meter_brand"
-                                          v-model="model.f_meter_brand"
-                                          :options='$parent.$parent.meterbrands' placeholder='请选择'
-                                          condition="f_meter_brand = '{}'"
-                                          close-on-select></v-select>
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">上报区间</label>
-                                <datepicker style="width:60%" id="startdate" placeholder="开始时间"
-                                            v-model="model.startDate"
-                                            :value.sync="model.startDate"
-                                            :disabled-days-of-Week="[]"
-                                            :format="'yyyy-MM-dd HH:mm:ss'"
-                                            :show-reset-button="reset">
-                                </datepicker>
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
-                                <datepicker style="width:60%" id="enddate" placeholder="结束日期"
-                                            v-model="model.endDate"
-                                            :value.sync="model.endDate"
-                                            :format="'yyyy-MM-dd HH:mm:ss'"
-                                            :disabled-days-of-Week="[]"
-                                            :show-reset-button="reset">
-                                </datepicker>
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">未抄表天数&nbsp;></label>
-                                <input style="width:60%" type="number" class="input_search"
-                                       v-model="model.f_day" placeholder='未抄表天数'
-                                       condition="DateDiff(dd,f_hand_date,getdate())>{}"
-                                       @keyup.enter="search"
-                                       v-el:xq v-next-el='f_day' v-el:area
-                                >
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">电池电量大于</label>
-                                <input style="width:60%" type="number" class="input_search"
-                                       v-model="model.f_electricity_sta" placeholder='电池电量'
-                                       condition="f_electricity>{}"
-                                       @keyup.enter="search"
-                                       v-el:xq v-next-el='f_day' v-el:area
-                                >
-                            </div>
-                            <div class="col-sm-2 form-group">
-                                <label style="width:35%" class="font_normal_body">小于</label>
-                                <input style="width:60%" type="number" class="input_search"
-                                       v-model="model.f_electricity_end" placeholder='电池电量'
-                                       condition="f_electricity < {}"
-                                       @keyup.enter="search"
-                                       v-el:xq v-next-el='f_day' v-el:area
-                                >
-                            </div>
                           <div class="col-sm-2 form-group">
-                            <label style="width:35%" class="font_normal_body">电池电压大于</label>
-                            <input style="width:60%" type="number" class="input_search"
-                                   v-model="model.f_batterylevel_sta" placeholder='电池电压'
-                                   condition="f_batterylevel>{}"
-                                   @keyup.enter="search"
-                                   v-el:xq v-next-el='f_day' v-el:area
-                            >
+                            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;余额&nbsp;&nbsp;&nbsp;</label>
+                            <input type="number" style="width:30%" class="input_search" title="大于等于" v-model="model.f_balance_amount_small"
+                                   condition="f_balance_amount >= '{}' " placeholder="大于等于">
+                            <input type="number" style="width:30%" class="input_search" title="小于等于" v-model="model.f_balance_amount_big"
+                                   condition="f_balance_amount <= '{}' " placeholder="小于等于">
+                          </div>
+                          <div class="col-sm-2 form-group">
+                            <label  class="font_normal_body">气表品牌</label>
+                            <v-select :value.sync="model.f_meter_brand"
+                                      v-model="model.f_meter_brand"
+                                      :options='$parent.$parent.meterbrands' placeholder='请选择'
+                                      condition="f_meter_brand = '{}'"
+                                      close-on-select></v-select>
+                          </div>
+                          <div class="col-sm-2 form-group">
+                            <label  class="font_normal_body">上报区间</label>
+                            <datepicker style="width:60%" id="startdate" placeholder="开始时间"
+                                        v-model="model.startDate"
+                                        :value.sync="model.startDate"
+                                        :disabled-days-of-Week="[]"
+                                        :format="'yyyy-MM-dd HH:mm:ss'"
+                                        :show-reset-button="reset">
+                            </datepicker>
+                          </div>
+                          <div class="col-sm-2 form-group">
+                            <label  class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
+                            <datepicker style="width:60%" id="enddate" placeholder="结束日期"
+                                        v-model="model.endDate"
+                                        :value.sync="model.endDate"
+                                        :format="'yyyy-MM-dd HH:mm:ss'"
+                                        :disabled-days-of-Week="[]"
+                                        :show-reset-button="reset">
+                            </datepicker>
+                          </div>
+                          <div class="col-sm-2 form-group">
+                            <label  class="font_normal_body">未抄表天数</label>
+                            <input type="number" style="width:30%" class="input_search" title="大于等于" v-model="model.f_day_small"
+                                   condition="DateDiff(dd,f_hand_date,getdate()) >= {} " placeholder="大于等于">
+                            <input type="number" style="width:30%" class="input_search" title="小于等于" v-model="model.f_day_big"
+                                   condition="DateDiff(dd,f_hand_date,getdate()) <= {} " placeholder="小于等于">
+                          </div>
+                          <div class="col-sm-2 form-group">
+                            <label class="font_normal_body">电池电量</label>
+                            <input type="number" style="width:30%" class="input_search" title="大于等于" v-model="model.f_electricity_small"
+                                   condition="f_electricity >= '{}' " placeholder="大于等于">
+                            <input type="number" style="width:30%" class="input_search" title="小于等于" v-model="model.f_electricity_big"
+                                   condition="f_electricity <= '{}' " placeholder="小于等于">
                           </div>
                           <div class="col-sm-2 form-group">
-                            <label style="width:35%" class="font_normal_body">小于</label>
-                            <input style="width:60%" type="number" class="input_search"
-                                   v-model="model.f_batterylevel_end" placeholder='电池电压'
-                                   condition="f_batterylevel < {}"
-                                   @keyup.enter="search"
-                                   v-el:xq v-next-el='f_day' v-el:area
-                            >
+                            <label class="font_normal_body">电池电压</label>
+                            <input type="number" style="width:30%" class="input_search" title="大于等于" v-model="model.f_batterylevel_small"
+                                   condition="f_batterylevel >= '{}' " placeholder="大于等于">
+                            <input type="number" style="width:30%" class="input_search" title="小于等于" v-model="model.f_batterylevel_big"
+                                   condition="f_batterylevel <= '{}' " placeholder="小于等于">
                           </div>
                           <div class="col-sm-2 form-group">
-                            <label style="width:35%" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;异常级别</label>
+                            <label class="font_normal_body">异常级别</label>
                             <v-select style="width:60%"
                                       v-model="model.f_error_level"
                                       placeholder='异常级别'
@@ -165,7 +130,7 @@
                             </v-select>
                           </div>
                           <div class="col-sm-2 form-group">
-                            <label style="width:35%" class="font_normal_body">异常类型</label>
+                            <label  class="font_normal_body">异常类型</label>
                             <v-select style="width:60%"
                                       v-model="model.f_error_type"
                                       placeholder='异常类型'

package/src/components/webmeter/report/ReportList.vue

@@ -16,8 +16,8 @@
                   </res-select>
                 </div>
                 <div class="col-sm-2">
-                  <label class="font_normal_body">表&nbsp;钢&nbsp;号&nbsp;</label>
-                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表钢号'
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
                          condition="m.f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
                   >
                 </div>

package/src/filiale/bayan/config/DefaultPrint.js

@@ -0,0 +1,6 @@
+export default {
+  // 把打印需要默认选中的字段名放在config数组中
+  config: [
+    'f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_pregas', 'f_preamount', 'f_collection', 'f_balance', 'f_curbalance', 'f_idnumber'
+  ]
+}