sale-client 3.5.263 → 3.5.264-2

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon May 15 14:28:40 CST 2023
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17:8400']
+const [localUrl, serverRul] = ['http://61.240.138.248:9400', 'http://61.240.138.248:9400']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -8,7 +8,7 @@ var devConfig = {
     hot: true,
     publicPath: baseConfig.output.publicPath,
     historyApiFallback: true,
-    host: '127.0.0.1',
+    host: "127.0.0.1",
     port: 8089,
     open: true,
     stats: {

package/package.json

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

package/src/components/FilesManage/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/components/FilesManage/FileUserAddress.vue

@@ -351,7 +351,7 @@
     },
     methods: {
       async initdata () {
-        this.model.f_address_state = '已通气'
+        this.model.f_address_state = '未通气'
         this.initAreas(this.f_filialeids)
         // 添加特殊地址选省市区
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -205,7 +205,7 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

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

@@ -509,7 +509,7 @@
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
-          payment: '现金缴费',
+          payment: '',
           floor: false,
           overdraftBalance: false // 是否支持系统余额透支
         },

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

@@ -444,7 +444,7 @@
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
-          payment: '现金缴费',
+          payment: '',
           overdraftBalance: false // 是否支持系统余额透支
         },
         model: {

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

@@ -320,7 +320,7 @@
         model: {
           f_purchase: 0,
           f_write_card: '不写卡',
-          f_payment: '现金缴费',
+          f_payment: '',
           f_pregas: '',
           f_preamount: 0,
           f_totalcost: 0,

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

@@ -482,7 +482,7 @@ export default {
       },
       model: {
         f_stairprice_id: '',
-        f_payment: '现金缴费',
+        f_payment: '',
         f_pregas: '',
         f_preamount: 0,
         f_totalcost: 0,

package/src/components/revenue/base/leftview/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
     <safe-check :data="data"></safe-check>

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,13 +414,12 @@
           dep: [],
           user: []
         },
-        config: {
-          examine: false
+        config:{
+          examine: false,
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
-        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -445,8 +444,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -476,7 +475,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -597,9 +596,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
+        console.log("-----------val2:",val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
+        console.log("-----------imgfilename2:",this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -633,17 +632,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        // 抄表员查询条件
-        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if (this.inputtouPerson.length !== 0) {
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g, `'`)
-          str = str.replace(/\[/g, ``)
-          str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
-          // 查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -708,7 +696,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      }
+      },
 
     },
     computed: {

package/src/filiale/gaomi/components/ShowCardSellGas.vue

@@ -372,7 +372,7 @@
         },
         model: {
           f_stairprice_id: '',
-          f_payment: '现金缴费',
+          f_payment: '',
           f_pregas: '',
           f_preamount: 0,
           f_totalcost: 0,

package/src/filiale/huayin/base/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
     <safe-check :data="data"></safe-check>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>

package/src/filiale/kelai/MeterinfoTest.vue

@@ -287,7 +287,7 @@
                         :show-reset-button="true">
             </datepicker>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.fee.required ? 'select-error' : '']">
+          <div class="col-sm-4 form-group" :class="[$m.fee.required ? 'has-error col' : '']">
             <label for="gasmodel" class="font_normal_body">&ensp;垃&ensp;圾&ensp;费</label>
             <v-select :value.sync="row.f_garbage_fee" :options='garbagefee' placeholder='垃圾费' close-on-select
                       :value-single="true"