sale-client 3.5.267 → 3.5.268

package/.project

@@ -5,7 +5,30 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1671099057782</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

package/build/dev-server.js

@@ -1,81 +1,82 @@
-var path = require('path')
-const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    port: 8089,
-    open: true,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/rs/file': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+const [localUrl, serverRul] = ['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 = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: true,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/rs/file': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

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

@@ -252,7 +252,7 @@
         costtype: this.$appdata.getParam('付款类型'),
         usernature: this.$appdata.getParam('用户性质'),
         userlevel: this.$appdata.getParam('用户等级'),
-        housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+        housetype: this.$appdata.getParam('房屋类型'),
         jurisdiction: this.$login.r,
         edituserstate: false,
         // highMeterPlugin: {},

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -372,7 +372,6 @@ let meterBookGen = function * (self) {
       this.oldrow = this.row
       this.isdecimal = this.row.gasbrand.length > 0 ? this.row.gasbrand.f_isdecimal : '否'
       this.row.valid = false
-      this.row.f_aroundmeter = '左表'
       if (this.row.pricetype === '混合气价') {
         this.ratioshow = true
       }

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -236,7 +236,7 @@
           costtypes: this.$appdata.getParam('缴费类型'),
           banknames: this.$appdata.getParam('银行名称'),
           userstates: [{label: '预备', value: '预备'}],
-          housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+          housetype: this.$appdata.getParam('房屋类型'),
           mgq: this.$appdata.getParam('是否煤改气'),
           costtype: this.$appdata.getParam('付款类型'),
           printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')]:[{label: '暂不选择', value: '暂不选择'}],

package/src/components/charge/ChargeOper.vue

@@ -19,6 +19,7 @@
 import {HttpResetClass} from 'vue-client'
 
 let getNewmetermsg = async function (self, row) {
+  self.cardInfo = undefined
   if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
     // 获取用户信息
     let getUser = await self.$resetpost('rs/sql/sale_getUser', {
@@ -111,12 +112,11 @@ let getBtnsGen = async function (self) {
             })
           } else {
           }
-
         }
       }
     }
     // 如果卡上有气，添加购气撤销按钮
-    if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是')) {
+    if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
       self.temp.push({
         name: '购气撤销',
         value: {

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

@@ -481,7 +481,7 @@
         this.pregas()
       },
       pregas () {
-        if (this.model.f_pregas && this.model.f_pregas >= 0) {
+        if (this.model.f_pregas >= 0) {
           try {
             pregasGen(this)
           } catch (error) {

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

@@ -209,7 +209,6 @@
    */
 
   import {HttpResetClass} from 'vue-client'
-  import XML from '../../../plugins/ObjTree'
 
   // 输入金额，换算气量
 /*  let preamountGen = async function (self) {
@@ -445,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/chargeNew/ChargeOper.vue

@@ -99,7 +99,7 @@
         }
       }
       // 如果卡上有气，添加购气撤销按钮
-      if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase == '是')) {
+      if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
         self.temp.push({name: '购气撤销',
           value: {
             'weight': 0,

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -91,8 +91,8 @@
               <th>
                 <nobr>上期结余</nobr>
               </th>
-              <th>
-                <nobr v-if="!$parent.$parent.$parent.isIot">应交金额</nobr>
+              <th v-if="!$parent.$parent.$parent.isIot">
+                <nobr>应交金额</nobr>
               </th>
               <th>
                 <nobr>实收金额</nobr>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <!--<cardinfo :data="cardData" v-if="cardData.CardID"></cardinfo>-->
-    <userinfo :warninginfo="warninginfo" @deal-msg="dealMsg" :data="data"></userinfo>
+    <sale-userinfo :warninginfo="warninginfo" @deal-msg="dealMsg" :data="data"></sale-userinfo>
     <user-meterinfodetail @deal-msg="dealMsg" :data="data"></user-meterinfodetail>
     <!--<meter-use :data="data"></meter-use>-->
     <!--<recordstoryinfo :data="data" v-ref:recordstoryinfo></recordstoryinfo>-->

package/src/components/revenue/base/rightview/RecordCancel.vue

@@ -244,6 +244,8 @@
           name = 'otherchargenopayCancel'
         } else if (type === '批量收费' || type === '团体收费') {
           name = 'batchPaymentCancel'
+        } else if (type === '垃圾费收费') {
+          name = 'garbageChargesCancel'
         } else {
           return
         }

package/src/components/revenue/batchPreloads/batchPreloadsList.vue

@@ -57,6 +57,7 @@
           <th>用户姓名</th>
           <th>用气性质</th>
           <th>收费金额</th>
+          <th>付款方式</th>
           <th>收费时间</th>
           <th>记录状态</th>
           <th>生成记录人员</th>
@@ -70,6 +71,7 @@
         <td>{{ row.f_user_name }}</td>
         <td>{{ row.f_gasproperties }}</td>
         <td>{{ row.f_collection }}</td>
+        <td>{{ row.f_payment }}</td>
         <td>{{ row.f_operate_date }}</td>
         <td>{{ row.f_state }}</td>
         <td>{{ row.f_operator }}</td>
@@ -222,4 +224,11 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.table_sy {
+  tr {
+    td {
+      text-align: center;
+    }
+  }
+}
 </style>

package/src/components/revenue/cardHandManage/cardHandManager.vue

@@ -1,8 +1,8 @@
 <template>
   <tab-button v-ref:list>
-    <tabs header="计划下发">
-      <card-down></card-down>
-    </tabs>
+<!--    <tabs header="计划下发">-->
+<!--      <card-down></card-down>-->
+<!--    </tabs>-->
     <tabs header="卡表抄表">
       <cards-hand></cards-hand>
     </tabs>

package/src/components/revenue/comprehen/Bill/Eticket/EticketCommon.vue

@@ -0,0 +1,63 @@
+<template>
+<!--    <div v-if="listpage">-->
+  <tab-button v-ref:list>
+    <tabs header="发票管理">
+      <e-ticket-manage @deal-msg="dealMsg"></e-ticket-manage>
+    </tabs>
+    <tabs header="抬头录入">
+      <company-info-manage @deal-msg="dealMsg"></company-info-manage>
+    </tabs>
+    <tabs header="商品信息录入">
+      <goods-info-manage @deal-msg="dealMsg"></goods-info-manage>
+    </tabs>
+  </tab-button>
+<!--    </div>-->
+<!--    <div v-if="!listpage">-->
+<!--      <meter-info-manage :row="rowData" :f_start_date="f_start_date" :f_end_date="f_end_date"></meter-info-manage>-->
+<!--    </div>-->
+</template>
+
+<script>
+import TabButton from '../../common/TabButton.vue'
+import Tabs from '../../common/Tabs.vue'
+
+export default {
+  name: 'EticketCommon',
+  title: '发票公共管理',
+  data () {
+    return {// 页面开关
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [true]
+    }
+  },
+  components: {Tabs, TabButton},
+  ready () {
+    console.log(this.$refs.list)
+    console.log('发票管理')
+  },
+  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/components/revenue/comprehen/Bill/Eticket/EticketManage.vue

@@ -24,7 +24,7 @@ import Tabs from '../../../comprehen/common/Tabs'
 export default {
   name: 'eticket',
   title: '发票管理',
-  components: {Tabs, TabButton },
+  components: { Tabs, TabButton },
   data () {
     return {// 页面开关
       f_start_date: '',

package/src/components/revenue/comprehen/Bill/paper/BillList.vue

@@ -149,7 +149,6 @@
           f_outlets: this.$login.f.f_parentname,
           f_orgstr: this.$login.f.orgpathstr,
           f_filialeids: this.$login.f.orgid
-
         },
         billstate: [{label: '全部', value: ''}, {label: '启用', value: '启用'}, {label: '停用', value: '停用'}],
         billusers: this.$appdata.getParam('票据使用人')

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -552,16 +552,18 @@ export default {
     },
     async confirm () {
       let msg = ''
-      if (this.row.f_meter_type.includes('机表')) {
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
         if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
-          msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
+          msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
         }
       }
-      if (this.row.f_meter_type.includes('机表') && msg) {
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
+            debugger
+            let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
             let data = {
               downDate: this.$login.toStandardTimeString(),
               startDate: this.$login.toStandardDateString(),
@@ -575,9 +577,10 @@ export default {
               f_serial_number: this.model.f_serial_number,
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
               f_price_id: this.row.f_price_id
             }
-            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
+            this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
               if (this.model.metermessage.f_meter_type[0] != '机表') {
                 this.$dispatch('refresh')
@@ -721,16 +724,17 @@ export default {
         this.Iotjisuan()
       }
       let msg = ''
-      if (this.row.f_meter_type.includes('机表')) {
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
         if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
-          msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
+          msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
         }
       }
-      if (this.row.f_meter_type.includes('机表') && msg) {
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
+            let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
             let data = {
               downDate: this.$login.toStandardTimeString(),
               startDate: this.$login.toStandardDateString(),
@@ -744,11 +748,16 @@ export default {
               f_serial_number: this.model.f_serial_number,
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
               f_price_id: this.row.f_price_id
             }
-            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
+            this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
-              this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              if (this.row.f_meter_type.includes('物联网表')) {
+                this.$dispatch('refresh')
+              } else {
+                this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              }
             })
           }
         })

package/src/components/revenue/comprehen/StairPrice/GasPriceManage.vue

@@ -10,7 +10,6 @@
     <div class="binary-right" v-if="usershow" :style="{width: usershow ? '50%' : 'auto'}">
       <gasprice-user :priceid="priceid" :pricename="pricename" :priceorgid="priceorgid"></gasprice-user>
     </div>
-
   </div>
   <div v-if="!listpage">
 <!--    <user-info-detail-manage :f_userinfo_id="f_userinfo_id" @cancel-main="cancel" ></user-info-detail-manage>-->
@@ -30,7 +29,6 @@ let readGen = async function (self) {
     Object.assign(self.config, self.config, getConfig.data)
   }
 }
-
 export default {
   title: '气价管理',
   data () {
@@ -52,7 +50,6 @@ export default {
       priceorgid: '',
       gasPriceShow: false,
       usershow: false,
-
       // 控制气价信息界面和变更操作记录界面的展示
       changeView: false
     }

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -327,6 +327,8 @@ export default {
       this.$LogicService.modifyGasBrand(this.model, this.addGasModelArray)
       .then(
         (res) => {
+          let http = new HttpResetClass()
+          http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})
           this.$dispatch('success', '气表品牌修改', this.data, res)
         }
       ).catch(

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

@@ -778,8 +778,8 @@
             'f_operator': '操作员',
             'f_depname': '部门',
             'f_orgname': '公司',
-            'f_surplus_gas': '剩余气量',
-            'f_haircut_gas': '扣减气量',
+            // 'f_surplus_gas': '剩余气量',
+            // 'f_haircut_gas': '扣减气量',
             'f_stair1amount': '一阶气量',
             'f_stair1price': '一阶单价',
             'f_stair1fee': '一阶气费',