sale-client 3.5.50 → 3.5.52

package/package.json

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

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -52,6 +52,8 @@
                     </button>
                     <button class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.createInfoForFile()">批量建档
                     </button>
+                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
+                    </button>
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
@@ -424,6 +426,17 @@ let loadParamGem = async function (self) {
         }
   },
       methods: {
+        downloadFiles(){
+          let downurl='rs/downloadfile/file?filename=预备户批量建档导入Excel模板';
+          this.$resetget(downurl,{}).then(res=>{
+            var link = document.createElement('a');
+            link.target="_blank"
+            link.href =downurl ;
+            link.setAttribute("download", "预备户批量建档导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
+            document.body.appendChild(link);
+            link.click();
+          })
+        },
         close () {
           this.printflag = false
           this.clean()

package/src/components/chargeBatch/BatchCharge.vue

@@ -105,6 +105,7 @@ let asyncMachineMeterCenter = async function (self) {
 }
 export default {
   name: 'BatchCharge',
+  title: '团体缴费',
   data () {
     return {
       config: {

package/src/components/chargeBatch/CardList.vue

@@ -46,10 +46,9 @@
 <!--                  <span class="col-sm-4">{{row.type}}</span>-->
 <!--                </div>-->
                 <div class="row">
-                  <!--<strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
-                  <span class="col-sm-6">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
-<!--                  <span class="col-sm-6 font_normal_body" title="参数名称：付款方式">收款方式:</span>-->
-                  <span class="col-sm-6">{{row.type}}</span>
+                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>
+                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
+                  <span class="col-sm-4">{{row.type}}</span>
                 </div>
               </div>
               <div class="col-sm-1" v-if="$parent.$parent.$parent.isOperate" title="涉及权限:冲正权限">
@@ -75,7 +74,9 @@
                       v-if="(row.type === '批量收费'||row.type === '团体收费' || row.type === '迁表' || row.type === '拆表' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费'|| row.type === '气费减免'||row.type === '维修收费' || row.type === '过户' || row.type === '换新表' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '其他收费' || row.type === '补卡'|| row.type === '调价补费'|| row.type=='预存缴费' || row.type==='卡表赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='物联网赠气')||row.type==='气损收费'">
                       <a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
                     </li>
-
+                    <li v-else>
+                      <a href="#">暂无其他操作</a>
+                    </li>
                   </ul>
                 </dropdown>
               </div>
@@ -132,7 +133,7 @@
                 <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
                 <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'"></machinemetercenter-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费'"></gasloss-detail>
-                <batch-charge-detail :data="row" v-if="row.type === '批量收费' || row.type === '团体收费'"></batch-charge-detail>
+                <batch-charge-detail :data="row" v-if="row.type === '批量收费' || row.type === '团体收费' || row.type === '团体退费'"></batch-charge-detail>
               </div>
               <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
                 <span>{{row.f_describe}}</span>
@@ -234,7 +235,7 @@
         asideTitle: '用户操作',
         row: Object,
         comp: null,
-        operationtypes: [{label: '批量收费', value: '批量收费'}, {label: '团体收费', value: '团体收费'}],
+        operationtypes: [{label: '团体收费', value: '团体收费'}, {label: '团体退费', value: '团体退费'}],
         cancel_show: false,
         cancel_data: null,
         paytype: this.$appdata.getParam('付款方式'),

package/src/components/chargeBatch/ChargeGroupList.vue

@@ -157,16 +157,18 @@
       sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
     </export-excel>
 
-    <owe-record-query v-if="oweShow" :f_civill_id="f_civill_id"></owe-record-query>
+    <owe-record-query v-if="oweShow" :row="row" :f_civill_id="f_civill_id"></owe-record-query>
   </div>
 </template>
 
 <script>
-import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
 
 export default {
   data () {
     return {
+      interval: null,
+      searchTime: this.$appdata.getSingleValue('磁条卡读卡间隔') ? this.$appdata.getSingleValue('磁条卡读卡间隔') : 2,
       oughtfee: [{label: '全部', value: ''}, {label: '是', value: '> 0'}, {label: '否', value: '<= 0'}],
       model: new PagedList('rs/sql/ncarchivesQuery', 20),
       // 公司下拉
@@ -195,7 +197,8 @@ export default {
         }
       },
       defaultfield: [],
-      printModel: new PagedList('rs/sql/batchOweQuery', 20)
+      printModel: new PagedList('rs/sql/batchOweQuery', 20),
+      row: null
     }
   },
   title: '档案查询',
@@ -221,8 +224,60 @@ export default {
   ready () {
     this.getfield = this.config.excelHeaders
     this.search()
+    this.readCiTiaoCard()
+  },
+  destroyed () {
+    clearInterval(this.interval)
+  },
+  watch: {
+    'oweShow' (val) {
+      if (val) {
+        clearInterval(this.interval)
+      } else {
+        this.readCiTiaoCard()
+      }
+    }
   },
   methods: {
+    async readCiTiaoCard () {
+      console.log('读磁条卡，开始，不停的循环')
+      let data = {}
+      let getUser = {data: []}
+      let forgid = this.$login.convertToIn([this.$login.f.orgid])
+      try {
+        // let res = {data:{Factory : 'CiTiao',CardID : '00000009'}}
+        let http = new HttpResetClass()
+        this.interval = setInterval(async () => {
+          // 1秒一轮回
+          http.load('POST', 'http://127.0.0.1:8003/ReadCard_HEC', data, {
+            resolveMsg: null,
+            rejectMsg: null
+          }).then(async res => {
+            if (res.data.CardID !== '') {
+              if (res.data.Err === null && res.data.Exception) {
+                this.$showAlert(res.data.Exception, 'danger', 2000)
+                // clearInterval(interval)
+              } else {
+                if (res.data.Factory === 'CiTiao') {
+                  // 获取用户信息
+                  getUser = await this.$resetpost('rs/sql/ncarchivesQuery', {
+                    data: {
+                      condition: `f_orgid  in ${forgid} and f_card_id='${res.data.CardID}'`,
+                      orderitem: `f_userinfo_id`
+                    }
+                  }, {resolveMsg: null, rejectMsg: '读卡失败'})
+                  this.showOwe(getUser.data[0])
+                  clearInterval(this.interval)
+                }
+              }
+            }
+          })
+        }, this.searchTime * 1000)
+      } catch (error) {
+        console.log('捕获到异常', error)
+        // this.$showAlert(error.data, 'danger', 2000)
+      }
+    },
     // 打印
     async print (row) {
       let condition = `p.f_civill_id = ${row.id}`
@@ -237,6 +292,7 @@ export default {
     showOwe (row) {
       if (this.chargeToChoose) {
         this.f_civill_id = row.id
+        this.row = row
         this.oweShow = true
       }
     },

package/src/components/chargeBatch/ChargeManageGroup.vue

@@ -10,7 +10,7 @@
                @click="setField('历史操作')">历史操作</a></li>
       </ul>
       <div class="tab-content span" style="overflow-y: auto">
-        <card-list-rewrite v-show="worktype === '历史操作'" :operationtype="['团体收费']" v-ref:card></card-list-rewrite>
+        <card-list-rewrite v-show="worktype === '历史操作'" sqlurl="rs/sql/getGroupRecord" v-ref:card></card-list-rewrite>
       </div>
     </div>
   </div>

package/src/components/chargeBatch/OweRecordQuery.vue

@@ -43,7 +43,16 @@
   </div>
   <div class="auto" style="margin-top: 1%;">
     <div style="height: auto" class="select-overspread">
-      <batch-charge :data="model" :owe="owe" :civill="civill" v-if="chargeShow"></batch-charge>
+      <div class="form-inline" style="height: auto">
+        <div class="form-group" v-for="btn in operBtns">
+          <button :id="btn.name" type="button" style="color:black" :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)" >
+            <span style="color:black">{{btn.name}}</span>
+          </button>
+        </div>
+      </div>
+      <div v-show="chargeShow" style="height: auto" class="select-overspread">
+        <route v-ref:route></route>
+      </div>
     </div>
   </div>
 </template>
@@ -58,10 +67,15 @@
         owe: {rows: []},
         model: {f_collection: 0},
         civill: null,
-        chargeShow: false
+        chargeShow: false,
+        operBtns: [
+          {name: '团体缴费', value: {routeName: 'batch-charge'}},
+          {name: '余额退款', value: {routeName: 'group-refund'}},
+          {name: '制磁条卡', value: {routeName: 'show-citiao_card'}}
+        ]
       }
     },
-    props: ['searchdata', 'f_civill_id'],
+    props: ['searchdata', 'f_civill_id', 'row'],
     ready () {
       this.getsalerecord()
     },
@@ -78,7 +92,28 @@
         this.owe.rows = record.data.owe
         this.model = Object.assign(this.model, record.data.model)
         this.civill = record.data.civill
+        this.business(this.operBtns[0])
+      },
+      business (btn) {
+        // 处理按钮样式
+        this.styleChange(btn.name)
         this.chargeShow = true
+        this.$refs.route.init(btn.value.routeName, {row: this.row, data: this.model, owe: this.owe, civill: this.civill})
+      },
+      styleChange (name) {
+        this.operBtns.forEach((res) => {
+          if (res.name === name) {
+            if (document.getElementById(res.name)) {
+              document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
+              document.getElementById(res.name).style.color = 'white'
+            }
+          } else {
+            if (document.getElementById(res.name)) {
+              document.getElementById(res.name).style.backgroundColor = 'white'
+              document.getElementById(res.name).style.color = 'black'
+            }
+          }
+        })
       }
     },
     watch: {

package/src/components/chargeBatch/groupRefund.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+            <v-select v-model="f_payment"
+                      placeholder='请选择'
+                      style="width:60%"
+                      :value.sync="model.f_payment"
+                      :options='paytype'
+                      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">剩余金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="row.f_balance" readonly>
+          </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="!config.overBalance"
+               :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: [row.f_balance, "<=" ]}' placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance"
+               :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-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok"
+                :data='printModel' v-ref:printbill></print-bill>
+  </div>
+</template>
+
+
+<script>
+let readyGen = async function (self) {
+  await self.$getConfig(self, 'GroupRefund')
+  console.log('团体退费config', self.config)
+  // 默认打印格式
+  self.blodid = self.row.id
+  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_comments: '',
+        f_payment: '',
+        f_print: ''
+      },
+
+      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: ['row'],
+  ready () {
+    readyGen(this)
+  },
+  methods: {
+    async confirm () {
+      let param = {
+        version: this.row.version,
+        id: this.row.id,
+        f_customer: this.row.f_customer,
+        f_refund_fee: this.model.f_refund_fee,
+        f_comments: this.model.f_comments,
+        f_payment: this.model.f_payment[0],
+        f_print: this.model.f_print[0],
+        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
+        }
+      }
+
+      let res = await this.$resetpost('rs/logic/groupRefund', {data: param}, {
+        warnMsg: `确定要对用户${this.row.f_user_name}进行退费吗？`,
+        resolveMsg: '退费成功！！',
+        rejectMsg: '退费失败！！请重试！！'
+      })
+
+      if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
+        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')
+      }
+    },
+    clean () {
+      this.$dispatch('refresh')
+    },
+    printok () {
+      this.$dispatch('success')
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    }
+  }
+}
+</script>

package/src/components/revenue/changeInsurance/InsuranceList.vue

@@ -24,6 +24,8 @@
                 <div style="float: right">
                   <button class="button_search" @click="search()">查 询</button>
                   <button class="btn btn-default" @click="$parent.$parent.battchinsurance()" >批量保险收费</button>
+                  <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
+                  </button>
                   <div
                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                     @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -156,6 +158,17 @@
       this.search()
     },
     methods: {
+      downloadFiles(){
+        let downurl='rs/downloadfile/file?filename=批量保险收费导入Excel模板';
+        this.$resetget(downurl,{}).then(res=>{
+          var link = document.createElement('a');
+          link.target="_blank"
+          link.href =downurl ;
+          link.setAttribute("download", "批量保险收费导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
+          document.body.appendChild(link);
+          link.click();
+        })
+      },
       search () {
         this.$refs.paged.$refs.criteria.search()
       },

package/src/components/revenue/comprehen/Maintenance/group/AddWarehousemaingroup.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">操作记录</p>
+        <!-- <data-grid :model="inData" v-ref:grid  partial='list'>
+           <template partial='head'>-->
+        <table class="list_area table_sy" style="width: 600px">
+          <tr>
+            <th style="text-align: center">序号</th>
+            <th style="text-align: center">修改内容</th>
+            <th style="text-align: center">变更前</th>
+            <th style="text-align: center">变更后</th>
+            <th style="text-align: center">状态</th>
+            <th style="text-align: center">修改时间</th>
+            <th style="text-align: center">操作人</th>
+          </tr>
+
+          <tr v-for="row in recordlist">
+            <td style="text-align: center;">{{$index + 1}}</td>
+            <td style="text-align: center;">{{row.chinesename}}</td>
+            <td style="text-align: center;">{{row.oldvalue}}</td>
+            <td style="text-align: center;">{{row.newvalue}}</td>
+            <td style="text-align: center;">{{row.state}}</td>
+            <td style="text-align: center;">{{row.modifitime}}</td>
+            <td style="text-align: center;">{{row.operator}}</td>
+          </tr>
+        </table>
+      </form>
+
+    </validator>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'addwarehouse',
+
+    data () {
+      return {
+        inData: [],
+        obj: {},
+        userid: this.$login.f.id
+
+      }
+    },
+    props: {
+      recordlist: Array
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="less">
+</style>