manage-client 3.1.33 → 3.1.37

package/build/dev-server.js

@@ -13,11 +13,11 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090/', fuwu_login = 'http://192.168.50.4:8400'
+var bendi = 'http://127.0.0.1:8090/', fuwu_login = 'http://192.168.17.52:8600'
 var fuwu = 'http://119.146.1.106:8300'
 var weinan = 'http://172.168.1.11:9001'
 var system = 'http://192.168.50.4:8400'
-//192.168.
+//192.168.webmeter_getUserGasList
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.33",
+  "version": "3.1.37",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/BusinessClassify.vue

@@ -49,6 +49,12 @@
                           :initresid='$parent.$parent.operatorid'>
               </res-select>
             </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body" for="oper1">格式一</label>
+              <input type="radio" name="reportStyle" id="oper1" v-model="$parent.$parent.reportStyle" value="1">
+              <label class="font_normal_body" for="oper2">格式二</label>
+              <input type="radio" name="reportStyle" id="oper2"  v-model="$parent.$parent.reportStyle" value="2">
+            </div>
           </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
@@ -58,7 +64,7 @@
         </div>
       </criteria>
       <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+        <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
             <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
@@ -151,6 +157,7 @@
         operatorid: [],
         depid: [],
         tablen:0,
+        reportStyle: 1,
         orgname: '',
         depname: '',
         operatorname: '',
@@ -171,6 +178,12 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
+        if (this.reportStyle == '1') {
+          this.model.url = 'rs/report/BusinessClassify'
+        } else {
+          this.model.url = 'rs/report/BusinessClassifyTwo'
+        }
+        console.log('---------------->', this.reportStyle)
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
         if (this.f_depid[0]) {
@@ -237,6 +250,9 @@
           }
         }
         this.tablen=len
+      },
+      'reportStyle'(val) {
+        this.$refs.paged.$refs.criteria.search()
       }
     },
     computed: {

package/src/components/SellReport/ChargePrick.vue

@@ -57,7 +57,7 @@
         </div>
       </criteria>
       <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+        <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
             <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">

package/src/components/SellReport/DepartmentPrick.vue

@@ -66,7 +66,7 @@
         </div>
       </criteria>
       <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+        <table class='tableprint' style="margin: 0px auto">
           <thead>
           <tr>
             <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
@@ -243,7 +243,6 @@
           if(a[i].split('</td>').length-1>len){
             len=a[i].split('</td>').length-1
           }
-          continue
         }
         this.tablen=len
       }

package/src/components/SellReport/GasPrice.vue

@@ -58,7 +58,7 @@
         </div>
       </criteria>
       <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto;"  v-if="!$parent.data.f_files_path">
+        <table class='tableprint' style="margin: 0px auto;">
           <thead>
           <tr>
             <th colspan='18' style="font-weight: normal; text-align: left;">

package/src/components/SellReport/ManageBusSummary.vue

@@ -44,15 +44,15 @@
         </div>
     </criteria>
     <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-      <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+      <table class='tableprint' style="margin: 0px auto">
         <thead>
         <tr>
-          <th colspan='9' style="font-weight: normal; text-align: left;">
+          <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
             <h3 style="text-align: center">收费结账报表</h3>
           </th>
         </tr>
         <tr>
-          <th colspan='9' style="font-weight: normal; text-align: center;">
+          <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
             开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
             结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
             <!--打印时间：{{{$parent.printTime}}}-->
@@ -61,7 +61,7 @@
           </th>
         </tr>
         <tr>
-          <th colspan='9' style="font-weight: normal; text-align: center;">
+          <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
             <div>
               <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
               <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
@@ -71,15 +71,15 @@
         </tr>
         </thead>
         <tr>
-          <td colspan='9'>
+          <td :colspan='$parent.spans'>
             {{{ model.data.substring(26,model.data.length-8) }}}
           </td>
         </tr>
         <tfoot>
         <tr style="text-align: left">
-          <th colspan='3'>财务审核：</th>
-          <th colspan='3'>收款审核：</th>
-          <th colspan='3'>收款员：</th>
+          <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+          <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+          <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
         </tr>
         </tfoot>
       </table>
@@ -148,6 +148,7 @@
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
         show: false,
+        spans: 0,
         initres: {
           org: [this.$login.f.orgid],
           dep: [],
@@ -156,10 +157,8 @@
       }
     },
     ready () {
-      this.$refs.paged.$refs.criteria.$refs.res_select.sliceareashow = false
       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()
       console.log(this.$login.f)
     },
     methods: {
@@ -217,6 +216,16 @@
         } 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
+          }
+        }
+        this.spans = len
       }
     },
     computed: {

package/src/components/SellReport/ManageHandInputtor.vue

@@ -72,7 +72,7 @@
         </div>
     </criteria>
     <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-      <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+      <table class='tableprint' style="margin: 0px auto">
         <thead>
         <tr>
           <th colspan='8' style="font-weight: normal; text-align: left;">