sale-client 3.6.563 → 3.6.565

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:31567/', 'http://localhost:8080/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -26,6 +26,18 @@ var devConfig = {
         target: serverRul,
         changeOrigin: true
       },
+      '/api/af-revenue/logic/': {
+        pathRewrite: { '^/api/af-revenue/logic/': '/rs/logic/' },
+        target: serverRul
+      },
+      '/api/af-revenue/report/': {
+        pathRewrite: { '^/api/af-revenue/report/': '/rs/report/' },
+        target: serverRul
+      },
+      '/api/af-revenue/sql/': {
+        pathRewrite: { '^/api/af-revenue/sql/': '/rs/sql/' },
+        target: serverRul
+      },
       '/invoice/rs/logic/getInvoice': {
         target: serverRul
       },
@@ -45,9 +57,6 @@ var devConfig = {
         target: localUrl
       },
       '/invoice': {
-        // pathRewrite: {
-        //   '/invoice/rs/logic': '/logic'
-        // },
         target: serverRul
       },
       '/rs/batchSettlement': {
@@ -113,8 +122,8 @@ var devConfig = {
         target: serverRul
       },
       '/rs': {
-        target: serverRul
-        // changeOrigin: true
+        target: localUrl,
+        changeOrigin: true
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.563",
+  "version": "3.6.565",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "qrcodejs2": "^0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.157",
+    "vue-client": "1.25.38",
     "yarn": "^1.22.10"
   },
   "devDependencies": {

package/src/App.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import Vue from 'vue'
+// import Vue from 'vue'
 
 export default {
   ready () {

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

@@ -92,9 +92,7 @@
         <saletab header="合同查看"  v-if="permission('合同查看')">
           <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
         </saletab>
-        <saletab header="用户重点记录" v-if="permission('用户重点记录')">
-          <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
-        </saletab>
+s
 <!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
 <!--          <supervisory-control :row="row"  ></supervisory-control>-->
 <!--        </saletab>-->

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -66,7 +66,7 @@
                 </div>
               </div>
               <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-show="row.f_devices_type == '报警器'">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-show="row.f_devices_type && row.f_devices_type.includes('报警器')">
                   <label class="font_normal_body">首校日期</label>
                   <datepicker placeholder="首校日期" style="width: 60%"
                               v-model="row.f_firstcheck_date"
@@ -80,7 +80,7 @@
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_rate_flow"
                          placeholder='流量' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type == '切断阀' && devicesinfoShow">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type.includes('切断阀') && devicesinfoShow">
                   <label class="font_normal_body">报废日期</label>
                   <datepicker placeholder="报废日期" style="width: 60%"
                               v-model="row.f_expire_date" disabled
@@ -88,7 +88,13 @@
                               :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type == '报警器' && devicesinfoShow">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type.includes('切断阀') && devicesinfoShow">
+                  <label class="font_normal_body">以表带阀</label>
+                  <v-select :value.sync="row.f_devices_starp" v-model="row.f_devices_starp"
+                            :options='devicesstarp' placeholder='设备类型' :value-single="true"
+                            close-on-select ></v-select>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type && row.f_devices_type.includes('报警器') && devicesinfoShow">
                   <label class="font_normal_body">报废日期</label>
                   <datepicker placeholder="报废日期" style="width: 60%"
                               v-model="row.f_expire_date" disabled
@@ -96,7 +102,7 @@
                               :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-if="row.f_devices_type == '报警器' && devicesinfoShow">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-if="row.f_devices_type && row.f_devices_type.includes('报警器') && devicesinfoShow">
                   <label class="font_normal_body">下次校验</label>
                   <datepicker placeholder="下次校验日期" style="width: 60%"
                               v-model="row.f_nextcheck_date" disabled
@@ -149,6 +155,7 @@ export default {
       imgdelete: '/images/mainicon/deletedevice.png',
       imgadd: '/images/mainicon/adddevice.png',
       devicetypes: this.$appdata.getParam('表具设备类型'),
+      devicesstarp: this.$appdata.getParam('以表带阀'),
       devicesinfoShow: false
     }
   },

package/src/filiale/shimen/GiftFee/icTable.vue

@@ -6,14 +6,14 @@
           <div class="row">
             <div v-if="isGas" class="col-sm-4" :class="[$v.f_pregas.dctest ? 'has-error' : 'has-success']">
               <label class="font_normal_body">赠&emsp;&emsp;气</label>
-              <input class="input_search" style="width:60%" type="number" @blur="pregas"
+              <input class="input_search" style="width:60%" type="number" @blur="pregas" :disabled="isDiBao"
                      v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="赠气量"
                      v-ref:f_pregas>
             </div>
             <div class="col-sm-4" v-if="!isGas">
               <label for="f_preamount" class=" font_normal_body">金&emsp;&emsp;额:</label>
               <input class="input_search" style="width:60%" type="number" min="0" v-model="model.f_preamount"
-                     placeholder="金额">
+                     placeholder="金额" :disabled="isDiBao">
             </div>
           </div>
           <div class="row">
@@ -34,6 +34,7 @@
               <v-select :value.sync="model.f_gift_gas_reason"
                         value-single
                         :options='giftGasReason'
+                        @change="giftGasReasonChange"
                         placeholder='请选择'
                         selected="请选择赠气原因"
                         style="width:60%"
@@ -73,11 +74,21 @@ let otherGasGen = async function (self) {
     f_user_id: self.row.f_user_id,
     version: self.row.version,
     f_times: self.row.cardInfo.Times + 1,
-    f_total_gas: data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
-    f_total_fee: data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
+    f_total_gas: data.f_add_gas === '计入' && self.model.f_gift_gas_reason !== '低保赠气' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
+    f_total_fee: data.f_add_gas === '计入' && self.model.f_gift_gas_reason !== '低保赠气' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
     f_balance_gas: 0,
     f_balance_amount: 0
   }
+  if (self.model.f_gift_gas_reason === '低保赠气') {
+    data.f_curbalance = ((self.row.f_balance - 0) + (self.model.f_preamount)).toFixed(4)
+    data.userinfo = {
+      f_userinfo_id: self.row.f_userinfo_id,
+      version: self.row.userinfo_version,
+      f_balance: ((self.row.f_balance - 0) + (self.model.f_preamount)).toFixed(4)
+    }
+  } else {
+    data.f_times = self.row.cardInfo.Times + 1
+  }
 
   let cardId = self.row.f_card_id
   if (self.row.f_tag && self.row.f_tag !== 'null') {
@@ -88,31 +99,34 @@ let otherGasGen = async function (self) {
 
   // 保存表类型
   data.f_meter_type = self.row.f_meter_type
-  data.f_times = self.row.cardInfo.Times + 1
 
   let result = await self.$resetpost('rs/logic/fedWithgaIc', data, {resolveMsg: null, rejectMsg: '补气报错！！！'})
   try {
-    // 写卡操作
-    let cardParams = await self.$resetpost('rs/logic/stairCard', {
-      data: {
-        f_card_id: cardId + '',
-        f_alias: self.row.f_alias,
-        f_user_id: self.row.f_user_id
-      }
-    }, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
-    // 获取写卡参数
-    let params = self.getWriteCard(cardParams, self.row, data)
-    params.kh = cardId
-    console.log('获取其他补气写卡参数，，', params)
-    let url = 'http://127.0.0.1:8003/WriteGasCard'
-    let cardRes = await self.$resetpost(url, params, {resolveMsg: null, rejectMsg: '补气卡服务错误'})
+    if (self.model.f_gift_gas_reason !== '低保赠气') {
+      // 写卡操作
+      let cardParams = await self.$resetpost('rs/logic/stairCard', {
+        data: {
+          f_card_id: cardId + '',
+          f_alias: self.row.f_alias,
+          f_user_id: self.row.f_user_id
+        }
+      }, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
+      // 获取写卡参数
+      let params = self.getWriteCard(cardParams, self.row, data)
+      params.kh = cardId
+      console.log('获取其他补气写卡参数，，', params)
+      let url = 'http://127.0.0.1:8003/WriteGasCard'
+      let cardRes = await self.$resetpost(url, params, {resolveMsg: null, rejectMsg: '补气卡服务错误'})
 
-    // 卡服务写卡异常，业务逻辑回滚
-    if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
-      throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
+      // 卡服务写卡异常，业务逻辑回滚
+      if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
+        throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
+      } else {
+        await self.$CommonService.updatePassword(self.row, cardRes)
+        self.$showAlert('赠气成功', 'success', 2000)
+        return result.data.id
+      }
     } else {
-      await self.$CommonService.updatePassword(self.row, cardRes)
-      self.$showAlert('赠气成功', 'success', 2000)
       return result.data.id
     }
   } catch (error) {
@@ -145,12 +159,13 @@ export default {
         fillamount: ''
       },
       randomBusinessId: '',
+      isDiBao: false,
       resid: [],  // 存放新增的f_files表中id
       model: {
         f_pregas: 0,
         f_preamount: 0,
         f_reason: '',
-        f_add_gas: '不计入',
+        f_add_gas: '计入',
         f_gift_gas_reason: ''
       },
       config: {
@@ -189,6 +204,15 @@ export default {
     }
   },
   methods: {
+    async giftGasReasonChange () {
+      if (this.model.f_gift_gas_reason === '低保赠气') {
+        this.isDiBao = true
+        this.model.f_pregas = this.$appdata.getSingleValue('低保赠气气量') ? this.$appdata.getSingleValue('低保赠气气量') : 0
+        // 进行划价
+        let getAmount = await this.$CommonService.gasCalculate(this.row, this.model.f_pregas)
+        this.model.f_preamount = getAmount.data.chargenum
+      }
+    },
     getRandomId () {
       this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         let res = Math.random() * 16 | 0

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/bayan/sale'
+import FilialeSale from './filiale/shimen/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Jun 25 17:54:33 CST 2025
-gradle.version=5.2.1