sale-client 3.6.381 → 3.6.382

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://192.168.50.67:30785/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -42,7 +42,7 @@ var devConfig = {
         target: serverRul
       },
       '/rs/sql/singleTable': {
-        target: serverRul
+        target: localUrl
       },
       '/invoice': {
         target: serverRul
@@ -96,6 +96,9 @@ var devConfig = {
       '/rs/logic': {
         target: localUrl
       },
+      '/rs/entity': {
+        target: localUrl
+      },
       '/rs/sql': {
         target: localUrl
       },

package/package.json

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

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -63,6 +63,7 @@
                   <!--                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"-->
                   <!--                         placeholder='安装人'>-->
                   <v-select :value.sync="row.f_input_person" v-model="row.f_input_person"
+                            :value-single="true"
                             :options='installperson' placeholder='安装人'
                             close-on-select></v-select>
                 </div>

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -35,7 +35,7 @@ export default {
         devicesinfo: [],
         show_devices: false,
         fireinfo: {},
-        f_input_person: [],
+        f_input_person: '',
         show_fire: false,
         imgdelete: '/images/mainicon/deletedevice.png',
         imgsrc: '/images/mainicon/biaopan.png',
@@ -111,7 +111,7 @@ export default {
         this.devicesinfo = []
         this.devicesinfo = row.devicesinfo
         if (row.f_install_person && row.f_install_person[0]) {
-          this.f_input_person = row.f_install_person[0]
+          this.f_input_person = row.f_install_person
         }
         this.devicesinfo.forEach((row) => {
           row.devicetypes = this.$appdata.getParam('设备类型')

package/src/components/charge/business/refund/IOTRefund.vue

@@ -27,6 +27,15 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
           <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
             <label class="font_normal_body">剩余气量</label>
             <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_gas" readonly>
@@ -120,6 +129,7 @@
         },
         model: {
           f_refund_fee: '',
+          f_add_gas: '计入',
           f_refund_gas: '',
           f_comments: '',
           f_payment: '',
@@ -132,7 +142,7 @@
         randomBusinessId: '',
         resid: [],  // 存放新增的f_files表中id
         validateOk: false,
-
+        addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
         printModel: {},
         print: false,
         billUrl: '',
@@ -185,6 +195,7 @@
           f_userfiles_id: this.data.f_userfiles_id,
           version: this.data.version,
           f_price: this.model.f_price,
+          f_add_gas: this.model.f_add_gas,
           f_refund_gas: this.model.f_refund_gas,
           f_refund_fee: this.model.f_refund_fee,
           f_comments: this.model.f_comments,
@@ -204,6 +215,10 @@
             f_depname: this.$login.f.deps
           }
         }
+        if (this.model.f_add_gas !== '计入') {
+          param.f_total_fee = this.data.f_total_fee
+          param.f_total_gas = this.data.f_total_gas
+        }
         console.log('退费传参', param)
         let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
         console.log('退费', res)

package/src/components/charge/business/refund/machineRefund.vue

@@ -26,7 +26,15 @@
                                   close-on-select clear-button>
                         </v-select>
                     </div>
-
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+                    <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+                    <v-select :value.sync="model.f_add_gas" value-single
+                              :options='addGas' placeholder='请选择'
+                              selected="是否计入累购"
+                              style="width:60%"
+                              close-on-select></v-select>
+                  </div>
                     <div class="col-sm-4 form-group">
                         <label class="font_normal_body">剩余金额</label>
                         <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
@@ -90,18 +98,19 @@
             showupload: false, // 默认不上传附件
             hasPrint: false,  // 默认打票
             hasBillManage: false,  // 默认不启用发票管理
-            overBalance: false,   //为true时退费金额可以大于余额
+            overBalance: false,   // 为true时退费金额可以大于余额
             printType: '普通收据', // 收据/电子票/专用发票/国税发票
             payment: '现金缴费',
             billType: '燃气费'
           },
           model: {
             f_refund_fee: '',
+            f_add_gas: '计入',
             f_comments: '',
             f_payment: '',
             f_print: ''
           },
-
+          addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
           blodid: '',
           hasValidateBill: false,
           randomBusinessId: '',
@@ -155,13 +164,13 @@
             f_user_id: this.data.f_user_id,
             f_userfiles_id: this.data.f_userfiles_id,
             version: this.data.version,
-            f_refund_fee: this.model.f_refund_fee,
+            f_refund_fee: (this.model.f_refund_fee - 0),
             f_comments: this.model.f_comments,
             f_payment: this.model.f_payment[0],
             f_print: this.model.f_print[0],
             f_price_id: this.data.f_price_id,
-
-            f_total_fee: this.data.f_total_fee,
+            f_add_gas: this.model.f_add_gas,
+            f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
             f_stairprice_id: this.data.f_stairprice_id,
             operInfo: {
               f_operator: this.$login.f.name,
@@ -172,7 +181,9 @@
               f_depname: this.$login.f.deps
             }
           }
-
+          if (this.model.f_add_gas !== '计入') {
+            param.f_total_fee = this.data.f_total_fee
+          }
           let res = await this.$resetpost('rs/logic/machineRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
           console.log('机表退费返回的数据==========>', res)
           let param1 = []

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -20,6 +20,16 @@
 <!--              </v-select>-->
 <!--            </div>-->
           </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
           <div class="row" v-if="!isGas">
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">金额:</label>
@@ -131,8 +141,8 @@
         model: {
           f_pregas: 0,
           f_preamount: 0,
-          f_reason: ''
-          // f_add_gas: '不计入'
+          f_reason: '',
+          f_add_gas: '不计入'
         },
         print: false
       }
@@ -191,10 +201,10 @@
           f_curbalance: this.row.f_balance,
           f_card_id: this.row.f_card_id,
           f_comments: this.model.f_reason,
-          f_add_gas: '计入',
           f_type: this.model.f_pregas != 0 ? '卡表赠气' : '卡表赠费',
           f_user_id: this.row.f_user_id,
           f_userfiles_id: this.row.f_userfiles_id,
+          f_add_gas: this.model.f_add_gas,
           f_userinfo_id: this.row.f_userinfo_id,
           f_user_name: this.row.f_user_name,
           f_user_type: this.row.f_user_type,

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -18,6 +18,16 @@
                       style="width:60%"
                       close-on-select></v-select>
           </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
           <div class="col-sm-4 form-group"></div>
 
           <div v-if="this.row.f_collection_type==='按金额'" class="col-sm-4 form-group"
@@ -52,13 +62,17 @@
     <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
   </div>
   <upload :blodid="row.f_userinfo_id"  v-ref:upload  :businessid="randomBusinessId"  :isremark="true" fusetype="赠气"></upload>
-
 </template>
-
-
 <script>
   import Vue from 'vue'
-
+  let readyGen = async function (self) {
+    await self.$getConfig(self, 'iotTable')
+    if (self.config.addgas) {
+      self.model.f_add_gas = '计入'
+    } else {
+      self.model.f_add_gas = '计入'
+    }
+  }
 export default {
     title: '赠气赠费',
     data () {
@@ -66,6 +80,7 @@ export default {
         blodid: '',
         showupload: false,
         randomBusinessId: '',
+        addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
         resid: [],  // 存放新增的f_files表中id
         operator_type: [{label: '赠费', value: '物联网赠费'}],
         operator_type2: [{label: '赠气', value: '物联网赠气'}],
@@ -73,7 +88,7 @@ export default {
           f_operat_type: '',
           f_pregas: 0,
           f_preamount: 0,
-
+          f_add_gas: '计入',
           f_comments: ''
         }
 
@@ -81,6 +96,7 @@ export default {
     },
     props: ['row'],
     ready () {
+      readyGen(this)
       // this.blodid = this.row.f_userinfo_id
       this.getRandomId()
       if (this.row.f_collection_type === '按气量') {
@@ -116,6 +132,7 @@ export default {
             f_user_id: this.row.f_user_id,
             f_user_name: this.row.f_user_name,
             f_user_type: this.row.f_user_type,
+            f_add_gas: this.model.f_add_gas,
             f_gasproperties: this.row.f_gasproperties,
             f_meter_type: this.row.f_meter_type,
             f_pregas: this.model.f_pregas,

package/src/components/revenue/comprehen/ComprehenOperation/removeTable.vue

@@ -211,6 +211,7 @@ export default {
         f_userinfo_id: this.row.f_userinfo_id,
         f_user_name: this.row.f_user_name,
         f_operat_type: '拆表',
+        f_operate_type: '拆表',
         f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行拆表操作`,
         f_state: '有效',
         f_comments: this.model.f_reason,

package/src/components/revenue/comprehen/ComprehenOperation/removeTableCancel.vue

@@ -111,8 +111,8 @@ export default {
         f_user_id: this.row.f_user_id,
         f_userinfo_id: this.row.f_userinfo_id,
         f_user_name: this.row.f_user_name,
-        f_operat_type: '复拆表',
-        f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行复拆表操作`,
+        f_operat_type: '表具复位',
+        f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行表具复位操作`,
         f_state: '有效',
         f_operator: this.$login.f.name,
         f_operatorid: this.$login.f.id,

package/src/filiale/qingjian/IOTRefund.vue

@@ -0,0 +1,424 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
+            <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+             <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
+              <v-select v-model="f_payment"
+                        placeholder='请选择'
+                        style="width:60%"
+                        :value.sync="model.f_payment"
+                        :options='paytype'
+                        v-ref:payment
+                        close-on-select clear-button></v-select>
+
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+
+              <v-select id="print"
+                        v-model="f_print"
+                        style="width:60%"
+                        placeholder='请选择'
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">剩余气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_gas" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">核算单价</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_price" >
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按金额'">
+            <label class="font_normal_body">剩余金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_amount" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [0, ">=" ]}' placeholder="冲减气量" >
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [data.f_balance_gas, "<=" ]}' placeholder="冲减气量" >
+          </div>
+        </div>
+
+        <div class="row">
+
+          <div class="col-sm-8">
+            <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <input class="input_search" style="width:80%"  v-model="model.f_comments">
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%"
+                   type="number" v-model="model.f_refund_fee"
+                    placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance_amount, "<=" ]}' placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+        <button class="button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
+
+    <!-- 弹窗结构 -->
+    <div v-if="showModal" class="modal-overlay" @click="handleClose">
+      <div class="modal-content" @click.stop>
+        <button class="close-btn1" @click="handleClose">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="#858282" >
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
+          </svg>
+        </button>
+        <h3>提示</h3>
+        <p class="modal-message"><span class="exclamation-icon">!</span>{{ modalMessage }}</p>
+        <button class="confirm-btn" @click="handleConfirm">是</button>
+        <button class="cancel-btn" @click="handleClose">否</button>
+      </div>
+    </div>
+  </div>
+
+  <upload :blodid="data.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+  let readyGen = async function (self) {
+    await self.$getConfig(self, 'IOTRefund')
+    // 默认打印格式
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+
+    self.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.hasValidateBill = self.config.hasBillManage
+  }
+
+  export default {
+    title: '物联网表退费',
+    data () {
+      return {
+        config: {
+          showupload: false, // 默认不上传附件
+          hasPrint: false,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          overBalance: false,   // 为true时退费金额可以大于余额
+          printType: '普通收据', // 收据/电子票/专用发票/国税发票
+          payment: '现金缴费',
+          billType: '燃气费'
+        },
+        model: {
+          f_refund_fee: '',
+          f_add_gas: '计入',
+          f_refund_gas: '',
+          f_comments: '',
+          f_payment: '',
+          f_print: '',
+          f_price: 0
+        },
+        showModal: false,
+        modalMessage: '',
+        blodid: '',
+        hasValidateBill: false,
+        randomBusinessId: '',
+        resid: [],  // 存放新增的f_files表中id
+        validateOk: false,
+        addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
+        printModel: {},
+        print: false,
+        billUrl: '',
+        billData: {
+          url: 'rs/report/refund_sell',
+          bill: ''
+        },
+
+        // 下拉框值
+        paytype: this.$appdata.getParam('付款方式'),
+        printstyle: this.$appdata.getParam('打印格式')
+      }
+    },
+    props: ['data'],
+    ready () {
+      readyGen(this)
+      this.getRandomId()
+      if (this.data.f_collection_type === '按气量') {
+        // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
+        this.model.f_price = this.data.f_price
+
+        // this.$dispatch('refresh')
+      }
+    },
+    events: {
+      // 删除Resid数组元素
+      'delResid' (val) {
+        this.resid.$remove({id: val, f_biobid: ''})
+        // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+      },
+      // 增加Resid数组元素
+      'resid' (val) {
+        this.resid.push({id: val, f_biobid: ''})
+      }
+    },
+    methods: {
+      showModalWithMessage(message) {
+        this.modalMessage = message;
+        this.showModal = true;
+      },
+      handleClose() {
+        this.showModal = false;
+        this.model.f_refund_fee = ''; // 重置表单数据
+      },
+      close() {
+        this.showModal = false;
+      },
+      handleConfirm() {
+        // 处理确认逻辑
+        console.log('确认按钮被点击');
+        this.model.f_refund_fee = '';
+        this.close();
+      },
+      getRandomId () {
+        this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
+      async confirm () {
+        if (this.data.f_meter_brand === '前锋NB物联网表') {
+          this.showModalWithMessage('此表不支持扣费，是否进行清表操作!');
+          return;
+        }
+        if (this.data.f_collection_type === '按金额' && this.model.f_price) {
+          this.model.f_refund_gas = (this.model.f_refund_fee - 0) / (this.model.f_price - 0)
+        }
+        let param = {
+          f_user_id: this.data.f_user_id,
+          f_userfiles_id: this.data.f_userfiles_id,
+          version: this.data.version,
+          f_price: this.model.f_price,
+          f_add_gas: this.model.f_add_gas,
+          f_refund_gas: this.model.f_refund_gas,
+          f_refund_fee: this.model.f_refund_fee,
+          f_comments: this.model.f_comments,
+          f_collection_type: this.data.f_collection_type,
+          f_payment: this.model.f_payment[0],
+          f_print: this.model.f_print[0],
+          f_price_id: this.data.f_price_id,
+          f_total_gas: parseFloat(this.data.f_total_gas) - parseFloat(this.model.f_refund_gas),
+          f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
+          f_stairprice_id: this.data.f_stairprice_id,
+          operInfo: {
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
+          }
+        }
+        if (this.model.f_add_gas !== '计入') {
+          param.f_total_fee = this.data.f_total_fee
+          param.f_total_gas = this.data.f_total_gas
+        }
+        console.log('退费传参', param)
+        let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+        console.log('退费', res)
+        let param1 = []
+        for (let row of this.resid) {
+          param1.push({id: row.id})
+        }
+        let data = {
+          param: param1,
+          f_blobid: res.data.id
+        }
+        await this.$resetpost('rs/logic/updatefiles', data)
+        console.log('退费this.config', this.config)
+        console.log('退费this.model', this.model)
+        if (this.config.hasPrint) {
+          if (this.model.f_print.indexOf('电子发票') == -1) {
+            console.log('this.config.hasBillManage', this.config.hasBillManage)
+            if (this.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              this.printModel.id = res.data.id
+              this.printModel.f_bill_type = '退费'
+              this.printModel.f_bill_style = this.model.f_print[0]
+              // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            } else {
+              this.printModel.id = res.data.id
+              // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            }
+          } else if (this.config.printType === '国税发票') {
+            // TODO
+            this.$dispatch('success')
+          } else if (this.config.printType === '电子发票') {
+            // TODO
+            this.$dispatch('success')
+          }
+        } else {
+          this.$dispatch('success')
+        }
+      },
+      refundChange () {
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      },
+      clean () {
+        this.$dispatch('refresh')
+      },
+      printok () {
+        this.$dispatch('success')
+      },
+      validateBill (val) {
+        this.validateOk = !val.isOk
+        this.billData.bill = val.bill
+      }
+    },
+    watch: {
+      'model.f_price' () {
+        if (this.data.f_collection_type === '按气量') {
+          this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+        }
+      },
+      'model.f_refund_gas' () {
+        if (this.data.f_collection_type === '按气量') {
+          this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000; /* 确保弹窗在所有内容上面 */
+}
+.modal-content {
+  background: #fff;
+  padding: 20px;
+  border-radius: 8px; /* 增加圆角 */
+  height: 200px;
+  width: 390px;
+  text-align: center;
+}
+.close-btn1 {
+  position: absolute;
+  top: -9px;
+  right: -8px;
+  background: transparent;
+  border: none;
+  color: #aaa; /* 默认颜色 */
+  font-size: 24px;
+  cursor: pointer;
+  transition: color 0.3s ease;
+  padding: 0; /* 移除内边距，确保图标对齐 */
+}
+.close-btn1 svg {
+  stroke: #858585; /* 使用按钮的颜色 */
+  width: 24px;
+  height: 24px;
+}
+.close-btn1:hover {
+  color: #333; /* 悬停时颜色 */
+}
+.modal-content button {
+  margin: 5px;
+  margin-top: 20px;
+  padding: 4px 17px;
+  border: none;
+  border-radius: 10px; /* 圆角按钮 */
+  color: #fff;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: bold;
+  transition: background-color 0.3s ease, transform 0.2s ease;
+}
+.modal-message {
+  font-size: 16px; /* 设置p标签的字体大小 */
+}
+.confirm-btn {
+  background-color: #3592EFFF; /* 蓝色背景 */
+}
+.confirm-btn:hover {
+  background-color: #1565C0;
+  transform: scale(1.05); /* 按钮放大效果 */
+}
+.cancel-btn {
+  background-color: #5AC0D9FF; /* 绿色背景 */
+}
+.cancel-btn:hover {
+  background-color: #15b3da;
+  transform: scale(1.05); /* 按钮放大效果 */
+}
+h3 {
+  display: block;
+  font-size: 1.4em;
+  margin-block-start: 0em;
+  margin-block-end: 1em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+  font-weight: bold;
+  unicode-bidi: isolate;
+  padding-bottom: 5px; /* 底部内边距 */
+}
+
+.exclamation-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  background-color: red; /* 红底 */
+  color: white; /* 白色文字 */
+  border-radius: 50%; /* 圆形 */
+  font-size: 16px;
+  font-weight: bold;
+  margin-right: 8px; /* 图标和文字之间的间距 */
+  text-align: center;
+}
+
+</style>

package/src/filiale/qingjian/sale.js

@@ -13,4 +13,6 @@ export default function () {
   // 单个表具信息
   Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
   Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
+  // 物联网退费管理
+  Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
 }

package/src/filiale/rongcheng/FilesManageNew/MeterinfoTest.vue

@@ -248,6 +248,12 @@
                       :options='usestate' placeholder='使用状态'
                       close-on-select></v-select>
           </div>
+          <div class="col-sm-4 form-group" >
+            <label class="font_normal_body">表具使用年限</label>
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   :value.sync="row.f_use_limit"
+                   placeholder='表具使用年限' >
+          </div>
           <div style="" class="col-sm-6 form-group">
             <label for="f_userfiles_address" class="font_normal_body ">安装地址&nbsp;</label>
             <input class="input_search" style="width:80%" v-model="row.f_userfiles_address"/>

package/src/filiale/rongcheng/MeterinfoTest.vue

@@ -288,6 +288,12 @@
                       :options='usestate' placeholder='使用状态'
                       close-on-select></v-select>
           </div>
+          <div class="col-sm-4 form-group" >
+            <label class="font_normal_body">表具使用年限</label>
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   :value.sync="row.f_use_limit"
+                   placeholder='表具使用年限' >
+          </div>
           <div style="" class="col-sm-8 form-group">
             <label for="f_userfiles_address" class="font_normal_body ">&nbsp;用气点名</label>
             <input class="input_search" style="width:80%" v-model="row.f_userfiles_address"/>