sale-client 3.6.70 → 3.6.71

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
+const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.70",
+  "version": "3.6.71",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/qianneng/eticket/EticketRecordList.vue

@@ -90,6 +90,9 @@
             <th>
               <nobr>实收金额</nobr>
             </th>
+            <th>
+              <nobr>发票金额</nobr>
+            </th>
             <th>
               <nobr>不含税金额</nobr>
             </th>
@@ -99,9 +102,9 @@
             <th>
               <nobr>发票代码</nobr>
             </th>
-            <th>
-              <nobr>发票流水号</nobr>
-            </th>
+<!--            <th>-->
+<!--              <nobr>发票流水号</nobr>-->
+<!--            </th>-->
             <th>
               <nobr>发票号码</nobr>
             </th>
@@ -111,6 +114,9 @@
             <th>
               <nobr>发票类型</nobr>
             </th>
+            <th>
+              <nobr>收费时间</nobr>
+            </th>
             <th>
               <nobr>开票时间</nobr>
             </th>
@@ -127,14 +133,16 @@
             <th style="text-align:center">{{ row.f_userinfo_code }}</th>
             <th style="text-align:center">{{ row.f_user_name }}</th>
             <th style="text-align:center">{{ row.f_buy_address_phone }}</th>
+            <th style="text-align:center">{{ row.f_collection }}</th>
             <th style="text-align:center">{{ row.f_total_money }}</th>
             <th style="text-align:center">{{ row.f_tax_money }}</th>
             <th style="text-align:center">{{ row.f_invoice_type }}</th>
             <th style="text-align:center">{{ row.f_bill_code }}</th>
-            <th style="text-align:center">{{ row.f_fpqqlsh }}</th>
+<!--            <th style="text-align:center">{{ row.f_fpqqlsh }}</th>-->
             <th style="text-align:center">{{ row.f_bill_number }}</th>
             <th style="text-align:center">{{ row.f_bill_state }}</th>
             <th style="text-align:center">{{ row.f_charge_type }}</th>
+            <th style="text-align:center">{{ row.sell_operate_date }}</th>
             <th style="text-align:center">{{ row.f_operate_date }}</th>
             <th style="text-align:center">
               <button class="btn btn-link" v-if="row.f_bill_url"
@@ -166,6 +174,20 @@
       </data-grid>
     </criteria-paged>
   </div>
+  <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_collection}}
+      </td>
+      <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+        应交金额合计:&emsp;{{sumsmodel.f_total_money}}
+      </td>
+    </tr>
+  </table>
   <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false">
     <header slot="modal-header" class="modal-header">
       <h4 class="modal-title">撤销原因</h4>
@@ -198,7 +220,10 @@ export default {
   title: '发票管理',
   data () {
     return {
-      model: new PagedList('rs/sql/eticket_query', 20),
+      model: new PagedList('rs/sql/eticket_query', 20, {}, {
+        f_collection: 0,
+        f_total_money: 0
+      }),
       curorgid: [this.$login.f.orgid],
       criteriaShow: false,
       eticket_show: false,
@@ -216,7 +241,11 @@ export default {
       bz: '',
       row: {},
       install_show: false,
-      f_orgid: ''
+      f_orgid: '',
+      sumsmodel: {
+        f_collection: 0,
+        f_total_money: 0
+      },
     }
   },
   ready () {
@@ -236,6 +265,7 @@ export default {
         args.condition = `uf.f_filialeid in ${this.f_orgid} and ${args.condition}`
       }
       this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
     },
     async confirm () {
       // 修改发票状态

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/yuansheng/sale'
+import wenxi from './filiale/qianneng/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'