manage-client 3.2.12 → 3.2.14-aode

package/src/components/SellReport/ManageMonthGas.vue

@@ -1,95 +1,73 @@
 <template>
-  <div class="basic-main" style="height: 100%">
+  <div id='app' >
     <criteria-paged :model="model" :pager='false' v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <p class="bg-info text-center" style="padding: 8px;">月售气量汇总表</p>
-        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-2 form-group" >
-              <label class="font_normal_body" for="startDate">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+        <div novalidate class="form-inline auto " partial >
+          <p class="bg-info text-center" style="padding: 8px;">月销售气量表</p>
+          <div class="flex-row auto" style="justify-content: space-between">
+            <div class="form-group" v-if="!$parent.$parent.data.f_files_path">
+              <label for="startDate">开始日期:</label>
+              <datepicker 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" for="endDate">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+              <label for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="reset">
               </datepicker>
+              <label for="endDate" class="control-label">组织机构</label>
+              <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes"></right-tree>
+              <button class="btn btn-primary width-100" @click="search()">查询</button>
+              <!--<button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button>-->
             </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="$parent.$parent.f_state"
-                        v-model="$parent.$parent.f_state"
-                        :options='$parent.$parent.charge_state' placeholder='请选择'
-                        condition="f_state in {}"
-                        close-on-select></v-select>
-            </div>
-            <div  style = "float:right;">
-              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-              <report-excel id='gasprice'></report-excel>
+            <span></span>
+            <div class="form-group">
+              <report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%'></report-print>
+              <report-excel id='gasprice' ></report-excel>
             </div>
           </div>
-          <!--<div class="span" style = "float:right;">-->
-
-          <!--</div>-->
         </div>
       </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+      <div  partial='list' v-el:handcollect id='gasprice'>
         <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
-            <th colspan='{{$parent.spans}}' style="font-weight: bold; text-align: left;">
-              <h3 style="text-align: center">月售气量汇总表</h3>
+            <th colspan='6' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">月用气量汇总表</h3>
             </th>
           </tr>
           <tr>
-            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
+            <th colspan='6' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
-            </th>
-          </tr>
-          <tr>
-            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
-              打印时间：{{{$parent.printTime}}}
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
             </th>
           </tr>
           <tr>
-            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
-              <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-              </div>
+            <th colspan='6' style="font-weight: normal; text-align: center;">
+              组织机构：{{$parent.filialeNameStr}}
             </th>
           </tr>
           </thead>
           <tr>
-            <td  style="font-weight: normal;" id="test">
+            <td colspan='6'>
               {{{ model.data.substring(26,model.data.length-8) }}}
             </td>
           </tr>
           <tfoot>
           <tr style="text-align: left">
-            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: left;">
-              收款人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              审核人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              经手人：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            </th>
+            <th colspan='3'>财务审核：</th>
+            <th colspan='3'>收款审核：</th>
           </tr>
           </tfoot>
         </table>
-        {{{ $parent.reportStr}}}
+        {{{ $parent.reportStr }}}
       </div>
     </criteria-paged>
     <modal :show.sync="show" v-ref:modal small backdrop="false">
@@ -106,9 +84,9 @@
         <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
       </footer>
     </modal>
+
   </div>
 </template>
-
 <script>
   import { DataModel } from 'vue-client'
   import co from 'co'
@@ -122,9 +100,9 @@
       return
     }
     let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-month-gas',
       f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
+      f_outlets: this.$login.f.f_parentname})
     if (saveBack.data.status === 'succeed') {
       self.show = false
       self.filename = ''
@@ -133,66 +111,38 @@
     }
   }
   export default {
-    title: '月售气量汇总表',
+    title: '月用气量汇总表',
     props: ['data'],
     data () {
       return {
-        printTime: this.$login.toStandardTimeString(),
-        depresid: [],
-        userresid: [],
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id,
-        operatorid: [],
-        depid: [],
-        orgname: '',
-        depname: '',
-        f_state:['有效'],
-        operatorname: '',
-        orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/manage_month_sellgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
+        model: new DataModel('rs/report/manage_day_sellgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          filialeCodeStr: 'this.model.filialeCodeStr'}),
         reportStr: null,
         show: false,
-        spans: ''
+        filename: '',
+        filialeNameStr: this.$login.f.orgpathnames,
+        filialeCodeStr: this.$login.f.orgpathstr,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
       }
     },
     ready () {
-      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.$refs.paged.$refs.criteria.search()
+      if (this.data) {
+        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.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
       selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        let orgstr = this.orgCondtionStr
-        args.condition = `${args.condition} ` + orgstr
-        this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
+        this.$refs.paged.$refs.criteria.model.filialeCodeStr = this.filialeCodeStr
         this.$refs.paged.search(args)
       },
-      getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
+      getRes(obj) {
+        console.log(obj, '组织')
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
       },
-      // getdep (obj, val) {
-      //   // this.depname = val[0]
-      //   this.userresid = obj
-      //   this.f_depid = obj
-      // },
-      // getuser ( obj, val) {
-      //   this.operatorname = val[0]
-      //   this.f_operatorid = obj
-      // },
-
       // 根据文件路径获取储存的报表内容
       getFileContent (path) {
         this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -223,27 +173,9 @@
         } else {
           this.reportStr = null
         }
-      },
-      'model.data' (val) {
-        let tab = document.getElementById('test').children[0]
-        var tds = tab.getElementsByTagName('td')
-        var num = 0
-        for (let td of tds) {
-          let span = td.getAttribute('colspan')
-          num = num + ((span ? span : 1) - 0)
-        }
-        this.spans = num
       }
     },
     computed: {
-      charge_state() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      }
     }
   }
 </script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-</style>

package/src/components/SellReport/ManageNewGasPrice.vue

@@ -52,7 +52,7 @@
           </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%'></report-print>
             <report-excel id='gasprice'></report-excel>
           </div>
         </div>
@@ -71,11 +71,6 @@
               结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
             </th>
           </tr>
-          <tr>
-            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
           <tr>
             <th colspan='6' style="font-weight: normal; text-align: center;">
               <div>

package/src/components/SellReport/ManageSellType.vue

@@ -1,121 +1,74 @@
 <template>
-  <div class="basic-main" style="height: 100%">
+  <div id='app' >
     <criteria-paged :model="model" :pager='false' v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <p class="bg-info text-center" style="padding: 8px;">营业厅分项汇总表</p>
-        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-4 form-group" >
-              <label class="font_normal_body" for="startDate">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+        <div novalidate class="form-inline auto " partial >
+          <p class="bg-info text-center" style="padding: 8px;">营业分项汇总表</p>
+          <div class="flex-row auto" style="justify-content: space-between">
+            <div class="form-group" v-if="!$parent.$parent.data.f_files_path">
+              <label for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
-            </div>
-            <div class="col-sm-4 form-group" >
-              <label  class="font_normal_body" for="endDate">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+              <label for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
+              <label for="endDate" class="control-label">组织机构</label>
+              <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes"></right-tree>
+              <button class="btn btn-primary width-100" @click="search()">查询</button>
+              <!-- <button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button> -->
             </div>
-            <div class="col-sm-4 form-group" >
-              <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
-              <right-tree id="org" @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-            <div class="col-sm-4 form-group">
-              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <res-select id="dep" restype='department'
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid' >
-              </res-select>
-
-            </div>
-            <div class="col-sm-4 form-group">
-              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <res-select id="oper" restype='user'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getuser"
-                          :parentresid="$parent.$parent.userresid"
-                          :initresid='$parent.$parent.operatorid'>
-              </res-select>
-            </div>
-            <div class="col-sm-4 form-group">
-              <label class="font_normal_body">收费状态:</label>
-              <v-select :value.sync="$parent.$parent.f_state" multiple
-                        v-model="$parent.$parent.f_state"
-                        :options='$parent.$parent.charge_state' placeholder='请选择'
-                        condition="f_state in {}"
-                        close-on-select></v-select>
-            </div>
-            <div  style = "float:right;">
-              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-              <report-excel id='gasprice'></report-excel>
+            <span></span>
+            <div class="form-group">
+              <report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%'></report-print>
+              <report-excel id='gasprice' ></report-excel>
             </div>
           </div>
-          <!--<div class="span" style = "float:right;">-->
-
-          <!--</div>-->
         </div>
       </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
+      <div  partial='list' v-el:handcollect id='gasprice'>
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
-            <th :colspan='$parent.spans' style="font-weight: bold; text-align: left;">
-              <h3 style="text-align: center">营业厅分项汇总表</h3>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">营业分项汇总表</h3>
             </th>
           </tr>
           <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+            <th colspan='5' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
             </th>
           </tr>
           <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
-              </div>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              组织机构：{{$parent.filialeNameStr}}
             </th>
           </tr>
           </thead>
           <tr>
-            <td :colspan='$parent.spans' class="noborder">
+            <td colspan='5'>
               {{{ model.data.substring(26,model.data.length-8) }}}
             </td>
           </tr>
           <tfoot>
           <tr style="text-align: left">
-            <th :colspan='$parent.spans/3' style="font-weight: normal; text-align: left;">
-              收款人:
-            </th>
-            <th :colspan='$parent.spans/3' style="font-weight: normal; text-align: left;">
-              审核人:
-            </th>
-            <th :colspan='$parent.spans/3' style="font-weight: normal; text-align: left;">
-              经手人:
-            </th>
+            <th colspan='2'>财务审核：</th>
+            <th colspan='2'>收款审核：</th>
+            <th colspan='1'>收款员：</th>
           </tr>
           </tfoot>
         </table>
-        {{{ $parent.reportStr}}}
+        {{{ $parent.reportStr }}}
       </div>
     </criteria-paged>
     <modal :show.sync="show" v-ref:modal small backdrop="false">
@@ -132,9 +85,9 @@
         <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
       </footer>
     </modal>
+
   </div>
 </template>
-
 <script>
   import { DataModel } from 'vue-client'
   import co from 'co'
@@ -148,9 +101,9 @@
       return
     }
     let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-sell-type',
       f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
+      f_outlets: this.$login.f.f_parentname})
     if (saveBack.data.status === 'succeed') {
       self.show = false
       self.filename = ''
@@ -159,73 +112,38 @@
     }
   }
   export default {
-    title: '营业厅分项汇总表',
+    title: '营业分项汇总表',
     props: ['data'],
     data () {
       return {
-        printTime: this.$login.toStandardTimeString(),
-        depresid: [],
-        userresid: [],
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id,
-        operatorid: [],
-        depid: [],
-        f_state:['有效'],
-        orgname: '',
-        depname: '',
-        operatorname: '',
-        orgCondtionStr: '1=1',
         model: new DataModel('rs/report/fenxiangsell', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
+          filialeCodeStr: 'this.model.filialeCodeStr', filiale: 'this.model.filiale'}),
         reportStr: null,
         show: false,
-        spans: ''
+        filename: '',
+        filialeNameStr: this.$login.f.orgpathnames,
+        filialeCodeStr: this.$login.f.orgpathstr,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
       }
     },
     ready () {
-      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.$refs.paged.$refs.criteria.search()
+      if (this.data) {
+        this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
+        this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
+        this.$refs.paged.$refs.criteria.model.filiale = this.$login.f.f_fengongsi
+      }
+      this.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
       selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        this.orgCondtionStr='1=1'
-        if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
-        }
-        if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
-        }
-        if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
-        }
-        this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
+        this.$refs.paged.$refs.criteria.model.filialeCodeStr = this.filialeCodeStr
         this.$refs.paged.search(args)
       },
-      getRes (obj) {
-        this.orgname = obj.res[0]
-        this.depresid = obj.resids
-        this.userresid = obj.resids
-        this.f_orgid = obj.resids
-      },
-      getdep (obj, val) {
-        this.depname = val[0]
-        // this.userresid = obj
-        this.f_depid = obj
-      },
-      getuser ( obj, val) {
-        this.operatorname = val[0]
-        this.f_operatorid = obj
+      getRes(obj) {
+        console.log(obj, '组织')
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
       },
       // 根据文件路径获取储存的报表内容
       getFileContent (path) {
@@ -257,28 +175,9 @@
         } else {
           this.reportStr = null
         }
-      },
-      'model.data' (val) {
-        let len=0
-        let a=val.split('</tr>')
-        for(let i=0;i<a.length;i++){
-          if(a[i].split('</td>').length-1>len){
-            len=a[i].split('</td>').length-1
-          }
-          continue
-        }
-        this.spans = len
       }
     },
     computed: {
-      charge_state() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      }
     }
   }
 </script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-</style>

package/src/components/SellReport/ManageUserCollect.vue

@@ -29,7 +29,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='gasprice' ></report-excel>
             </div>
           </div>
@@ -49,11 +49,6 @@
               结束时间：{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
             </th>
           </tr>
-          <tr>
-            <th colspan='6' style="font-weight: normal; text-align: center;">
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
           <tr>
             <th colspan='6' style="font-weight: normal; text-align: center;">
               组织机构：{{$parent.filialeNameStr}}
@@ -119,7 +114,6 @@
           filialeCodeStr: 'this.model.filialeCodeStr', filiale: 'this.model.filiale'}),
         reportStr: null,
         show: false,
-        printTime: this.$login.toStandardTimeString(),
         filename: '',
         filialeNameStr: this.$login.f.orgpathnames,
         filialeCodeStr: this.$login.f.orgpathstr,

package/src/components/SellReport/MeterBill.vue

@@ -35,7 +35,7 @@
             </div>
             <span></span>
             <div class="form-group">
-              <report-print id='meterbill' top='1cm' left='2cm' width='100%' height='100%' :preview="true"></report-print>
+              <report-print id='meterbill' top='1cm' left='2cm' width='100%' height='100%'></report-print>
               <report-excel id='meterbill' ></report-excel>
             </div>
           </div>