sale-client 3.6.155 → 3.6.157

package/build/dev-server.js

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

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -5,7 +5,8 @@
         <div class="row">
           <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']">
             <label for="f_user_name" class="font_normal_body">*客户姓名</label>
-            <input type="text" v-model="baseinfo.base.f_user_name" v-validate:f_user_name='{required: true }'
+            <input type="text" v-model="baseinfo.base.f_user_name"
+                   v-validate:f_user_name='()=>getConfigValidate("f_user_name",true)'
                    class="input_search" style="width:60%" placeholder="客户名称" v-next-el="phone">
           </div>
           <div style="" class="col-sm-4 form-group"
@@ -242,7 +243,7 @@
 
   export default {
     title: '基本信息',
-    props: ['baseinfo', 'addressinfo', 'isedit', 'userphonelist'],
+    props: ['baseinfo', 'addressinfo', 'isedit', 'userphonelist', 'formconfig'],
     data () {
       return {
         showselectaddress: false,
@@ -282,6 +283,46 @@
       // this.highMeterPlugin.Stop()
     },
     methods: {
+      getConfigValidate (name, defaultVal) {
+        if (this.formconfig && this.formconfig[name]) {
+          let Validate = {}
+          if (this.formconfig[name].required) {
+            Object.assign(Validate, {required: true})
+          }
+          if (this.formconfig[name].minlength || this.formconfig[name].minlength === 0) {
+            Object.assign(Validate, {minlength: this.formconfig[name].minlength})
+          }
+          if (this.formconfig[name].maxlength) {
+            Object.assign(Validate, {maxlength: this.formconfig[name].maxlength})
+          }
+          console.log("==================",Validate)
+          return Validate
+        } else if (defaultVal) {
+          return {required: defaultVal}
+        }
+        return {}
+      },
+      getConfigShowItem (name) {
+        if (this.formconfig && this.formconfig[name]) {
+          return this.formconfig[name].showItem
+        } else {
+          return false
+        }
+      },
+      getConfigLabelName (name) {
+        if (this.formconfig && this.formconfig[name]) {
+          return this.formconfig[name].labelName
+        } else {
+          return ''
+        }
+      },
+      getConfigPlaceholder (name) {
+        if (this.formconfig && this.formconfig[name]) {
+          return this.formconfig[name].placeholder
+        } else {
+          return ''
+        }
+      },
       selectaddress () {
         this.showselectaddress = true
         this.isSelect = true

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -10,7 +10,7 @@
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
           <button class="button_search" style="width: max-content" @click="openBankAccount()" v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户</button>
         </div>
-        <file-user-essential-info :usertype="row?row.f_user_type:null" :userphonelist="data.baseinfo.userphonelist" :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
+        <file-user-essential-info :formconfig="config.fileUserEssentialInfo" :usertype="row?row.f_user_type:null" :userphonelist="data.baseinfo.userphonelist" :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
                              @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info>
         <file-userinfo-device :userinfodevices.sync="userinfodevices" :show_userinfodevices.sync="show_userinfodevices"
                                    :userinfoid='data.baseinfo.base.f_userinfo_id'></file-userinfo-device>
@@ -115,6 +115,17 @@ import UserPaperInfoTest from './UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
 import * as Util from '../../Util'
 
+let getConfigScope = async function (self, name) {
+  try {
+    let res = await self.$resetget('/rs/vue/' + name + '.json', {resolveMsg: null, rejectMsg: null, newly: true})
+    self.config[name] = res.data
+  } catch (error) {
+    // 忽略704,文件找不到异常
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()
   try {
@@ -154,7 +165,11 @@ export default {
         f_building_suffix: '栋',
         f_unit_suffix: '单元',
         f_floor_suffix: '层',
-        f_room_suffix: '室'
+        f_room_suffix: '室',
+        fileUserEssentialInfo: {},
+        fileUserinfoDevice: {},
+        fileUserMeterInfo: {},
+        userPaperInfo: {}
       },
       data: {
         baseinfo: {
@@ -229,9 +244,20 @@ export default {
     }
   },
   async ready () {
-    if (this.data.baseinfo.base.f_userinfo_id){
+    try {
+      console.log('开始获取配置文件')
+      // 获取配置文件 用来展示字段是否展示 是否必填
+      await getConfigScope(this, 'fileUserEssentialInfo')
+      await getConfigScope(this, 'fileUserinfoDevice')
+      await getConfigScope(this, 'fileUserMeterInfo')
+      await getConfigScope(this, 'userPaperInfo')
+    } catch (e) {
+      console.warn(e)
+      console.warn('获取展示配置失败，按照默认展示')
+    }
+    if (this.data.baseinfo.base.f_userinfo_id) {
       this.blodid = this.data.baseinfo.base.f_userinfo_id
-    }else {
+    } else {
       this.blodid = '临时id' + Date.now()
     }
     console.log('ready，，，', this.row)
@@ -242,7 +268,7 @@ export default {
             // 将小区信息转化为综合信息的格式
       await this.areainfoInUser(this.areainfo)
     }
-    console.log('this.blodid------------>',this.blodid)
+    console.log('this.blodid------------>', this.blodid)
   },
   watch: {
     async 'row' (val) {

package/src/components/chargeBatch/BatchCharge.vue

@@ -291,7 +291,7 @@ export default {
         let batch = await this.$resetpost('rs/logic/asyncbatchPaymentSellinggas', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
         batchId = param.f_batch_id = batch.data.f_batch_id
         // 处理记录明细抄表明细
-        await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        // await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
       } else {
         try {
           await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)

package/src/components/chargeBatch/ReissueBillBatch.vue

@@ -33,6 +33,7 @@
         messText: '',
         bill: {data: ''},
         sellingData: [],
+        timeOut: this.$appdata.getSingleValue('打印票据间隔时间') ? this.$appdata.getSingleValue('打印票据间隔时间') : 1000,
         printControl: null
       }
     },
@@ -61,8 +62,15 @@
           for (let row of this.sellingData) {
             let bill = await this.$resetpost(this.data.billUrl, {data: {condition: row.id, operator: `'${this.data.f_operator}'`}}, {resolveMsg: null})
             this.bill.data = bill.data
-            await this.$nextTick()
-            await this.asyncPrint(select)
+            await new Promise(resolve => {
+              this.$nextTick(() => {
+                setTimeout(() => {
+                  // 在延迟后执行打印操作
+                  this.asyncPrint(select)
+                  resolve()
+                }, parseInt(this.timeOut)) // 延迟1秒钟打印下一张票据，可以根据需要调整延迟时间
+              })
+            })
             this.printControl = null
           }
           this.$dispatch('reissue-success')

package/src/filiale/alashan/EticketManage.vue

@@ -0,0 +1,60 @@
+<template>
+  <tab-button v-ref:list>
+    <tabs header="开票记录">
+      <e-ticket-record-list></e-ticket-record-list>
+    </tabs>
+<!--    <tabs header="物联网表结算">-->
+<!--      <e-ticket-open-iot></e-ticket-open-iot>-->
+<!--    </tabs>-->
+<!--    <tabs header="卡表结算">-->
+<!--      <e-ticket-open-card></e-ticket-open-card>-->
+<!--    </tabs>-->
+<!--    <tabs header="抄表结算">-->
+<!--      <e-ticket-open-hand></e-ticket-open-hand>-->
+<!--    </tabs>-->
+    <tabs header="自定义开票">
+      <cust-query-eticket></cust-query-eticket>
+    </tabs>
+  </tab-button>
+</template>
+
+<script>
+import TabButton from '../../components/revenue/comprehen/common/TabButton'
+import Tabs from '../../components/revenue/comprehen/common/Tabs'
+export default {
+  name: 'eticket',
+  title: '发票管理',
+  components: { Tabs, TabButton },
+  data () {
+    return {// 页面开关
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [true]
+    }
+  },
+  ready () {},
+  methods: {
+    cancel (obj) {
+      this.listpage = true
+    },
+    dealMsg (obj) {
+      this.rowData = obj
+      this.listpage = false
+      console.log(obj.model)
+      this.f_start_date = obj.model.startDate
+      this.f_end_date = obj.model.endDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/alashan/sale.js

@@ -12,4 +12,7 @@ export default function () {
   // 票据补打
   Vue.component('reissue-bill', (resolve) => { require(['./ReissueBill'], resolve) })
   Vue.component('file-user-device-info', (resolve) => { require(['./UserDeviceInfoTest'], resolve) })
+
+  // 电子发票管理
+  Vue.component('e-ticket-manage', (resolve) => { require(['./EticketManage'], resolve) })
 }

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -226,6 +226,7 @@ export default {
   },
   ready () {
     this.getfield = this.config.excelHeaders
+    this.$refs.paged.$refs.cri.model.oughtfee = ['> 0']
     // this.search()
     this.readCiTiaoCard()
   },

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/qianneng/sale'
+import FilialeSale from './filiale/lixianV3/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'