sale-client 3.4.72 → 3.4.76

package/src/components/charge/business/OtherChargeNew.vue

@@ -11,7 +11,7 @@
               <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
                 <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">收费类型</label>
                 <v-select id="f_brand_spec"
-                          placeholder='材料'
+                          placeholder='请选择'
                           v-model="row.f_brand_spec"
                           :value.sync="row.f_brand_spec"
                           :options='brandspec'
@@ -24,7 +24,7 @@
                 <v-select
                   style="width: 100px"
                   v-model="row.f_typename"
-                  placeholder='品名'
+                  placeholder='请选择'
                   :value.sync="row.f_typename"
                   :options='gettypename'
                   @change="setTypenumber"
@@ -36,7 +36,7 @@
                 <v-select
                   style="width: 100px"
                   v-model="row.f_typenumber"
-                  placeholder='型号'
+                  placeholder='请选择'
                   :value.sync="row.f_typenumber"
                   :options='gettypenumber'
                   @change="setTypeprice"
@@ -96,15 +96,14 @@
 
 
           <div class="row" style="margin-top:10px;">
-            <div class="col-sm-4">
-              <label for="f_paytype" class="font_normal_body" title="参数名称：付款方式">收款方式</label>
-              <v-select id="f_payment"
-                        v-model="f_payment"
+            <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="model.f_payment"
                         placeholder='请选择'
                         :value.sync="model.f_payment"
-                        :options='paytype'
-                        close-on-select clear-button>
-              </v-select>
+                        close-on-select
+                        :options='paytype' clear-button v-ref:payment></v-select>
             </div>
             <div class="col-sm-4">
               <label for="f_print" class="font_normal_body">&nbsp;打印格式</label>

package/src/components/charge/gasloss/gasLossOperate.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-row auto">
-    <div class="span auto" style="height: 90%">
+    <div class="span auto" style="height: 98%;overflow-y: auto;">
       <validator name='v'>
         <form novalidate class="form-horizontal">
           <div class="flex-auto">
@@ -135,7 +135,7 @@
 
     </div>
 
-<!--    <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>-->
+    <payment-code v-ref:paymentcode :payment="model.f_payment"  :money="model.f_collection"></payment-code>
 
   </div>
 <!--  <div class="auto">-->
@@ -152,7 +152,7 @@
   let gasLossGen = async function (self) {
     try {
       // 加入扫码盒付款码支付流水号
-      // self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
       // let resid = await self.$LogicService.otherCharge(self.model, self.row)
       self.model.f_bill_style=self.model.f_print
       let http = new HttpResetClass()
@@ -190,7 +190,11 @@
   }
 
   let asyncGasLoss = async function (self) {
-    await self.$getConfig(self, 'gasLossCharge')
+    try{
+      await self.$getConfig(self, 'gasLossCharge')
+    } catch(error){
+      console.log('无配置文件')
+    }
     self.model.f_print = self.config.printType
     self.model.f_payment = self.config.payment
     self.model.f_use_type = self.config.billType
@@ -229,6 +233,7 @@
           f_depid: Vue.$login.f.depids,
           f_depname: Vue.$login.f.deps,
           f_operat_type: '气损收费',
+          f_print: '',
           gaslossdetail:[{}]
         },
         print: false,
@@ -248,7 +253,6 @@
         services: this.$appdata.getParam('服务人员')
       }
     },
-    props: ['row'],
     ready () {
       asyncGasLoss(this)
     },
@@ -280,7 +284,8 @@
       clean(){
         this.model={
           f_collection: 0,
-          f_payment: '',
+          f_payment: this.config.payment,
+          f_print: this.config.printType,
           f_bill_style: '',
           f_comments: '',
           f_charge_person: '',
@@ -299,10 +304,10 @@
       },
       async confirm () {
         // // 先调用付款码支付组件流程
-        // let ss = await this.$refs.paymentcode.flowPath()
-        // this.$refs.paymentcode.paymentCodeShow = false
-        // console.log('付款码操作返回', ss)
-        // if (!ss.result) return
+        let ss = await this.$refs.paymentcode.flowPath()
+        this.$refs.paymentcode.paymentCodeShow = false
+        console.log('付款码操作返回', ss)
+        if (!ss.result) return
 
         gasLossGen(this)
       },

package/src/components/chargeBatch/ChargeGroupList.vue

@@ -0,0 +1,281 @@
+<template>
+  <div id="ChargeGroupList">
+    <div class="flex" @keyup.enter="search" :style="{height:(oweShow?'auto':'100%')}">
+      <criteria-paged :model="model" v-ref:paged :pager="!oweShow">
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">组织机构</label>
+                <res-select restype='organization'
+                            @res-select="$parent.$parent.getorg"
+                            :is-mul="false"
+                            :initresid='$parent.$parent.curorgid'>
+                </res-select>
+              </div>
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">客戶编码</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_customer"
+                       condition="f_customer like '%{}%'" placeholder="客戶编码"/>
+              </div>
+              <div :class="$parent.$parent.style" v-show="!$parent.$parent.listShow">
+                <label class="font_normal_body">客戶名称</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                       condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
+              </div>
+
+              <div class="col-sm-3 form-group button-range">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add()" v-if="!$parent.$parent.chargeToChoose">建档
+                </button>
+                <button class="button_clear button_spacing" @click="clear">清空</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                     @click="criteriaShow = !criteriaShow"></div>
+              </div>
+              <div class="row" v-show="criteriaShow">
+                <div :class="$parent.$parent.style" v-show="$parent.$parent.listShow">
+                  <label class="font_normal_body">客戶名称</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客戶地址</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder="客戶地址"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客户电话</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" placeholder="客户电话"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">是否欠费</label>
+                  <v-select v-model="model.oughtfee"
+                            :search="fasle"
+                            placeholder='是否欠费'
+                            :value.sync="model.oughtfee"
+                            :options='$parent.$parent.oughtfee'
+                            condition="f_oughtfee_all {}"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.oweShow" @dblclick="$parent.showOwe">
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>客戶编码</nobr>
+              </th>
+              <th>
+                <nobr>客戶名称</nobr>
+              </th>
+              <th>
+                <nobr>账户结余</nobr>
+              </th>
+              <th>
+                <nobr>客戶类型</nobr>
+              </th>
+              <th>
+                <nobr>客戶地址</nobr>
+              </th>
+              <th>
+                <nobr>客戶电话</nobr>
+              </th>
+              <th>
+                <nobr>团缴户数</nobr>
+              </th>
+              <th>
+                <nobr>欠费金额</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{ $index + 1 }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_customer }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_name }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_balance }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_type }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_address }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_phone }}</nobr>
+              </td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.chargeToChoose">
+                <button @click.stop="$parent.$parent.$parent.operate(row)"
+                        class="btn btn-link"><b>{{ row.sumuserfiles }}</b>
+                </button>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.sumuserfiles }}</nobr>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.f_oughtfee_all }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.print(row)">打印明细
+                  </button>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.export(row)">导出明细
+                  </button>
+                </nobr>
+              </td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+      <print-data :sum-field="getfield" :model="printModel" :field="getfield" :printview="true"
+                  :defaultfield="defaultfield" titletable="团体欠费明细报表" v-ref:printdata>
+      </print-data>
+    </div>
+
+    <export-excel
+      :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
+      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>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      oughtfee: [{label: '全部', value: ''}, {label: '是', value: '> 0'}, {label: '否', value: '<= 0'}],
+      model: new PagedList('rs/sql/ncarchivesQuery', 20),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
+      f_civill_id: null,
+      oweShow: false,
+      getCondition: null,
+      getfield: null,
+      config: {
+        // 导出列
+        excelHeaders: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_meter_classify': '气表类型',
+          'c': '欠费期数',
+          'f_hand_date': '欠费区间',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额',
+          'f_debt_money': '已交金额',
+          'f_oughtfee_new': '应交气费',
+          'overdue': '滞纳金',
+          'f_oughtfee_all': '合计欠费'
+        }
+      },
+      defaultfield: [],
+      printModel: new PagedList('rs/sql/batchOweQuery', 20)
+    }
+  },
+  title: '档案查询',
+  props: {
+    f_filialeids: {
+      type: String
+    },
+    style: {
+      type: String,
+      default: 'col-sm-3 form-group'
+    },
+    // 控制在修改数据时显示少的查询条件,剩余隐藏
+    listShow: {
+      type: Boolean,
+      default: false
+    },
+    // 收费时的展示控制
+    chargeToChoose: {
+      type: Boolean,
+      default: false
+    }
+  },
+  ready () {
+    this.getfield = this.config.excelHeaders
+    this.search()
+  },
+  methods: {
+    // 打印
+    async print (row) {
+      let condition = `p.f_civill_id = ${row.id}`
+      await this.printModel.search(condition)
+      this.$refs.printdata.printData()
+    },
+    // 导出
+    export (row) {
+      this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
+      this.$refs.excel.exportExcel()
+    },
+    showOwe (row) {
+      if (this.chargeToChoose) {
+        this.f_civill_id = row.id
+        this.oweShow = true
+      }
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    add () {
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add')
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      }
+    },
+    operate (val) {
+      this.$dispatch('operate', val)
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
+      this.oweShow = false
+      this.model.search(args.condition, args.model)
+      this.$refs.paged.$refs.grid.selectInit()
+      this.$dispatch('newsearch')
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+    }
+  }
+
+}
+</script>
+<style lang="less">
+  #ChargeGroupList {
+    .button_export {
+      display: none;
+    }
+  }
+</style>

package/src/components/chargeBatch/ChargeManageGroup.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="ChargeManageBatch" class="flex-row three" v-show="listpage">
     <div class="binary-left" style="width:83%;overflow-y: scroll">
-      <archives-list v-ref:archiveslist charge-to-choose></archives-list>
+      <charge-group-list v-ref:archiveslist charge-to-choose></charge-group-list>
     </div>
     <div class="binary-right" style="width:22%">
       <ul class="nav nav-pills span nav-tabs" style="height:auto;margin:8px 0px;padding:4px 0;border-bottom: 1px solid #e7e7e7;">
@@ -26,7 +26,7 @@
 <script>
 import CardListRewrite from './CardList'
 export default {
-  title: '批量缴费',
+  title: '团体缴费',
   components: {CardListRewrite},
   data () {
     return {

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

@@ -2,9 +2,9 @@
   <div class="binary flex" >
     <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
       <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
-      <saletabbut  v-if="row" v-ref:list :active="-1" style="height:72%;margin-top: 1%">
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">
-          <record-query-user :row="row" v-if="show == '流水查询'" @deal-msg="dealMsg"></record-query-user>
+          <record-query-user :row="row"></record-query-user>
         </saletab>
         <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
           <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>

package/src/components/getNowDate.js

@@ -1,25 +1,25 @@
-
-export default () => {
-  // 求取当前时间的工具
-  let year = ''
-  let month = ''
-  let day = ''
-  let hour = ''
-  let minutes = ''
-  let seconds = ''
-  let mydate = new Date()
-  let mymonth = mydate.getMonth() + 1
-  let myday = mydate.getDate()
-  let myyear = mydate.getYear()
-  let myhour = mydate.getHours()
-  let myminutes = mydate.getMinutes()
-  let myseconds = mydate.getSeconds()
-  year = (myyear > 200) ? myyear : 1900 + myyear
-  month = (mymonth > 9) ? mymonth : '0' + mymonth
-  day = (myday > 9) ? myday : '0' + myday
-  hour = (myhour > 9) ? myhour : '0' + myhour
-  minutes = (myminutes > 9) ? myminutes : '0' + myminutes
-  seconds = (myseconds > 9) ? myseconds : '0' + myseconds
-  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-  return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
-}
+
+export default () => {
+  // 求取当前时间的工具
+  let year = ''
+  let month = ''
+  let day = ''
+  let hour = ''
+  let minutes = ''
+  let seconds = ''
+  let mydate = new Date()
+  let mymonth = mydate.getMonth() + 1
+  let myday = mydate.getDate()
+  let myyear = mydate.getYear()
+  let myhour = mydate.getHours()
+  let myminutes = mydate.getMinutes()
+  let myseconds = mydate.getSeconds()
+  year = (myyear > 200) ? myyear : 1900 + myyear
+  month = (mymonth > 9) ? mymonth : '0' + mymonth
+  day = (myday > 9) ? myday : '0' + myday
+  hour = (myhour > 9) ? myhour : '0' + myhour
+  minutes = (myminutes > 9) ? myminutes : '0' + myminutes
+  seconds = (myseconds > 9) ? myseconds : '0' + myseconds
+  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+  return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+}

package/src/components/revenue/Common/PaymentCode.vue

@@ -73,9 +73,9 @@
       // 付款码支付流程
       async ConfirmCode () {
         let data = {
-          f_userinfo_id: this.row.f_userinfo_id,
-          f_user_id: this.row.f_user_id,
-          f_userfiles_id: this.row.f_userfiles_id,
+          f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
+          f_user_id: this.row ? this.row.f_user_id : null,
+          f_userfiles_id: this.row ? this.row.f_userfiles_id : null,
           money: this.money,
           f_payment: this.payment,
           auth_code: this.paymentCode,

package/src/components/revenue/HandManager/MbpeopleList.vue

@@ -18,12 +18,12 @@
             <div class="form-group button-range" style="float: right">
               <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
               <button class="button_clear button_spacing" @click="clear">清空</button>
-              <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
-              <export-excel
-                :data="{condition:$parent.$parent.condition}"
-                :field="$parent.$parent.getfield"
-                sqlurl="rs/logic/exportfile" sql-name="salembPeopleList" template-name='表册用户导出'
-                :choose-col="true"></export-excel>
+<!--              <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>-->
+<!--              <export-excel-->
+<!--                :data="{condition:$parent.$parent.condition}"-->
+<!--                :field="$parent.$parent.getfield"-->
+<!--                sqlurl="rs/logic/exportfile" sql-name="salembPeopleList" template-name='表册用户导出'-->
+<!--                :choose-col="true"></export-excel>-->
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_top': $parent.$parent.criteriaShow,'button_shrink_bottom': !$parent.$parent.criteriaShow}"
                    @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></div>

package/src/components/revenue/HandManager/MeterBookUser.vue

@@ -15,12 +15,13 @@
               <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
               <button class="button_search" v-if="$parent.$parent.editsort==false" @click="$parent.$parent.editsort=true" v-el:cba>调整顺序</button>
               <button class="button_search" v-if="$parent.$parent.editsort==true" @click="$parent.$parent.saveEditSort" v-el:cba>保存顺序</button>
-
               <export-excel
                 :data="{condition: $parent.$parent.condition}"
                 :field="$parent.$parent.getfield"
-                sqlurl="rs/logic/saleExport" sql-name="getMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
+                sqlurl="rs/logic/exportfile" sql-name="saleGetMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
                 :choose-col="true"></export-excel>
+              <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
+
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                 @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -227,6 +228,14 @@
 
     </footer>
   </modal>
+  <modal :show.sync="show" width="800px" title="文件导入" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <file-upload class="my-file-uploader " name="UploadFile"  style="border-radius: 2px;"
+                   action="rs/file/uploadFile" tagname="导入表册用户" v-ref:file  multiple></file-upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 </template>
 
 <script>
@@ -273,6 +282,7 @@
         editsort:false,
         config: {
           excelHeaders: {
+            'f_userfiles_id': '系统识别号',
             'f_book_name': '抄表册名称',
             'f_userinfo_code': '客户编号',
             'f_user_name': '客户姓名',
@@ -296,6 +306,9 @@
       readyGen(this)
     },
     methods: {
+      importFile () {
+        this.show = true
+      },
       async sortEdit(position){
         if(!this.fileinfo.code){
           this.$showMessage('请输入目标用户编号')
@@ -514,6 +527,24 @@
         this.search()
       }
     },
+    events: {
+      onFileUpload: function (file, res) {
+        // let URL = res.f_downloadpath.substring(res.f_downloadpath.lastIndexOf(":\\") + 2)
+        // res.f_downloadpath = "http://" + location.host + "/" + URL
+        // res.f_downloadpath.replace('\\','/')
+        this.$resetpost('rs/logic/upLoadBookFile',
+          {data: {
+              condition: this.condition,
+              filepath: res.f_downloadpath
+            }
+          },
+          {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
+          this.show = false
+          this.$showAlert(`导入成功`, 'success', 2000)
+          this.search()
+        })
+      }
+    },
     computed: {
       inputtores () {
         // 获取抄表员