sale-client 3.5.121 → 3.5.123

package/build/dev-server.js

@@ -184,7 +184,7 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(8085, function (err) {
+module.exports = app.listen(8089, function (err) {
   if (err) {
     console.log(err)
     return

package/package.json

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

package/src/components/charge/business/PriceChangeCompensation/IotCompensation.vue

@@ -274,6 +274,7 @@
         // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
         console.log('付款码操作返回', ss)
+        this.$refs.paymentcode.paymentCodeShow = false
         if (!ss.result) return
         compensationChargeGen(this)
       },

package/src/components/charge/business/PriceChangeCompensation/JbCompensation.vue

@@ -300,6 +300,7 @@
         this.model.f_depname = this.$login.f.deps
         // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
+        this.$refs.paymentcode.paymentCodeShow = false
         console.log('付款码操作返回', ss)
         if (!ss.result) return
         compensationChargeGen(this)

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

@@ -6,7 +6,8 @@
           <div class="row" style="margin-top:5px;">
             <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'has-error' : '']">
               <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
-              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
+              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"
+                     v-validate:payment='{required: true }'>
               <v-select id="f_payment"
                         v-model="f_payment"
                         placeholder='请选择'
@@ -19,15 +20,16 @@
               <input class="input_search" style="width:60%" type="number" id="fouces"
                      @blur="pregas()" v-model="model.f_pregas"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
-                     v-next-el='sk' >
+                     v-next-el='sk'>
             </div>
 
             <div class="col-sm-4 form-group"
                  :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
-              <label for="f_preamount" class=" font_normal_body" >*预购金额</label>
-              <input  class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
-                     @blur="preamount()" v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额"
-                     v-scale="[model.f_preamount, 4]" placeholder="预购金额" >
+              <label for="f_preamount" class=" font_normal_body">*预购金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     @blur="preamount()" v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}'
+                     placeholder="预购金额"
+                     v-scale="[model.f_preamount, 4]" placeholder="预购金额">
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -57,15 +59,15 @@
             </div>
             <div class="col-sm-4 form-group" v-if="!hasLimit">
             </div>
-            <div class="col-sm-4 form-group" >
+            <div class="col-sm-4 form-group">
               <label for="f_temp_amount" v-if="row.f_collection_type === '按气量'"
                      class=" font_normal_body">&nbsp;应收金额</label>
               <label for="f_temp_amount" v-if="row.f_collection_type === '按金额'"
                      class=" font_normal_body">*本次缴费</label>
               <input class="input_search" style="width:60%" type="number"
-                      v-model="model.f_totalcost"
+                     v-model="model.f_totalcost"
                      v-validate:f_totalcost='{required: true, dctest: [(openFee - 0), ">=" ] }' placeholder="应收金额"
-                     v-next-el='sk' v-scale="[model.f_totalcost, 4]" disabled >
+                     v-next-el='sk' v-scale="[model.f_totalcost, 4]" disabled>
             </div>
           </div>
 
@@ -95,7 +97,8 @@
                      v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-1 form-group">
-              <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
+              <give-change :curbalance="curbalance" :collection.sync="model.f_collection"
+                           v-ref:givechange></give-change>
             </div>
           </div>
           <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
@@ -121,7 +124,8 @@
           <div class="row" v-if="openFee > 0">
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;开卡费</label>
-              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="openFee" placeholder='开卡费' disabled>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="openFee"
+                     placeholder='开卡费' disabled>
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -134,19 +138,21 @@
           <div class="row" v-if="model.f_payment[0].includes('POS')">
             <div class="col-sm-4 form-group">
               <label for="f_voucher_number" class="font_normal_body">&nbsp;&nbsp;&nbsp;凭证号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number" placeholder="凭证号">
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number"
+                     placeholder="凭证号">
             </div>
           </div>
           <div class="row" style="padding-top: 0.5em;">
 
-            <div class="col-sm-4" v-if="!mjshow" >
+            <div class="col-sm-4" v-if="!mjshow">
               <label for="f_serial_number" class=" font_normal_body">业务单号</label>
-              <input class="input_search" style="width:60%"  type="text"
+              <input class="input_search" style="width:60%" type="text"
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
-            <div class="col-sm-4" v-if="mjshow" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <div class="col-sm-4" v-if="mjshow"
+                 :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
               <label for="f_serial_number" class=" font_normal_body">业务单号</label>
-              <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
+              <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
 
@@ -157,12 +163,13 @@
             </div>
           </div>
           <div v-if="paymentModel.length >1">
-            <div class="row" style="margin-top:10px;" >
-              <p class="col-sm-2 text-left" style="padding: 10px;"><img src="../../../../static/juxing.png"/><strong style="margin-left: 4%">付款明细</strong></p>
+            <div class="row" style="margin-top:10px;">
+              <p class="col-sm-2 text-left" style="padding: 10px;"><img src="../../../../static/juxing.png"/><strong
+                style="margin-left: 4%">付款明细</strong></p>
             </div>
-            <div class="row" style="margin-top:10px;" >
-              <div class="col-sm-4 form-group " v-for="pay in paymentModel" >
-                <label class="font_normal_body">{{pay.f_payment}}:</label>
+            <div class="row" style="margin-top:10px;">
+              <div class="col-sm-4 form-group " v-for="pay in paymentModel">
+                <label class="font_normal_body">{{ pay.f_payment }}:</label>
                 <input id="f_money" type="text" class="input_search" style="width:60%" v-model="pay.f_money">
               </div>
               <div class="col-sm-4 form-group ">
@@ -176,14 +183,17 @@
                     :data='row' @printok="printok" v-ref:printbill></print-bill>
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
-          <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large"
+                  v-if="!config.notShowFormula">计算公式:{{ calculatedetail ? calculatedetail : ' 暂无' }}</strong><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
           </payment-code-button>
-          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='!$v.valid || validateOk || !islegal || clickConfirm'>确认</button>
-          <button class="button_clear btn-gn" @click="clean()" >取消</button>
-                 </div>
+          <button class="button_search btn-gn" @click="checkInvoiceMsg()"
+                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm'>确认
+          </button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
         <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
           <header slot="modal-header" class="modal-header">
             <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
@@ -214,7 +224,7 @@
                   <input class="form-control col-sm-2"
                          v-model="row.f_paper_account" placeholder="购方开户行及账号">
                 </div>
-                <div class="col-sm-12 form-group form-input-group" >
+                <div class="col-sm-12 form-group form-input-group">
                   <label class="control-label">纳税人识别号:</label>
                   <input class="form-control col-sm-2"
                          v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
@@ -239,12 +249,13 @@
             </button>
           </footer>
         </modal>
-        <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
+        <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
 
       </validator>
     </div>
 
-    <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
+    <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>
 </template>
@@ -285,10 +296,10 @@ let preamountGen = async function (self) {
       self.model.f_pregas = Math.floor(getGas.data.gas - 0)
     }
   }
-  self.model.f_totalcost = ((self.row.f_balance - 0) > (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
+  self.model.f_totalcost = ((self.row.f_balance - 0) >= (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
   self.model.chargeprice = getGas.data.chargeprice
   Object.assign(self.model, self.model, getGas.data)
-  self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(2)
+  self.model.f_totalcost = ((self.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(2))
   self.model.f_collection = self.model.f_totalcost
   if (self.config.floor) {
     self.model.f_collection = Math.ceil(self.model.f_collection)
@@ -444,7 +455,7 @@ let asyncShowCardSellGas = async function (self) {
 
 export default {
   title: '发卡售气',
-  data () {
+  data() {
     return {
       serialShow: false,
       resid: [],
@@ -515,7 +526,7 @@ export default {
     }
   },
   props: ['row'],
-  ready () {
+  ready() {
     console.log('==>' + this.$refs.valid)
     if (this.authArr.includes('余额写卡限定')) {
       this.paytype = [{label: '余额写卡', value: '余额写卡'}]
@@ -555,20 +566,20 @@ export default {
   },
   events: {
     // 删除Resid数组元素
-    'delResid' (val) {
+    'delResid'(val) {
       this.resid.$remove({id: val, f_biobid: ''})
       // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
     },
     // 增加Resid数组元素
-    'resid' (val) {
+    'resid'(val) {
       this.resid.push({id: val, f_biobid: ''})
     }
   },
   watch: {
-    'row' (val) {
+    'row'(val) {
       this.model.f_balance = val.f_balance
     },
-    'model.f_payment.length' (val) {
+    'model.f_payment.length'(val) {
       console.log('付款方式多选。。', val)
       if (val > 3) {
         this.$showAlert('目前只支持三种支付方式', 'warning', 2000)
@@ -591,18 +602,18 @@ export default {
         this.getPrivilegeList()
       }
     },
-    'model.f_payment' (val) {
+    'model.f_payment'(val) {
       if (val == '免交') {
         this.mjshow = true
       } else {
         this.mjshow = false
       }
     },
-    'model.f_collection' (val) {
+    'model.f_collection'(val) {
       // 获取计算优惠
       this.getPrivilegeList()
     },
-    '$v' (val) {
+    '$v'(val) {
     },
     '$v': {
       handler: function (val) {
@@ -614,12 +625,12 @@ export default {
       },
       deep: true
     },
-    '$v.f_serial_number.valid' (val) {
+    '$v.f_serial_number.valid'(val) {
     }
   },
   methods: {
     // 校验发票信息
-    checkInvoiceMsg () {
+    checkInvoiceMsg() {
       console.log(this.model.f_print[0])
       if (this.model.f_print[0] === '电子发票') {
         if (!this.row.f_taxpayer_id) {
@@ -639,11 +650,11 @@ export default {
         this.confirm()
       }
     },
-    eticket_toggle () {
+    eticket_toggle() {
       this.eticket_show = false
       this.$dispatch('success')
     },
-    async confirm () {
+    async confirm() {
       this.eticket_msg = false
       if (this.$appdata.getSingleValue('开卡费')) {
         let sql = `select od.* from t_othercharge oc
@@ -690,11 +701,11 @@ export default {
         }
       })
     },
-    clean () {
+    clean() {
       this.$info('取消操作')
       this.$dispatch('refresh', this.row)
     },
-    pregas () {
+    pregas() {
       this.dymoney = 0
       if (this.model.f_pregas && this.model.f_pregas > 0) {
         try {
@@ -713,7 +724,7 @@ export default {
         this.model.f_pregas = 0
       }
     },
-    preamount () {
+    preamount() {
       this.dymoney = 0
       // if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
       // if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
@@ -728,11 +739,11 @@ export default {
       // }
     },
 
-    validateBill (val) {
+    validateBill(val) {
       this.validateOk = !val.isOk
       this.billData.bill = val.bill
     },
-    printok () {
+    printok() {
       // 收据打完，判断是否还有其他票据进行请求
       for (let i = 0; i < this.model.f_print.length; i++) {
         if (this.model.f_print[i] === '电子发票') {
@@ -741,7 +752,7 @@ export default {
       }
       this.$dispatch('success')
     },
-    calText (val) {
+    calText(val) {
       let str = ''
       let num = 0
       val.forEach((item) => {
@@ -764,13 +775,13 @@ export default {
         }
       }
     },
-    close () {
+    close() {
       this.showprint = false
       this.print = false
       this.clean()
     },
     // 根据选择的付款方式 获取优惠列表
-    async getPrivilegeList () {
+    async getPrivilegeList() {
       // 初始化下拉选择列表
       this.privilegeList = [{label: '无优惠', value: '0'}]
       // 初始为无优惠
@@ -796,7 +807,7 @@ export default {
       }
     },
     // 优惠计算
-    async privilegeCalculate () {
+    async privilegeCalculate() {
       // 初始化减免金额
       this.model.f_privilege_money = 0
       this.model.f_after_discount = this.model.f_collection
@@ -837,13 +848,13 @@ export default {
     }
   },
   computed: {
-    'invoice_show_gas' () {
+    'invoice_show_gas'() {
       return this.row.f_collection_type === '按气量' ? '是' : '否'
     },
-    authArr () {
+    authArr() {
       return this.$login.r ? this.$login.r : []
     },
-    'curbalance' () {
+    'curbalance'() {
       if (this.model.f_payment === '赠气') {
         return this.model.f_balance
       }
@@ -857,7 +868,7 @@ export default {
         return this.row.f_balance
       }
     },
-    'islegal' () {
+    'islegal'() {
       if (this.paymentModel.length > 1 && this.model.f_collection) {
         let sum = 0
         this.paymentModel.forEach((res) => {
@@ -875,13 +886,13 @@ export default {
 
 
 <style>
-  input::-webkit-outer-spin-button,
-  input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-  }
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
 
-  input[type="number"] {
-    -moz-appearance: textfield;
-  }
+input[type="number"] {
+  -moz-appearance: textfield;
+}
 </style>
 

package/src/components/chargeBatch/BatchCharge.vue

@@ -254,7 +254,14 @@ export default {
         }
       }
       for (let row of this.owe.rows) {
-        param.chargeUser.push({f_userinfo_id: row.f_userinfo_id, f_collection: row.f_oughtfee_all})
+        param.chargeUser.push({
+          f_userinfo_id: row.f_userinfo_id,
+          f_collection: row.f_oughtfee_all,
+          f_oughtfee: row.f_oughtfee,
+          f_oughtamount: row.f_oughtamount,
+          min_handplan_id: row.min_handplan_id,
+          max_handplan_id: row.max_handplan_id
+        })
       }
       if (this.civill) {
         param = Object.assign(this.civill, param)

package/src/components/revenue/comprehen/ComprehenOperation/removeTable.vue

@@ -158,6 +158,36 @@ export default {
           return
         }
         this.saveobj()
+      } else {
+        //物联网表拆表
+        this.$showMessage(`将生成抄表记录，是否确认`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let data = {
+              downDate: this.$login.toStandardTimeString(),
+              startDate: this.$login.toStandardDateString(),
+              endDate: this.$login.toStandardDateString(),
+              condition: `f_userfiles_id = '${this.row.f_userfiles_id}'`,
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_meternumber: this.row.f_meternumber,
+              f_userinfo_id: this.row.f_userinfo_id,
+              f_userfiles_id: this.row.f_userfiles_id,
+              f_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_meter_type: this.row.f_meter_type,
+              f_meter_classify: this.row.f_meter_type,
+              f_price_id: this.row.f_price_id
+            }
+            //划价
+            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: null,rejectMsg:null }).then((res) => {
+                console.log('划价成功')
+                //保存拆表记录
+                this.saveobj()
+            })
+          } else {
+            //取消
+          }
+        })
       }
     },
     async saveobj () {

package/src/components/webMeter/paramSaveNew/ParamHistory.vue

@@ -18,7 +18,7 @@
         <div class="col-sm-12"  style="height: auto">时间区间2：{{row['readperiodusegasAlarmparam'].bak_val.timesection2||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">区间2用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas2||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">时间区间3：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
-        <div class="col-sm-12"  style="height: auto">区间3用气量：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">区间3用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas3||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas1||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas2||'暂无数据'}}</div>
         <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas3||'暂无数据'}}</div>