manage-client 3.3.45 → 3.3.47

package/src/filiale/lixianV3/InvoiceDetailsQuery.vue

@@ -6,16 +6,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <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">发票编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.id"
-                         condition="id = '{}' " placeholder="发票编号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">使&nbsp;&nbsp;用&nbsp;人</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_bill_operator"
-                         condition="f_operator = '{}'" placeholder="使用人">
-                </div>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -36,13 +26,23 @@
                               condition="f_operate_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_bill_number"
+                         condition="f_bill_number = '{}' " 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_userinfo_code"
+                         condition="f_userinfo_code = '{}' " 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>
-                  <export-excel :data="$parent.$parent.getCondition"
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="manage_singleTable"
-                                template-name='发票使用导出'
+                                sqlurl="rs/logic/exportfile" sql-name="manage_billQuery"
+                                template-name='发票查询导出'
                                 :choose-col="true">
                   </export-excel>
                   <div style="float: right" class="button_spacing"
@@ -73,6 +73,16 @@
                             close-on-select>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使&nbsp;&nbsp;用&nbsp;人</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_bill_operator"
+                         condition="f_operator = '{}'" placeholder="使用人">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder="表号">
+                </div>
               </div>
             </div>
           </criteria>
@@ -83,25 +93,27 @@
                 <th>序号</th>
                 <th>发票编号</th>
                 <th>用户编号</th>
-                <th>表编号</th>
+                <th>表号</th>
                 <th>用户姓名</th>
                 <th>购气量</th>
                 <th>实收金额</th>
                 <th>业务类型</th>
+                <th>收据类型</th>
                 <th>打印类型</th>
-                <th>状态</th>
+                <th>收据状态</th>
                 <th>使用人</th>
               </tr>
             </template>
             <template partial='body'>
               <tr>
                 <td style="text-align:center">{{$index+1}}</td>
-                <td style="text-align:center">{{row.id}}</td>
-                <td style="text-align:center">{{row.f_userinfo_id}}</td>
-                <td style="text-align:center">{{row.f_user_id}}</td>
+                <td style="text-align:center">{{row.f_bill_number}}</td>
+                <td style="text-align:center">{{row.f_userinfo_code}}</td>
+                <td style="text-align:center">{{row.f_meternumber}}</td>
                 <td style="text-align:center">{{row.f_user_name}}</td>
                 <td style="text-align:center">{{row.f_gas}}</td>
                 <td style="text-align:center">{{row.f_paid_money}}</td>
+                <td style="text-align:center">{{row.f_type}}</td>
                 <td style="text-align:center">{{row.f_bill_type}}</td>
                 <td style="text-align:center">{{row.f_bill_style}}</td>
                 <td style="text-align:center">{{row.f_bill_state}}</td>
@@ -111,6 +123,17 @@
             <template partial='foot'></template>
           </data-grid>
         </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              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_paid_money}}
+            </td>
+          </tr>
+        </table>
       </div>
     </div>
   </div>
@@ -125,7 +148,7 @@ export default {
   title: '发票详情查询',
   data () {
     return {
-      model: new PagedList('rs/sql/manage_singleTable', 50, {items: '"*"', tablename: '"t_billdetail"', orderitem: '"id desc"'}),
+      model: new PagedList('rs/sql/manage_billQuery', 20,{},{f_paid_money: 0}),
       other: [],
       orgCondtionStr: '',
       resshow: ['company'],
@@ -133,29 +156,32 @@ export default {
         org: [this.$login.f.orgid]
       },
       criteriaShow: false,
-      condition: ''
+      condition: '',
+      sumsmodel: {},
+      footer: []
     }
   },
   ready () {
     this.$refs.paged.$refs.cri.model.startDate = this.data ? this.data.startDate : this.$login.toStandardDateString() + ' 00:00:00'
     this.$refs.paged.$refs.cri.model.endDate = this.data ? this.data.endDate : this.$login.toStandardDateString() + + ' 23:59:59'
+    this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
   },
   methods: {
     getotherfooter () {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
       // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
       this.other = []
-      // this.footer = [];
+      this.footer = [];
       let exportdata = this.getCondition
       let otherInData = []
       otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
       let footerData = [],exportfield = this.getfield
-      // footerData.push("合计");
-      // let self = this;
-      // for (var field in self.sumsmodel) {
-      //   footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-      // }
-      // this.footer.push(footerData);
+      footerData.push("合计");
+      let self = this;
+      for (var field in self.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+      }
+      this.footer.push(footerData);
       this.other.push(otherInData)
     },
 
@@ -166,10 +192,15 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch (args) {
-      let f_orgstr = this.orgCondtionStr
-      args.condition = `${args.condition} ` + f_orgstr
+      if (this.orgCondtionStr) {
+        args.condition = `${args.condition} ` + this.orgCondtionStr
+      } else {
+        args.condition = `${args.condition} ` + " and f_orgid = " + this.$login.f.orgid
+      }
       this.condition = args.condition
       this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      console.log('合计字段', this.sumsmodel)
     },
     clear () {
       Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
@@ -195,10 +226,7 @@ export default {
     },
     getCondition () {
       return {
-        condition: this.condition,
-        orderitem: 'id desc',
-        tablename: 't_billdetail',
-        items: '*'
+        condition: this.condition
       }
     },
     billType () {

package/src/filiale/lixianV3/config/exportConfig.js

@@ -2265,10 +2265,10 @@ export default {
     'f_gasdiff': '增量', 'f_gasprec': '百分比'
   },
   invoiceDetailsConfig: {
-    'id': '发票编号', 'f_userinfo_id': '用户编号', 'f_user_name': '用户姓名',
-    'f_user_id': '表编号', 'f_gas': '购气量', 'f_paid_money': '实收金额',
-    'f_bill_type': '业务类型', 'f_bill_style': '打印类型',
-    'f_bill_state': '状态', 'f_operator': '使用人'
+    'f_bill_number': '发票编号', 'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名',
+    'f_meternumber': '表号', 'f_gas': '购气量', 'f_paid_money': '实收金额',
+    'f_type': '业务类型', 'f_bill_type': '收据类型', 'f_bill_style': '打印类型',
+    'f_bill_state': '收据状态', 'f_operator': '使用人'
   }
 }
 

package/src/filiale/macheng/ManageBusSummary.vue

@@ -165,13 +165,13 @@
         let orgstr = this.orgCondtionStr
         orgcondition = orgcondition + orgstr
 /*        if (this.f_orgid && this.f_orgid[0]) {
-          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+          orgcondition += ` and f_orgid in ('${this.f_orgid}')`
         }
         if (this.f_depid && this.f_depid[0]) {
-          orgcondition += ' and f_depid in (' + this.f_depid + ')'
+          orgcondition += ` and f_depid in ('${this.f_depid}')`
         }
         if(this.f_operatorid && this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
         }*/
         if(this.f_state && this.f_state[0]) {
           orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`

package/src/filiale/macheng/ManageSellType.vue

@@ -205,13 +205,13 @@
         let orgstr = this.orgCondtionStr
         orgcondition = orgcondition + orgstr
 /*        if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          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.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.search(args)

package/src/filiale/ningjin/ManageBusSummaryPeng.vue

@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = `f_orgid = '${this.f_orgid}'`
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ` and  f_depid = '${this.f_depid}'`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ` and  f_operatorid = '${this.f_operatorid}'`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/filiale/ningjin/ManageSellType.vue

@@ -201,13 +201,13 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          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.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.search(args)

package/src/filiale/ningjin/report/JiManageBusSummary.vue

@@ -186,13 +186,13 @@ export default {
         orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
       }
       /*        if (this.f_orgid && this.f_orgid[0]) {
-                orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+                orgcondition += ` and f_orgid in ('${this.f_orgid}')`
               }
               if (this.f_depid && this.f_depid[0]) {
-                orgcondition += ' and f_depid in (' + this.f_depid + ')'
+                orgcondition += ` and f_depid in ('${this.f_depid}')`
               }
               if(this.f_operatorid && this.f_operatorid[0]) {
-                orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+                orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
               }*/
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)

package/src/filiale/ningjin/report/ManageBusSummary.vue

@@ -186,13 +186,13 @@ export default {
         orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
       }
       /*        if (this.f_orgid && this.f_orgid[0]) {
-                orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+                orgcondition += ` and f_orgid in ('${this.f_orgid}')`
               }
               if (this.f_depid && this.f_depid[0]) {
-                orgcondition += ' and f_depid in (' + this.f_depid + ')'
+                orgcondition += ` and f_depid in ('${this.f_depid}')`
               }
               if(this.f_operatorid && this.f_operatorid[0]) {
-                orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+                orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
               }*/
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)

package/src/filiale/ningjin/report/ManageSellType.vue

@@ -195,13 +195,13 @@
           orgcondition += ` and f_state = ' ${ this.f_state}'`
         }
         /*        if (this.f_orgid && this.f_orgid[0]) {
-                  orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+                  orgcondition += ` and f_orgid in ('${this.f_orgid}')`
                 }
                 if (this.f_depid && this.f_depid[0]) {
-                  orgcondition += ' and f_depid in (' + this.f_depid + ')'
+                  orgcondition += ` and f_depid in ('${this.f_depid}')`
                 }
                 if(this.f_operatorid && this.f_operatorid[0]) {
-                  orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+                  orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
                 }*/
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/filiale/qianneng/ManageBusSummary.vue

@@ -165,13 +165,13 @@
         let orgstr = this.orgCondtionStr
         orgcondition = orgcondition + orgstr
 /*        if (this.f_orgid && this.f_orgid[0]) {
-          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+          orgcondition += ` and f_orgid in ('${this.f_orgid}')`
         }
         if (this.f_depid && this.f_depid[0]) {
-          orgcondition += ' and f_depid in (' + this.f_depid + ')'
+          orgcondition += ` and f_depid in ('${this.f_depid}')`
         }
         if(this.f_operatorid && this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
         }*/
         if(this.f_state && this.f_state[0]) {
           orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`

package/src/filiale/shiquan/BusSummaryes.vue

@@ -175,7 +175,7 @@ export default {
       console.log( "condition:" + args.condition)
       let orgcondition = '1=1'
       if (this.f_orgid[0]) {
-        orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+        orgcondition += ` and f_orgid in ('${this.f_orgid}')`
       }
       let deps = ''
       let i = 0

package/src/filiale/shiquan/ManageSellType.vue

@@ -205,13 +205,13 @@
           return
         }
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          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.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.search(args)

package/src/filiale/tongchuan/GasPrice.vue

@@ -167,13 +167,13 @@ import {DataModel, HttpResetClass} from 'vue-client'
         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 + ')'
+          orgcondition += `  and f_orgid in ('${this.f_orgid}')`
         }
         if (this.f_depid && this.f_depid[0]) {
-          orgcondition += ' and f_depid in(' + this.f_depid + ')'
+          orgcondition += ` and f_depid  in ('${this.f_depid}')`
         }
         if (this.f_operatorid && this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in(' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid  in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         if (this.reportStyle == '1') {

package/src/filiale/tongchuan/ManageBusSummary.vue

@@ -189,7 +189,7 @@ export default {
       this.printTime = this.$login.toStandardTimeString()
       let orgcondition = ''
       if (this.f_orgid[0]) {
-        orgcondition += ' and f_orgid in(' + this.f_orgid + ')'
+        orgcondition += `  and f_orgid in ('${this.f_orgid}')`
       }
       if(this.f_state && this.f_state[0]) {
         orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`

package/src/filiale/zhongyi/ManageBusSummaryPeng.vue

@@ -173,12 +173,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f_orgid = ' + this.f_orgid
+        let orgcondition = `f_orgid = '${this.f_orgid}'`
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid = ' + this.f_depid
+          orgcondition += ` and  f_depid = '${this.f_depid}'`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid = ' + this.f_operatorid
+          orgcondition += ` and  f_operatorid = '${this.f_operatorid}'`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/filiale/zhongyi/ManageSellType.vue

@@ -201,13 +201,13 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          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.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.search(args)