manage-client 3.1.43 → 3.1.44-zk

package/build/dev-server.js

@@ -10,20 +10,14 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-// 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:8084/', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8400'
-var system = 'http://192.168.50.4:8400'
-//192.168.
-//  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 bendi = 'http://localhost:8001/manage/'
+var fuwu = 'http://192.168.20.27:8400/'
+// var fuwu = 'http://192.168.20.28:8400/'
 var proxyTable = {
-  '/rs/logic/exportfile': {
+  '/files': {
     target: fuwu
   },
-  '/files': {
+  '/rs/logic/exportfile': {
     target: fuwu
   },
   // 查找资源服务数据
@@ -69,6 +63,9 @@ var proxyTable = {
   '/rs/report': {
     target: fuwu
   },
+  '/rs/sql': {
+    target: fuwu
+  },
   '/rs/vue': {
     target: fuwu
   },
@@ -79,7 +76,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: bendi
+    target: fuwu
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.43",
+  "version": "3.1.44-zk",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -63,10 +63,10 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
+    "system-clients": "3.1.89-18",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.21",
+    "vue-client": "1.24.35",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/components/SellReport/ChargeDayReport.vue

@@ -25,15 +25,66 @@
                   </datepicker>
                 </div>
                 <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel :show-component="$parent.$parent.showself"></res-select-group>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
+<!--                  <v-select :value.sync="model.f_residential_area"-->
+<!--                            class="select_list select"-->
+<!--                            enter-push-->
+<!--                            multiple = "true"-->
+<!--                            v-model="model.f_residential_area"-->
+<!--                            style="width: 60%"-->
+<!--                            :options='$parent.$parent.residentialArea' placeholder='选择小区'-->
+<!--                            close-on-select>-->
+
+<!--                  </v-select>-->
+<!--                </div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;付款方式&nbsp;</label>
+                  <v-select :value.sync="model.f_payment"
+                            class="select_list select"
+                            multiple
+                            :search="false"
+                            v-model="model.f_payment"
+                            style="width: 60%"
+                            :options='$parent.$parent.payment'
+                            placeholder='付款方式'
+                            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_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="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;收费状态&nbsp;</label>
+                  <v-select :value.sync="model.f_state"
+                            class="select_list select"
+                            :search="false"
+                            v-model="model.f_state"
+                            style="width: 60%"
+                            :options='$parent.$parent.sellstate'
+                            placeholder='收费状态'
+                            condition="f_state in {}"
+                            close-on-select>
+
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <v-select :value.sync="model.f_residential_area"
+                  <label class="font_normal_body">&nbsp;收费类型&nbsp;</label>
+                  <v-select :value.sync="model.f_type"
                             class="select_list select"
-                            enter-push
-                            multiple = "true"
-                            v-model="model.f_residential_area"
+                            :search="false"
+                            v-model="model.f_type"
                             style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            :options='$parent.$parent.selltype'
+                            placeholder='收费类型'
                             close-on-select>
 
                   </v-select>
@@ -87,9 +138,9 @@
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
-                <th>
-                  <nobr>气量</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>气量</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>收款</nobr>
                 </th>
@@ -129,11 +180,11 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_pregas}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
+                <nobr>{{row.f_collection}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.price}}</nobr>
@@ -172,11 +223,11 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              总气量:&emsp;{{sumsmodel.f_pregas}}-->
+<!--            </td>-->
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总气量:&emsp;{{sumsmodel.f_pregas}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总金额:&emsp;{{sumsmodel.f_preamount}}
+              总金额:&emsp;{{sumsmodel.f_collection}}
             </td>
           </tr>
         </table>
@@ -188,7 +239,6 @@
   import {PagedList, HttpResetClass} from 'vue-client'
   import defaultPrint from '../sale/config/DefaultPrint'
   import exportConfig from '../sale/config/exportConfig'
-  import PrintDataSelf from '../sale/common/PrintDataSelf'
 
   let readySomething = async function (self) {
     self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
@@ -204,9 +254,9 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/chargeDayReport', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/chargeDayReport', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', sellType: 'this.model.sellType'},{
           f_pregas:0,
-          f_preamount:0
+          f_collection:0
         }),
         gasproperties:[],
         initres: {
@@ -229,17 +279,16 @@
         fields: {},
         thead: '',
         tfoot: '',
-
         // 下拉框
 
         //合计数据
         sumsmodel: {},
         sumField: {
-           'f_pregas': '方量', 'f_preamount': '金额'
+           'f_pregas': '方量', 'f_collection': '金额'
         },
         pageSum: {
           'f_pregas': '0.00',
-          'f_preamount': '0.00',
+          'f_collection': '0.00',
         },
         defaultfield: [],
         config: {
@@ -249,6 +298,7 @@
       }
     },
     ready() {
+      this.$refs.paged.$refs.cri.model.f_state=['有效']
       this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
@@ -281,15 +331,19 @@
         this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
         this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
         args.condition = `${args.condition} ` +' and '+this.orgCondtionStr.trim().substring(4)
+        args.model.sellType = `1=1`
+        if(args.model.f_type.length !== 0){
+          args.model.sellType += ` and f_type in ('${args.model.f_type.toString().replace(/,/g,"','")}')`
+        }
         //小区查询条件
-        this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
+        this.area =  this.$refs.paged.$refs.cri.model.f_payment
         if(this.area.length !== 0){
           let str = JSON.stringify(this.area)
           str = str.replace(/"/g,`'`)
           str = str.replace(/\[/g,``)
           str = str.replace(/\]/g,``)
           //查询多个小区时条件
-          args.condition += ` and f_residential_area in  ( ${str} )`
+          args.condition += ` and f_payment in  ( ${str} )`
         }
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -409,6 +463,15 @@
           condition: this.$refs.paged.model.condition
         }
       },
+      payment() {
+        return [...this.$appdata.getParam('付款方式查询')]
+      },
+      sellstate(){
+        return [...this.$appdata.getParam('收费状态')]
+      },
+      selltype(){
+        return [{label: '补卡费', value: '补卡费'},{label: '过户费', value: '过户费'},...this.$appdata.getParam('收费类型')]
+      },
       getfield() {
         return exportConfig.ChargeDayReportConfig
       },

package/src/components/SellReport/CivilGasReport.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <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%"
+                          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%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :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="org">公&emsp;&emsp;司:</label>
+              <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+              <res-select id="dep" restype='department' style="width: 60%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid' >
+              </res-select>
+
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+              <res-select id="oper" restype='user' style="width: 60%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+          </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-excel id='gasprice'></report-excel>
+          </div>
+        </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">
+          <thead>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">民用气量统计表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
+              时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
+              打印时间：{{$parent.printTime}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname[0]">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname[0]"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname[0]">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.tablen' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.tablen/3)'>财务审核：</th>
+            <th :colspan='Math.round($parent.tablen/3)'>收款审核：</th>
+            <th :colspan='Math.round($parent.tablen/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+export default {
+  title: '民用气量统计表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      tablen:0,
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/CivilGasStatistics', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false,
+    }
+  },
+  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'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      if (this.f_orgid && this.f_orgid[0]) {
+        orgcondition += ` and f_orgid in(${this.f_orgid.toString()})`
+      }
+      if (this.f_depid && this.f_depid[0]) {
+        orgcondition += ` and f_orgid in(${this.f_depid.toString()})`
+      }
+      if(this.f_operatorid && this.f_operatorid[0]) {
+        orgcondition += ` and f_orgid in(${this.f_operatorid.toString()})`
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      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
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } 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.tablen=len
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/SellReport/{UserClassify.vue → GasMoneyReport.vue}

@@ -2,55 +2,35 @@
   <div class="basic-main" style="height: 100%">
     <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>
+        <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-3" >
-              <label class="font_normal_body" for="startDate">月开始日期:</label>
-              <datepicker id="startDate" placeholder="月开始日期" style="width: 60%"
+            <div class="col-sm-4" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 00:00:00'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-3" >
-              <label  class="font_normal_body" for="endDate">月结束日期:</label>
-              <datepicker id="endDate" placeholder="月结束日期" style="width: 60%"
+            <div class="col-sm-4" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 23:59:59'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-3" >
-              <label class="font_normal_body" for="yearStartDate">年开始日期:</label>
-              <datepicker id="yearStartDate" placeholder="年开始日期" style="width: 60%"
-                          v-model="model.yearStartDate"
-                          :value.sync="model.yearStartDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-3" >
-              <label  class="font_normal_body" for="yearEndDate">年结束日期:</label>
-              <datepicker id="yearEndDate" placeholder="年结束日期" style="width: 60%"
-                          v-model="model.yearEndDate"
-                          :value.sync="model.yearEndDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-3 form-group" >
+            <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" style="width: 60%"></right-tree>
             </div>
-            <div class="col-sm-3 form-group">
+            <div class="col-sm-4 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
               <res-select id="dep" restype='department' style="width: 60%"
                           is-mul="false"
@@ -60,7 +40,7 @@
               </res-select>
 
             </div>
-            <div class="col-sm-3 form-group">
+            <div class="col-sm-4 form-group">
               <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
               <res-select id="oper" restype='user' style="width: 60%"
                           is-mul="false"
@@ -78,11 +58,11 @@
         </div>
       </criteria>
       <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto" >
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
             <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">用户分类统计</h3>
+              <h3 style="text-align: center">气量气费月报表</h3>
             </th>
           </tr>
           <tr>
@@ -94,9 +74,9 @@
           <tr>
             <th :colspan='$parent.tablen' 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>
+                <span v-show="$parent.orgname[0]">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname[0]"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname[0]">人员：{{$parent.operatorname}}</span>
               </div>
             </th>
           </tr>
@@ -158,7 +138,7 @@
     }
   }
   export default {
-    title: '用户分类统计',
+    title: '气量气费月报表',
     props: ['data'],
     data () {
       return {
@@ -175,8 +155,8 @@
         depname: '',
         operatorname: '',
         orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/UserClassify', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          yearStartDate: 'this.model.yearStartDate', yearEndDate: 'this.model.yearEndDate',f_orgid: 'this.model.f_orgid'}),
+        model: new DataModel('rs/report/gasMoneyReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
         show: false,
       }
@@ -192,12 +172,15 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in(' + this.f_orgid + ')'
+        let orgcondition = '1=1'
+        if (this.f_orgid[0]) {
+          orgcondition += ` and f_orgid in(${this.f_orgid.toString()})`
+        }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in(' + this.f_depid + ')'
+          orgcondition += ` and f_orgid in(${this.f_depid.toString()})`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
+          orgcondition += ` and f_orgid in(${this.f_operatorid.toString()})`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
@@ -255,12 +238,12 @@
           if(a[i].split('</td>').length-1>len){
             len=a[i].split('</td>').length-1
           }
+          continue
         }
         this.tablen=len
       }
     },
     computed: {
-
     }
   }
 </script>

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;">
+        <table class='tableprint' style="margin: 0px auto;"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
             <th colspan='18' style="font-weight: normal; text-align: left;">
@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid in(' + this.f_orgid + ')'
+        let orgcondition = 'f_orgid = ' + this.f_orgid
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in(' + this.f_depid + ')'
+          orgcondition += ' and f_depid = ' + this.f_depid
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
+          orgcondition += ' and f_operatorid = ' + this.f_operatorid
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)