sale-client 3.6.153 → 3.6.155

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/']
 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.153",
+  "version": "3.6.155",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

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

@@ -26,7 +26,7 @@
             <div class="col-sm-4" v-if="row.f_collection_type == '按金额'">
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" v-el:fpregas
-                     @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
+                     @keyup.enter="pregas('enter')"    @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
                      v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
                      v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
             </div>
@@ -510,6 +510,7 @@
           calculatePreByCollection: false, // 可以更具收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
+          quickSale: false,
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
@@ -759,7 +760,7 @@
       printok () {
         this.$dispatch('success', '卡表收费')
       },
-      pregas () {
+      pregas (val) {
         this.dymoney = 0
         if (this.model.f_pregas && this.model.f_pregas > 0) {
           try {
@@ -769,6 +770,9 @@
               this.model.f_pregas = null
             } else {
               pregasGen(this)
+              if (this.config.quickSale) {
+                this.$els.fcollection.focus()
+              }
             }
           } catch (error) {
             this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)

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

@@ -36,7 +36,7 @@
             <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%" @blur="preamount()" type="number" v-model="model.f_preamount" id="f_preamount"
+              <input class="input_search" style="width:60%" @keyup.enter="preamount()" @blur="preamount()" type="number" v-model="model.f_preamount" id="f_preamount"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
                      :disabled="config.calculatePreByCollection"
                      v-scale="[model.f_preamount, row.f_fee_decimal||4]" placeholder="预购金额" >
@@ -110,7 +110,8 @@
               <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection">
+                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
+                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection && !config.quickSale">
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -470,6 +471,7 @@
           priceCalculation: false, // 划气量控制
           showupload: true,  // 默认显示附件上传组件
           hasPrint: false,  // 默认打票
+          quickSale: false,  // enter键快捷收费
           taxforidnumber: true,  // 身份证号同步到纳税人识别号
           floor: true,  // 是否取整收费
           hasBillManage: false,  // 默认不启用发票管理
@@ -653,31 +655,35 @@
         })
       },
       // 校验发票信息
-      checkInvoiceMsg () {
+      checkInvoiceMsg (flag) {
+        if (flag) return
+        if (this.config.quickSale) {
         // 校验是否超出最大透支余额
-        if (this.model.f_payment == '系统余额透支') {
-          const maxOverdraftBalance = -(((this.$appdata.getSingleValue('最大透支余额') - 0) || 1000) - 0)
-          const curSysBalance = ((this.row.f_sys_balance || 0) - 0) - (this.model.f_totalcost - 0)
-          if (curSysBalance < maxOverdraftBalance) {
-            this.$showAlert('您的系统余额将超出最大透支余额，请使用别的付款方式！', 'danger', 5000)
-            return
+          if (this.model.f_payment == '系统余额透支') {
+            const maxOverdraftBalance = -(((this.$appdata.getSingleValue('最大透支余额') - 0) || 1000) - 0)
+            const curSysBalance = ((this.row.f_sys_balance || 0) - 0) - (this.model.f_totalcost - 0)
+            if (curSysBalance < maxOverdraftBalance) {
+              this.$showAlert('您的系统余额将超出最大透支余额，请使用别的付款方式！', 'danger', 5000)
+              return
+            }
+            this.model.f_sys_balance = curSysBalance
           }
-          this.model.f_sys_balance = curSysBalance
-        }
 
-        if (this.model.f_print[0] === '电子发票') {
-          if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
-            this.row.f_taxpayer_id = this.row.f_idnumber
-          }
-          if (!this.row.f_paper_name) {
-            this.row.f_paper_name = this.row.f_user_name
-          }
-          if (!this.row.f_address_phone) {
-            this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+          if (this.model.f_print[0] === '电子发票') {
+            if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
+              this.row.f_taxpayer_id = this.row.f_idnumber
+            }
+            if (!this.row.f_paper_name) {
+              this.row.f_paper_name = this.row.f_user_name
+            }
+            if (!this.row.f_address_phone) {
+              this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+            }
+            this.eticket_msg = true
+          } else {
+            this.confirm()
           }
-          this.eticket_msg = true
-        } else {
-          this.confirm()
+
         }
       },
       eticket_toggle () {
@@ -686,9 +692,9 @@
       },
       async confirm () {
         let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行物联网表缴费吗？`, ['confirm', 'cancel'])
-        this.clickConfirm = true
         if (res != 'confirm') return
         // 先调用付款码支付组件流程
+        this.clickConfirm = true
         let ss = await this.$refs.paymentcode.flowPath()
         this.$refs.paymentcode.paymentCodeShow = false
         console.log('付款码操作返回', ss)
@@ -740,6 +746,9 @@
         if (this.model.f_preamount && this.model.f_preamount > 0) {
           try {
             preamountGen(this)
+            if (this.config.quickSale) {
+              this.$els.sk.focus()
+            }
           } catch (error) {
             this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
             this.$dispatch('error', '发卡售气', this.model, error)

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

@@ -78,6 +78,10 @@
           <div class="col-sm-3">
             <p class="form-control-static">{{row.f_people_num}}</p>
           </div>
+          <label class="col-sm-3 control-label">备用电话</label>
+          <div class="col-sm-3">
+            <p class="form-control-static">{{row.f_rent_phone}}</p>
+          </div>
         </div>
       </form>
     </div>

package/src/components/revenue/Common/PrintBill.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="auto form-horizontal" >
-    <modal :show.sync="show &&!billConfig.autoPrint"  v-ref:modal large backdrop="false">
+    <modal :show.sync="show&&!billConfig.autoPrint"  v-ref:modal large backdrop="false">
       <header slot="modal-header" class="modal-header">
         <h3 style="color:black" class="modal-title">收费发票</h3>
       </header>
@@ -46,8 +46,10 @@
     console.log('self.billData.url:', self.billData.url)
     self.bill = new DataModel(self.billData.url, temp)
     await self.bill.search(self.data.id)
+    console.log(222)
     // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
+    self.model.f_using_number = self.billData.number
+    console.log(333)
   }
 
   export default {
@@ -106,6 +108,7 @@
       'show' (val) {
         if (val) {
           getBillData(this, val).then(() => {
+            console.log(444)
             if(this.billConfig.autoPrint){
               this.print()
             }

package/src/components/revenue/comprehen/Maintenance/pictureManage/pictureListMaintain.vue

@@ -310,7 +310,7 @@ const myMap = new Map()
 
                 if (res.data.array[j].uploadday == this.files[i].days) {
                   // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-                  if (res.data.array[j].fusetype && res.data.array[j].f_filetype.includes('xls')) {
+                  if ((res.data.array[j].fusetype && res.data.array[j].f_filetype.includes('xls')) || (res.data.array[j].fusetype == '安检照片' && res.data.array[j].f_filename.includes('amr'))) {
                     res.data.array[j].splice(i, 1)
                     i--
                     continue

package/src/filiale/liaoyuan/ChargeList.vue

@@ -105,6 +105,12 @@
               <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
                      condition="f_card_id like '%{}%'">
             </div>
+
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">身份证号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_idnumber" placeholder='身份证号'
+                     condition="f_idnumber = '{}'">
+            </div>
           </div>
           <div class="form-group col-sm-4" style="float:right;white-space: nowrap;width: auto">
             <read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn" v-if="!$parent.$parent.noRead" v-ref:readcard></read-card>
@@ -136,7 +142,7 @@
           <td  :class="{'bg-danger' : (row.f_table_state === '停用' || row.f_user_state === '销户') }"><nobr>
             <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
-          <td style="white-space: nowrap;" :class="{'bg-danger' : (row.f_table_state === '停用' || row.f_user_state === '销户') }">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</td>
+          <td style="white-space: nowrap;" :class="{'bg-danger' : (row.f_table_state === '停用' || row.f_user_state === '销户') }">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}&nbsp;&nbsp;{{row.f_idnumber}}</td>
           <td style="white-space: nowrap;" :class="{'bg-danger' : (row.f_table_state === '停用' || row.f_user_state === '销户') }">{{row.f_user_id}}&nbsp;&nbsp;{{row.f_gasproperties}}&nbsp;&nbsp;{{row.f_meter_brand}}
             &nbsp;&nbsp;{{row.f_meter_style}}&nbsp;&nbsp;{{row.f_price_type}}&nbsp;&nbsp;{{row.f_price_name}}
           </td>