sale-client 3.5.234 → 3.5.236

package/build/dev-server.js

@@ -1,81 +1,81 @@
-var path = require('path')
-const [localUrl, serverRul] = ['http://61.240.138.248:8400', 'http://61.240.138.248: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,
+    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.234",
+  "version": "3.5.236",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/ChargeOper.vue

@@ -19,7 +19,7 @@
 import {HttpResetClass} from 'vue-client'
 
 let getNewmetermsg = async function (self, row) {
-  self.cardInfo = {}
+  self.cardInfo = undefined
   if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
     // 获取用户信息
     let getUser = await self.$resetpost('rs/sql/sale_getUser', {
@@ -112,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/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/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': '一阶气费',

package/src/filiale/chengtou/components/charge/IOTRefund.vue

@@ -0,0 +1,385 @@
+<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" v-show="applyButtonShow" @click="apply()" :disabled='!$v.valid'>申请审批退款</button>
+        <button class="button_search btn-gn" v-show="confirmButtonShow" @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>
+    <modal :show.sync="addModalShow" backdrop="false" width="40%" title="创建任务" small="true" @modal-close="addModalClose()">
+      <article slot="modal-body" class="row" style="padding: 10px">
+        <div class="form-group col-sm-10" :class="[ !addModel.f_task_name? 'has-error' : '']">
+          <label class="font_normal_body">任务名称</label>
+          <input type="text" class="input_search" style="width:80%"
+                 v-model="addModel.f_task_name"
+                 placeholder='请输入任务名称'>
+        </div>
+        <div class="form-group col-sm-10" :class="[ !addModel.f_work_flow_name? 'has-error' : '']">
+          <label class="font_normal_body">流程名称</label>
+          <v-select :options='workFlowDefineList' :search='true'
+                    :value.sync="addModel.f_work_flow_name"
+                    close-on-select value-single placeholder='请选择流程名称'
+                    v-model='addModel.f_work_flow_name' style="width:100%"></v-select>
+        </div>
+        <div class="form-group col-sm-10" :class="[ !addModel.f_userinfo_code? 'has-error' : '']">
+          <label class="font_normal_body">用户编号</label>
+          <input type="text" class="input_search" style="width:80%"
+                 v-model="addModel.f_userinfo_code"
+                 placeholder='请输入用户编号'>
+        </div>
+        <div class="form-group col-sm-10" :class="[ !addModel.approval? 'has-error' : '']">
+          <label class="font_normal_body">审批人&emsp;</label>
+          <v-select :options='allUserList' :search='true'
+                    :value.sync="addModel.approval"
+                    close-on-select value-single
+                    placeholder='请选择审批人'
+                    v-model='addModel.approval' style="width:100%"></v-select>
+        </div>
+        <div class="form-group col-sm-10" :class="[ !addModel.memorandum? 'has-error' : '']">
+          <label class="font_normal_body">申请原由</label>
+          <textarea class="input_textarea" style="width: 93%;height: 40px"
+                    v-model="addModel.memorandum"></textarea>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer" style="text-align: right;border: 0">
+        <button class="btn button_search" @click="addTask()"
+                :disabled="!(addModel.f_work_flow_name && addModel.f_task_name
+                && addModel.f_userinfo_code && addModel.approval && addModel.memorandum)">{{ '新增' }}
+        </button>
+      </footer>
+    </modal>
+  </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('打印格式'),
+        addModalShow: false,
+        workFlowDefineList: [],
+        addModel: {
+          f_task_name: '',
+          f_userinfo_code: undefined,
+          f_work_flow_name: '',
+          approval: '',
+          memorandum: ''
+        },
+        allUserList: []
+      }
+    },
+    props: {
+      data: {
+        type: Object,
+        default: undefined
+      },
+      applyButtonShow: {
+        type: Boolean,
+        default: true
+      },
+      confirmButtonShow: {
+        type: Boolean,
+        default: false
+      },
+      cleanButtonShow: {
+        type: Boolean,
+        default: true
+      }
+    },
+    ready () {
+      readyGen(this)
+      if (this.data.f_collection_type === '按气量') {
+        // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
+        this.model.f_price = this.data.f_price
+
+        // this.$dispatch('refresh')
+      }
+      this.getAllWorkFlowDefine()
+      this.getAllUsers()
+    },
+    methods: {
+      getAllUsers () {
+        let data = {
+          items: 'name',
+          condition: 'state = \'在职\' ',
+          tablename: '"t_user"',
+          orderitem: '"id"'
+        }
+        this.$resetpost('rs/sql/singleTable_OrderBy', {'data': data}
+          , {resolveMsg: null, rejectMsg: '获取所有员工失败！！', newly: true}).then(
+          (res) => {
+            console.log('所有员工' + JSON.stringify(res))
+            res.data.forEach(row => {
+              let obj = {'label': row.name, 'value': row.name}
+              this.allUserList.push(obj)
+            })
+          }
+        )
+      },
+      getAllWorkFlowDefine () {
+        let data = {
+          items: 'f_workflow_name',
+          condition: 'f_is_hidden = 0',
+          tablename: '"t_workflow_define"',
+          orderitem: '"id"'
+        }
+        this.$resetpost('rs/sql/future_singleTableOrderBy', {'data': data}
+          , {resolveMsg: null, rejectMsg: '获取流程项目失败！！'}).then(
+          (res) => {
+            console.log(1)
+            res.data.forEach(row => {
+              let obj = {'label': row.f_workflow_name, 'value': row.f_workflow_name}
+              this.workFlowDefineList.push(obj)
+            })
+          }
+        )
+      },
+      addModalClose () {
+        this.addModel.f_work_flow_name = ''
+        this.addModel.f_task_name = ''
+        this.addModel.f_userinfo_code = ''
+        this.addModel.approval = ''
+        this.addModel.memorandum = ''
+      },
+      addTask () {
+        if (this.addModel.f_userinfo_code != this.data.f_userinfo_code) {
+          this.$showAlert('请填写正确的用户编号！！！', 'warning', 3000)
+          return
+        }
+        let memorandum = {
+          memorandum: this.addModel.memorandum
+        }
+        let data = {
+          f_created_by: this.$login.f.name,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
+          addModel: this.addModel,
+          memorandum: JSON.stringify(memorandum)
+        }
+        this.$resetpost('rs/logic/future_createWorkFlowTask', {'data': data}
+          , {resolveMsg: null, rejectMsg: '新增任务失败！！'}).then(
+          (res) => {
+            this.$showAlert(res.data.msg + '请等待审批完成后去流程页面进行操作！！！', 'info', 3000)
+            this.addModalClose()
+            this.addModalShow = false
+          }
+        )
+      },
+      async apply () {
+        await this.$copyText(this.data.f_userinfo_code)
+        this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
+        this.addModel.f_task_name = `用户：${this.data.f_user_name},编号：${this.data.f_userinfo_code} 申请退款`
+        this.addModalShow = true
+      },
+        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')
+          }
+        }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'(){
+        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/filiale/chengtou/components/charge/RefundManage.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="auto">
+    <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row" :apply-button-show="applyButtonShow"
+                :confirm-button-show="confirmButtonShow"></iot-refund>
+    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row" :apply-button-show="applyButtonShow"
+                    :confirm-button-show="confirmButtonShow"></machine-Refund>
+  </div>
+
+</template>
+<script>
+  import IotRefund from './IOTRefund'
+  import machineRefund from './machineRefund'
+
+  export default {
+    title: '退费管理',
+    components: {
+      IotRefund,
+      machineRefund
+    },
+    data () {
+      return {
+
+      }
+    },
+    ready () {
+
+    },
+    props: {
+      row: {
+        type: Object,
+        default: undefined
+      },
+      applyButtonShow: {
+        type: Boolean,
+        default: true
+      },
+      confirmButtonShow: {
+        type: Boolean,
+        default: false
+      }
+    }
+  }
+</script>