sale-client 3.4.110 → 3.4.113

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

@@ -1,236 +1,236 @@
-<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" 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>
-
-  <upload :blodid="data.f_userinfo_id"  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_refund_gas: '',
-          f_comments: '',
-          f_payment: '',
-          f_print: '',
-          f_price: 0
-        },
-
-        blodid: '',
-        hasValidateBill: false,
-        validateOk: false,
-
-        printModel: {},
-        print: false,
-        billUrl: '',
-        billData: {
-          url: 'rs/report/refund_sell',
-          bill: ''
-        },
-
-        // 下拉框值
-        paytype: this.$appdata.getParam('付款方式'),
-        printstyle: this.$appdata.getParam('打印格式')
-      }
-    },
-    props: ['data'],
-    ready () {
-      readyGen(this)
-      if (this.data.f_collection_type === '按气量') {
-        // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
-        this.model.f_price = this.data.f_price
-
-        // this.$dispatch('refresh')
-      }
-    },
-    methods: {
-        async confirm () {
-        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_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
-          }
-        }
-        console.log('退费传参', param)
-        let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
-        console.log('退费', res)
-        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')
-          }
-        }
-        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'(){
-        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
-      },
-      'model.f_refund_gas'(){
-        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
-      }
-    }
-  }
-</script>
+<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" 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>
+
+  <upload :blodid="data.f_userinfo_id"  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_refund_gas: '',
+          f_comments: '',
+          f_payment: '',
+          f_print: '',
+          f_price: 0
+        },
+
+        blodid: '',
+        hasValidateBill: false,
+        validateOk: false,
+
+        printModel: {},
+        print: false,
+        billUrl: '',
+        billData: {
+          url: 'rs/report/refund_sell',
+          bill: ''
+        },
+
+        // 下拉框值
+        paytype: this.$appdata.getParam('付款方式'),
+        printstyle: this.$appdata.getParam('打印格式')
+      }
+    },
+    props: ['data'],
+    ready () {
+      readyGen(this)
+      if (this.data.f_collection_type === '按气量') {
+        // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
+        this.model.f_price = this.data.f_price
+
+        // this.$dispatch('refresh')
+      }
+    },
+    methods: {
+        async confirm () {
+        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_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
+          }
+        }
+        console.log('退费传参', param)
+        let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+        console.log('退费', res)
+        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')
+          }
+        }
+        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'(){
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      },
+      'model.f_refund_gas'(){
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      }
+    }
+  }
+</script>

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

@@ -1,28 +1,28 @@
-<template>
-  <div class="auto">
-    <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund>
-    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-Refund>
-  </div>
-
-</template>
-<script>
-  import IotRefund from './IOTRefund'
-  import machineRefund from './machineRefund'
-
-  export default {
-    title: '退费管理',
-    components: {
-      IotRefund,
-      machineRefund
-    },
-    data () {
-      return {
-
-      }
-    },
-    ready () {
-
-    },
-    props: ['row']
-  }
-</script>
+<template>
+  <div class="auto">
+    <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund>
+    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-Refund>
+  </div>
+
+</template>
+<script>
+  import IotRefund from './IOTRefund'
+  import machineRefund from './machineRefund'
+
+  export default {
+    title: '退费管理',
+    components: {
+      IotRefund,
+      machineRefund
+    },
+    data () {
+      return {
+
+      }
+    },
+    ready () {
+
+    },
+    props: ['row']
+  }
+</script>

package/src/components/chargeNew/thirdSurplus.vue

@@ -27,6 +27,7 @@
                 <template partial='head'>
                     <tr>
                         <th><nobr>序号</nobr></th>
+                      <th><nobr>用户编号</nobr></th>
                         <th><nobr>用户名称</nobr></th>
                         <th><nobr>单价调整量</nobr></th>
                         <th><nobr>旧气价</nobr></th>
@@ -46,6 +47,7 @@
                 <template partial='body' >
 
                     <td style="text-align: center;" >{{$index+1}}</td>
+                  <td style="text-align: center;" >{{row.f_userinfo_code}}</td>
                     <td style="text-align: center" >{{row.f_user_name}}</td>
                     <td style="text-align: center" >{{row.f_change_price}}</td>
                     <td style="text-align: center" >{{row.f_old_price}}</td>