sale-client 3.6.70 → 3.6.72

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] = ['http://kf.yidagas.com:8400/', 'http://kf.yidagas.com: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.72",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/business/ShowCardSellGas.vue

@@ -265,7 +265,7 @@
     <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row"
                   :money="model.f_after_discount"></payment-code>
   </div>
-  <upload v-if="config.showupload"  :blodid="blodid" isremark="true" fusetype="发卡售气"></upload>
+  <upload v-if="config.showupload"  :blodid="row.f_userinfo_id" isremark="true" fusetype="发卡售气"></upload>
 </template>
 <script>
 /**

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -78,7 +78,7 @@
         <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
           <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
         </saletab>
-        <saletab header="表使用量图表">
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
           <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
         </saletab>
         <saletab header="用户设备查询"  v-if="permission('用户设备查看')">

package/src/components/revenue/HandManager/PriceAdjustmentWebmeter.vue

@@ -110,9 +110,9 @@
                 <th><nobr>开始抄表时间</nobr></th>
                 <th><nobr>结束抄表时间</nobr></th>
                 <th><nobr>气价名称</nobr></th>
-                <th><nobr>系统气价</nobr></th>
-                <th><nobr>输入气价</nobr></th>
-                <th><nobr>单价差值</nobr></th>
+<!--                <th><nobr>系统气价</nobr></th>-->
+<!--                <th><nobr>输入气价</nobr></th>-->
+                <th><nobr>补差单价</nobr></th>
                 <th><nobr>上期底数</nobr></th>
                 <th><nobr>本期底数</nobr></th>
                 <th><nobr>补差气量</nobr></th>
@@ -132,30 +132,37 @@
               <th style="text-align: center;"><nobr>{{row.f_end_date}}</nobr></th>
               <th style="text-align: center;">{{row.f_price_name}}</th>
               <!--              <th style="text-align: center;">{{row.f_address}}</th>-->
+<!--              <th style="text-align: center;">-->
+<!--                <div class="form-group" style="margin-bottom:0px;"-->
+<!--                     v-if="!row.f_new_price>0">-->
+<!--                  <input type="text" class="form-control" v-model="row.oldprice"-->
+<!--                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">-->
+<!--                </div>-->
+<!--                <div v-else>{{row.f_old_price}}</div>-->
+<!--              </th>-->
+<!--              <th style="text-align: center;">-->
+<!--                <div class="form-group" style="margin-bottom:0px;"-->
+<!--                     v-if="!row.f_new_price>0">-->
+<!--                  <input type="text" class="form-control" v-model="row.newprice"  @blur="$parent.$parent.$parent.enter(row)"-->
+<!--                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">-->
+<!--                </div>-->
+<!--                <div v-else>{{row.f_new_price}}</div>-->
+<!--              </th>-->
               <th style="text-align: center;">
-                <div class="form-group" style="margin-bottom:0px;"
-                     v-if="!row.f_new_price>0">
-                  <input type="text" class="form-control" v-model="row.oldprice"
+                <div class="form-group" style="margin-bottom:0px;" v-if="!row.f_surplus_id">
+                  <input type="number" class="form-control" v-model="row.f_change_price"  @blur="$parent.$parent.$parent.enter(row)"
                          v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
                 </div>
-                <div v-else>{{row.f_old_price}}</div>
+                <div v-else>{{row.f_change_price}}</div>
               </th>
-              <th style="text-align: center;">
-                <div class="form-group" style="margin-bottom:0px;"
-                     v-if="!row.f_new_price>0">
-                  <input type="text" class="form-control" v-model="row.newprice"  @blur="$parent.$parent.$parent.enter(row)"
-                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
-                </div>
-                <div v-else>{{row.f_new_price}}</div>
-              </th>
-              <th style="text-align: center;">{{row.f_change_price}}</th>
+<!--              <th style="text-align: center;">{{row.f_change_price}}</th>-->
               <th style="text-align: center;">{{row.f_last_tablebase}}</th>
               <th style="text-align: center;">{{row.f_tablebase}}</th>
               <th style="text-align: center;">{{row.pregas}}</th>
               <th style="text-align: center;">{{row.f_surplus_fee}}</th>
               <th style="text-align: center;">{{row.f_source}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_new_price"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_id"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
               </th>
@@ -168,12 +175,8 @@
           </header>
           <article slot="modal-body" class="modal-body">
             <div class="form-group">
-              <p>旧单价：</p>
-              <input type="text" class="form-control" v-model="f_old_price" >
-            </div>
-            <div class="form-group">
-              <p>新单价：</p>
-              <input type="text" class="form-control" v-model="f_new_price" >
+              <p>补差单价：</p>
+              <input type="text" class="form-control" v-model="f_change_price" >
             </div>
           </article>
           <footer slot="modal-footer" class="modal-footer">
@@ -229,6 +232,7 @@
         model: new PagedList('rs/sql/get_WebUserCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
         f_new_price: 0.0,
         f_old_price:0.0,
+        f_change_price:0.0,
         show: false,
         addSelectParam: ''
         // joinTable:'',
@@ -282,7 +286,7 @@
             row.f_orgname = this.$login.f.orgs
             row.f_depid = this.$login.f.depids
             row.f_depname = this.$login.f.deps
-            this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
+            this.$resetpost('rs/logic/priceAdjustmentOffsetWebmeter', {data: row}).then(() => {
               // this.$dispatch('refresh', '正在处理', row)
               this.selfSearch(this.model)
             })
@@ -307,14 +311,17 @@
           })
       },
       async enter (row) {
-        if(row.oldprice && row.newprice){
-          this.$showMessage('是否确认对此记录进行调价补差操作？', ['confirm', 'cancel']).then((res) => {
+        if(row.f_change_price){
+          let money = parseFloat(row.pregas * row.f_change_price)
+          let message = `是否确认对此记录进行调价补差${money}元`
+          this.$showMessage(message, ['confirm', 'cancel']).then((res) => {
               if (res === 'confirm') {
                 let http2 = new HttpResetClass()
                 let param = {
                   f_state: '有效',
-                  f_old_price:parseFloat(row.oldprice),
-                  f_new_price: parseFloat(row.newprice),
+                  f_old_price:null,
+                  f_new_price: null,
+                  f_change_price:row.f_change_price,
                   f_operator: this.$login.f.name,
                   f_operatorid: this.$login.f.id,
                   f_orgid: this.$login.f.orgid,
@@ -329,6 +336,8 @@
                   this.selfSearch(this.model)
                 })
 
+              }else{
+                // row.f_change_price = null
               }
           })
 
@@ -345,8 +354,9 @@
           console.log(detail.data)
           let param = {
             f_state: '有效',
-            f_old_price:parseFloat(this.oldprice),
-            f_new_price: parseFloat(this.f_new_price),
+            f_old_price:null,
+            f_new_price: null,
+            f_change_price:this.f_change_price,
             f_operator: this.$login.f.name,
             f_operatorid: this.$login.f.id,
             f_orgid: this.$login.f.orgid,

package/src/filiale/gehua/MeterinfoTest.vue

@@ -42,16 +42,21 @@
             <label for="gasbrand" class="font_normal_body">气表品牌</label>
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
+<!--            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发'))" v-ref:brand></v-select>-->
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发'))" v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_user_state === '预备' ||user_State === '预备') || (user_State === undefined || user_State === ''))"  v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
             <input type="text" v-show="false" v-model="$refs.model.selectedItems"
                    v-validate:model='{required: true }'>
+<!--            <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'-->
+<!--                      close-on-select-->
+<!--                      v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && ((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发')))" v-ref:model></v-select>-->
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && ((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发')))" v-ref:model></v-select>
+                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && ((row.f_user_state === '预备' || user_State === '预备') ||  (user_State === undefined || user_State === '')))"   v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -564,18 +569,22 @@
         overdueset:[],
         isiot: true,
         templng: '',  //  临时经度
-        templat: '' //  临时纬度
+        templat: '', //  临时纬度
+        user_State: ''
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
+      this.user_State = this.curuser.f_user_state
+      console.log(this.user_State)
+      console.log(this.curuser.f_user_state)
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
-      if(this.row.f_meter_classify){
-        if(this.row.f_meter_classify==='物联网表'){
-          this.isiot=true
-        }else{
-          this.isiot=false
+      if (this.row.f_meter_classify) {
+        if (this.row.f_meter_classify === '物联网表') {
+          this.isiot = true
+        } else {
+          this.isiot = false
         }
       }
       this.oldrow = this.row
@@ -586,6 +595,13 @@
       }
       await this.getConcentrators()
       co(meterBookGen(this))
+      console.log('-----------------111111111-----------------------')
+      console.log(this.curuser)
+      console.log(this.row.f_user_state)
+      console.log(this.row.meter)
+      console.log(this.row.f_meter_classify)
+      console.log(this.user_State)
+      console.log('-------------------11111111---------------------')
     },
     methods: {
       gasDateChange () {
@@ -665,6 +681,13 @@
           co(brandChangeGen(this))
         }
         this.meternumberValidate()
+        console.log('----------------------------------------')
+        console.log(this.user_State)
+        console.log(this.row.f_whether_hairpin)
+        console.log(this.row.f_user_state)
+        console.log(this.row.gasbrand.length)
+        console.log(this.row.gasbrand)
+        console.log('----------------------------------------')
       },
       userTypeChange () {
         this.gasproperties = []

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/filiale/rizhao/ChargeList.vue

@@ -441,6 +441,7 @@
         self.model.rows = getUser.data
         self.$dispatch('dblclick', getUser.data[0], 0, self.cardInfo) // 这里的0是角标位置（暂无用）
       } else if (getUser.data.length > 1) {
+        getUser.data = getUser.data.filter((res)=> {return res.f_filialeid===self.$login.f.orgid})
         if (self.model.rows.length == 1) {
           // 处理读卡时需要卡密码的问题：此时已经查出一户数据来，验证此数据的卡号和读出的卡号是否一致，一致则不用去查询
           let hasMatchingData = false
@@ -628,6 +629,7 @@
         self.model.rows = getUser.data
         self.$dispatch('dblclick', getUser.data[0], 0, self.cardInfo) // 这里的0是角标位置（暂无用）
       } else if (getUser.data.length > 1) {
+        getUser.data = getUser.data.filter((res)=> {return res.f_filialeid===self.$login.f.orgid})
         if (self.model.rows.length == 1) {
           // 处理读卡时需要卡密码的问题：此时已经查出一户数据来，验证此数据的卡号和读出的卡号是否一致，一致则不用去查询
           let hasMatchingData = false

package/src/filiale/rizhao/ShowCardSellGas.vue

@@ -264,7 +264,7 @@
     <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row"
                   :money="model.f_after_discount"></payment-code>
   </div>
-  <upload v-if="config.showupload" isremark="true" fusetype="发卡售气"></upload>
+  <upload v-if="config.showupload" :blodid="row.f_userinfo_id" isremark="true" fusetype="发卡售气"></upload>
 </template>
 <script>
 /**

package/src/filiale/yuansheng/sale.js

@@ -26,6 +26,4 @@ export default function () {
   Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
   // 物联网赠气
   Vue.component('iotTable', (resolve) => { require(['./iotTable'], resolve) })
-  // 卡表赠气
-  Vue.component('icTable', (resolve) => { require(['./icTable'], resolve) })
 }

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/rizhao/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'