sale-client 3.6.479 → 3.6.480

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Dec 30 14:38:17 CST 2024
+#Mon Jul 08 09:48:59 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -47,6 +47,10 @@ var devConfig = {
       '/invoice': {
         target: serverRul
       },
+      '/rs/batchSettlement': {
+        target: localUrl
+      },
+
       // 查找资源服务数据
       '/rs/search': {
         target: serverRul

package/package.json

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

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

@@ -129,7 +129,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" type ="其他收费"  :row="row" :money="model.f_collection"></payment-code>
   </div>
   <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="其他收费"></upload>
 </template>

package/src/components/common/ImgSelfSalePlus.vue

@@ -0,0 +1,221 @@
+<template>
+  <div>
+    <img :src="src" :alt="alt" @click.stop="open()" :width="width" :height="height" title="点击查看图片"
+         :id="'vc-imgself-img-'+attach">
+    <div class="full-img" v-show="show" @contextmenu.prevent.stop="clearStyle">
+      <img :src="src2" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
+           @mousedown.prevent="dropImage" style="position:fixed">
+      <div class="btns row">
+        <button type="button" name="button" class="btn btn-primary" @click.stop="leftRevolve()">向左旋转</button>
+        <button type="button" name="button" class="btn btn-primary" @click.stop="rightRevolve()">向右旋转</button>
+        <button type="button" name="button" class="btn btn-primary" @click.stop="close()">关闭</button>
+        <button type="button" name="button" class="btn btn-primary" @click.stop="previousPage()">上一页</button>
+        <button type="button" name="button" class="btn btn-primary" @click.stop="nextPage()">下一页</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import $ from 'jquery'
+
+  export default {
+    props: {
+      src: {
+        type: String
+      },
+      width: {
+        default: 60
+      },
+      height: {
+        default: 60
+      },
+      alt: {
+        default: '图片加载失败'
+      },
+      attach: {
+        type: String,
+        default: 'name'
+      },
+      list: {
+        type: Array,
+        default: []
+      }
+    },
+    data() {
+      return {
+        show: false,
+        deg: 0,
+        odiv: null,
+        powerw: 1.0,
+        container:null,
+        positionX: null,
+        positionY: null,
+        powerh: 1.0,
+        src2:""
+      }
+    },
+    ready(){
+      console.log('什么时候进来的')
+      const elementsToMount = document.getElementsByClassName("full-img");
+      this.container = document.createElement('div');
+      this.container.style.height = '0px'
+      // 将要挂载的元素放入新创建的 div中
+      for (let i = 0; i < elementsToMount.length; i++) {
+        this.container.appendChild(elementsToMount[i]);
+      }
+      // 将新创建的 div 挂载到 body 上
+      document.body.appendChild(this.container);
+      this.src2=this.src
+    },
+    beforeDestroy(){
+      // 销毁挂载的
+      if (this.container && this.container.parentNode) {
+        this.container.parentNode.removeChild(this.container);
+      }
+    },
+    methods: {
+      nextPage() {
+        console.log(this.list)
+        this.src2 = this.list
+        // //当前图片，是最后一张图片
+        // if (this.src2=== this.list[this.list.length - 1].f_overall_path) {
+        //     this.src2= this.list[0].f_overall_path
+        //   } else {
+        //   for (let i = 0; i < this.list.length; i++) {
+        //     if (this.src2=== this.list[i].f_overall_path) {
+        //       this.src2= this.list[i + 1].f_overall_path
+        //       break
+        //     }
+        //   }
+        // }
+
+      },
+      previousPage() {
+        console.log(this.list)
+        this.src2 = this.list
+        // //当前图片，是第一张图片
+        // if (this.src2 === this.list[0].f_overall_path) {
+        //   this.src2= this.list[this.list.length - 1].f_overall_path
+        // } else {
+        //   for (let i = 0; i < this.list.length; i++) {
+        //     if (this.src2=== this.list[i].f_overall_path) {
+        //       this.src2= this.list[i - 1].f_overall_path
+        //       break
+        //     }
+        //   }
+        // }
+      },
+      clearStyle(e){
+        if (e === null) {
+          return
+        }
+        this.odiv = document.getElementById('image')
+        this.odiv.style.left = 500 + 'px';
+        this.odiv.style.top = -150 + 'px';
+      },
+      bigimg() {
+        if (event.wheelDelta > 0) {
+          this.powerh = this.powerh * 1.15
+          this.powerw = 1.15 * this.powerw
+        } else {
+          this.powerh = this.powerh * 0.85
+          this.powerw = 0.85 * this.powerw
+        }
+        this.imgState()
+      },
+      dropImage(e) {
+        if (e === null) {
+          return
+        }
+        this.odiv = e.target;
+        let disX = e.clientX - this.odiv.offsetLeft;
+        let disY = e.clientY - this.odiv.offsetTop;
+        document.onmousemove = (e) => {
+          let left = e.clientX - disX;
+          let top = e.clientY - disY;
+          this.positionX = top;
+          this.positionY = left;
+          this.odiv.style.left = left + 'px';
+          this.odiv.style.top = top + 'px';
+        };
+        document.onmouseup = (e) => {
+          document.onmousemove = null;
+          document.onmouseup = null;
+        };
+      },
+      open() {
+        this.deg = 0
+        this.powerw = 0.7
+        this.powerh = 0.8
+        $('.full-img').css({
+          'transform': 'rotate(' + this.deg + 'deg) scale(' + this.powerh + ' ,' + this.powerw + ')'
+        })
+        $('.container').css({
+          'opacity': '1'
+        })
+        this.show = true
+      },
+      close() {
+        this.show = false
+      },
+      leftRevolve() {
+        //tag
+        this.deg -= 90
+        this.imgState()
+      },
+      rightRevolve() {
+        //tag
+        this.deg += 90
+        this.imgState()
+      },
+      imgState() {
+        $('.img-state').css({
+          'transform': 'rotate(' + this.deg + 'deg) scale(' + this.powerh + ' ,' + this.powerw + ')'
+        })
+
+      }
+    },
+    watch:{
+      'src'(val){
+        if(val){
+          this.src2 = val
+        }
+      }
+    }
+  }
+</script>
+<style media="screen" scoped>
+  .full-img {
+    position: fixed;
+    width: 100%;
+    /*height: 1000px;*/
+    overflow: hidden;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 1070;
+    opacity: 1;
+    background: rgba(0, 0, 0, 0.8);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+  }
+
+  .btns {
+    position: fixed;
+    bottom: 100px;
+    height: auto;
+  }
+
+  .btns button {
+    margin-right: 20px;
+  }
+
+  .img-state {
+
+  }
+</style>

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

@@ -25,6 +25,8 @@
     props: {
       // 付款方式
       payment: {},
+      // 业务类型
+      type: {},
       // 用户信息
       row: {},
       // 付款金额
@@ -77,6 +79,9 @@
         this.paymentCodeShow = false
         let data = {
           f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
+          type:this.type?this.type:'燃气费',
+          f_operatorid:this.$login.f.id,
+          f_operator:this.$login.f.name,
           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,

package/src/components/revenue/comprehen/ComprehenOperation/QrPay/QrPayment.vue

@@ -0,0 +1,51 @@
+<template>
+  <tab-button v-ref:list>
+    <tabs header="聚合支付对账汇总">
+      <qr-payment-constrast @deal-msg="dealMsg"></qr-payment-constrast>
+    </tabs>
+    <tabs header="聚合支付对账明细">
+      <qr-payment-details @deal-msg="dealMsg"></qr-payment-details>
+    </tabs>
+  </tab-button>
+</template>
+<script>
+  import TabButton from './../../../comprehen/common/TabButton.vue'
+  import Tabs from './../../../comprehen/common/Tabs.vue'
+  import QrPayment from './QrPaymentDetailed.vue'
+  import QrPaymentConstrast from './QrPaymentConstrast.vue'
+
+  export default {
+    title: '聚合支付对账',
+    data () {
+      return {// 页面开关
+        f_start_date: '',
+        f_end_date: '',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        show: [true]
+      }
+    },
+    components: {QrPaymentConstrast, Tabs, TabButton, QrPayment},
+    ready () {
+      console.log(this.$refs.list)
+      console.log('聚合支付对账')
+    },
+    methods: {
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg (obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      }
+    }
+  }
+</script>

package/src/components/revenue/comprehen/ComprehenOperation/QrPay/QrPaymentConstrast.vue

@@ -0,0 +1,289 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <div class="flex">
+      <criteria-paged :model="model" v-ref:paged>
+        <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="col-sm-2 form-group">
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid='$parent.$parent.curorgid'
+                            @res-select="$parent.$parent.getorg"
+                            class="select select_list"
+                            restype='organization'
+                            style="width: 60%">
+                </res-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label class="font_normal_body">付款方式</label>
+                <v-select
+                  v-model="model.payment"
+                  placeholder='付款方式'
+                  condition="f_payment = '{}'"
+                  :value.sync="model.payment"
+                  :options='$parent.$parent.payment'
+                  close-on-select></v-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label class="font_normal_body">银行名称</label>
+                <v-select
+                  v-model="model.bankName"
+                  placeholder='支付类型'
+                  condition="f_bank_type = '{}'"
+                  :value.sync="model.bankName"
+                  :options='$parent.$parent.bankName'
+                  close-on-select></v-select>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="startDate" class="font_normal_body">开始日期</label>
+                <datepicker id="startDate" placeholder="开始日期"
+                            v-model="model.startDate" style="width: 60%"
+                            :value.sync="model.startDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="col-sm-2  form-group">
+                <label for="endDate" class="font_normal_body">结束日期</label>
+                <datepicker id="endDate" placeholder="结束日期"
+                            v-model="model.endDate" style="width: 60%"
+                            :value.sync="model.endDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="span" style="float:right;">
+                <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              :footer="$parent.$parent.footer"
+                              :header="$parent.$parent.other"
+                              sqlurl="rs/logic/wechatExport" sql-name="QrPaySummary"
+                              template-name='聚合支付对账汇总查询导出' :choose-col="true"></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.hidden()"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>分公司名称</th>
+              <th>银行金额</th>
+              <th>收费记录金额</th>
+              <th>差额</th>
+              <th style="white-space: nowrap;">交易日期</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_orgname}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_total_fee}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_collection}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{((row.f_total_fee-0) - (row.f_collection-0)).toFixed(2)}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_time_end}}</nobr>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+      <table class="table-hover">
+        <tr style="position: relative" class="table-bordered">
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+            汇总信息
+          </td>
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            银行金额汇总:&emsp;{{sumsmodel.f_total_fee}}
+          </td>
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            收费金额汇总:&emsp;{{sumsmodel.f_collection}}
+          </td>
+          <td
+            style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            差额汇总:&emsp;{{((sumsmodel.f_total_fee -0) - (sumsmodel.f_collection -0)).toFixed(2)}}
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+
+let readyGen = async function (self) {
+  self.getfield = self.config.excelHeaders
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+
+export default {
+  title: '聚合支付对账',
+  data () {
+    return {
+      model: new PagedList('rs/sql/QrPaySummary', 20,
+        {}, {f_collection: '', f_total_fee: ''}),
+      config: {
+        // 导出列要和查询列相同
+        excelHeaders: {
+          'f_orgname': '分公司名称',
+          'f_total_fee': '银行金额',
+          'f_collection': '收费记录金额',
+          'f_time_end': '交易日期'
+        }
+      },
+      criteriaShow: false,
+      getfield: {},
+      condition2: '',
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+
+      other: [],
+      footer: [],
+      // 合计数据
+      sumsmodel: {},
+      msg: [],
+      // 公司下拉
+      curorgid: [this.$login.f.orgid]
+    }
+  },
+  props: [],
+  ready () {
+    readyGen(this)
+  },
+  methods: {
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+      console.log('-----------------obj', obj)
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser (obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    },
+    dealmsg (val) {
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    getotherfooter () {
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+      this.other = []
+      this.footer = []
+      // let exportdata = this.getCondition;
+      let otherInData = []
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+      let footerData = [], exportfield = this.getfield
+      footerData.push('合计')
+      let self = this
+      for (var field in self.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+      }
+      this.footer.push(footerData)
+      this.other.push(otherInData)
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.depresid = val
+      this.f_filialeid = val[0]
+      console.log('yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy', val)
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      console.log('查询。。。', this.f_orgid)
+      if (this.f_orgid) {
+        args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        // this.model.params.orgid = this.f_orgid
+      }
+      this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
+      this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      this.condition2 = args.condition
+      this.model.search(args.condition, args.model)
+    },
+    modify (row) {
+      console.log('返回数据1', row)
+      this.$showMessage('确认重置微信支付状态么？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let data = {
+            f_transaction_id: row.f_transaction_id
+          }
+          this.$resetpost('rs/logic/weChatMeter', data, {resolveMsg: null, rejectMsg: '重置出错!!!'}).then((res) => {
+            console.log('返回数据3', res)
+            this.$refs.paged.$refs.cri.search()
+            this.$showAlert(`重置成功!`, 'success', 4000)
+            // this.search()
+          }).catch((error) => {
+            console.log('重置异常', res)
+          })
+        }
+      })
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition: this.condition2
+      }
+    },
+    bankName () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('聚合支付银行名称')]
+    },
+    payment () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('聚合支付付款方式')]
+    }
+  },
+  watch: {
+    sumsmodel: {
+      handler: function (val) {
+        this.getotherfooter()
+      },
+      deep: true
+    }
+  }
+}
+</script>