sale-client 3.6.529 → 3.6.531

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Apr 28 13:42:54 CST 2025
+gradle.version=5.2.1

package/package.json

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

package/src/filiale/gehua/CardMeterCenter.vue

@@ -338,10 +338,15 @@
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
           if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
+            if (self.row.f_user_type === '非民用' && self.model.f_print[0] !== '收费凭证') {
               self.billData.url = 'rs/report/fmy_card_bill'
+            } else if (self.row.f_user_type === '非民用' && self.model.f_print[0] === '收费凭证') {
+              self.billData.url = 'rs/report/fmy_card_bill_voucher'
             }
           }
+          if (self.model.f_print[0] === '收费凭证' && self.row.f_user_type === '民用') {
+            self.billData.url = 'rs/report/card_bill_voucher'
+          }
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
             self.row.id = res

package/src/filiale/gehua/IOTMeterCenter.vue

@@ -319,10 +319,15 @@
         if (self.model.f_print.indexOf('电子发票') == -1) {
           console.log('self.config.hasBillManage', self.config.hasBillManage)
           if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
+            if (self.row.f_user_type === '非民用' && self.model.f_print[0] !== '收费凭证') {
               self.billData.url = 'rs/report/fmy_iot_bill'
+            } else if (self.row.f_user_type === '非民用' && self.model.f_print[0] === '收费凭证') {
+              self.billData.url = 'rs/report/fmy_iot_bill_voucher'
             }
           }
+          if (self.model.f_print[0] === '收费凭证' && self.row.f_user_type === '民用') {
+            self.billData.url = 'rs/report/iot_bill_voucher'
+          }
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
             self.row.id = res.data.id

package/src/filiale/gehua/MachineMeterCenter.vue

@@ -227,11 +227,16 @@ let asyncMachineMeterCenter = async function (self) {
       if (self.config.hasPrint) {
         if (self.data.f_print.indexOf('电子发票') == -1) {
           if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
+            if (self.row.f_user_type === '非民用' && self.data.f_print[0] !== '收费凭证') {
               self.billData.url = 'rs/report/fmy_machine_bill'
+            } else if (self.row.f_user_type === '非民用' && self.data.f_print[0] === '收费凭证') {
+              self.billData.url = 'rs/report/fmy_machine_bill_voucher'
             }
           }
           if (self.config.hasBillManage) {
+            if (self.data.f_print[0] === '收费凭证' && self.row.f_user_type === '民用') {
+              self.billData.url = 'rs/report/machine_bill_voucher'
+            }
             // 启用发票管理，获取票据管理中的票号并存储记录
             self.data.id = res.data
             self.data.f_bill_type = '机表收费'
@@ -241,9 +246,11 @@ let asyncMachineMeterCenter = async function (self) {
             // 如果不欠费就用下边的预存收据
             if (self.$parent.$children[0].selecteds) {
               console.log('1111111', self.$parent.$children[0].selecteds)
-              if (self.$parent.$children[0].selectedRows === 0) {
+              if (self.$parent.$children[0].selectedRows === 0 && self.data.f_print[0] !== '收费凭证') {
                 console.log('22222222', self.$parent.$children[0].selectedRows)
                 self.billData.url = 'rs/report/pre_sell'
+              } else {
+                self.billData.url = 'rs/report/pre_sell_voucher'
               }
               // 获取选中的handplan的id
               self.data.handid = ''
@@ -251,8 +258,13 @@ let asyncMachineMeterCenter = async function (self) {
                 self.data.handid = self.data.handid + "','" + row.handplan_id
               })
             } else {
-              console.log('3333333')
-              self.billData.url = 'rs/report/pre_sell'
+              console.log('2131231223123123132212131223123123123212', self.model)
+              if (self.data.f_print[0] === '收费凭证') {
+                self.billData.url = 'rs/report/pre_sell_voucher'
+              } else {
+                console.log('3333333')
+                self.billData.url = 'rs/report/pre_sell'
+              }
               self.data.handid = ''
             }
             self.data.id = res.data
@@ -285,6 +297,7 @@ let asyncMachineMeterCenter = async function (self) {
         self.$dispatch('success', '机表收费确认', self.row, self.data)
       }
     } catch (error) {
+      console.error(error)
       self.$showAlert(error, 'danger', 0)
       self.$dispatch('refresh')
     }

package/src/filiale/gehua/OtherChargeNew.vue

@@ -238,6 +238,9 @@ let otherChargeGen = async function (self, parameter) {
     // }
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
       if (self.model.f_print[0] != '电子发票') {
+        if (self.model.f_print[0] === '收费凭证') {
+          self.billData.url = 'rs/report/otherCharge_bill_voucher'
+        }
         if (self.config.hasBillManage) {
           self.row.id = resid.data
           self.row.f_bill_type = '其他收费'

package/src/filiale/gehua/OverUseCharge.vue

@@ -226,6 +226,9 @@ let overChargeGen = async function (self) {
     console.log('超用收费返回id', res)
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
       if (self.model.f_print.indexOf('电子发票') == -1) {
+        if (self.model.f_print[0] === '收费凭证') {
+          self.billData.url = 'rs/report/overuse_bill_voucher'
+        }
         if (self.config.hasBillManage) {
           // 启用发票管理，获取票据管理中的票号并存储记录
           self.row.id = res.data

package/src/filiale/jingyang/QueryInstruct.vue

@@ -0,0 +1,356 @@
+<template>
+  <div @keyup.enter="search" class="span">
+    <criteria-paged :model="model" class="list_area table_sy" v-ref:paged>
+      <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+          <div class="row">
+
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">指令类型</label>
+              <v-select :options='$parent.$parent.instructType' :value.sync="model.f_instruct_type"
+                        close-on-select
+                        condition="f_instruct_type='{}'"
+                        placeholder='指令类型'
+                        style="width: 60%"
+                        v-model="model.f_instruct_type"></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">指令状态</label>
+              <v-select :options='$parent.$parent.instructState' :value.sync="model.f_instruct_state"
+                        close-on-select
+                        condition="f_instruct_state='{}'"
+                        placeholder='指令状态'
+                        style="width: 60%"
+                        v-model="model.f_instruct_state"
+              ></v-select>
+            </div>
+
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">开始时间</label>
+              <datepicker :format="'yyyy-MM-dd HH:mm:ss'"
+                          :value.sync="model.f_start_date"
+                          class="datepicker"
+                          condition="f_instruct_date > '{}'"
+                          placeholder="起始时间"
+                          style="width: 60%"
+                          v-model="model.f_start_date"
+              ></datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">结束时间</label>
+              <datepicker :format="'yyyy-MM-dd HH:mm:ss'"
+                          :value.sync="model.f_end_date"
+                          class="datepicker"
+                          condition="f_instruct_date < '{}'"
+                          placeholder="结束时间"
+                          style="width: 60%"
+                          v-model="model.f_end_date"
+              ></datepicker>
+            </div>
+            <div style="float: right">
+              <button @click="search()" class="button_search" v-el:cba>查询</button>
+            </div>
+          </div>
+
+        </div>
+      </criteria>
+      <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align:center;">
+              <nobr>指令类型</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>指令内容</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>指令状态</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>指令生成时间</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>指令发送时间</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>指令上表时间</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>操作人</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>操作时间(记录)</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>操作类型</nobr>
+            </th>
+<!--            查这里-->
+            <th style="text-align:center;">
+              <nobr>操作状态</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>操作人(记录)</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>操作内容</nobr>
+            </th>
+            <th style="text-align:center;">
+              <nobr>操作/指令状态</nobr>
+            </th>
+            <!--<th style="text-align:center;"><nobr>发送原因</nobr></th>
+            <th style="text-align:center;"><nobr>取消原因</nobr></th>-->
+            <th style="text-align:center;">
+              <nobr>备注信息</nobr>
+            </th>
+            <th style="text-align:center;" v-if="['HaiLiSystem','BoGuanSystem'].includes( $parent.$parent.$parent.row.f_alias)">
+<!--            <th style="text-align:center;">-->
+              <nobr>写卡操作</nobr>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center;">
+              <nobr>{{row.f_instruct_type}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_instruct_title}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_instruct_state}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_instruct_date}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_send_date}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_callback_date}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_inputtor}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_operate_date}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_type}}</nobr>
+            </td>
+<!--            这里-->
+            <td style="text-align:center;">
+              <nobr>{{$parent.$parent.$parent.stateFlow(row)}}</nobr>
+<!--              <nobr>{{row.f_state}}</nobr>-->
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
+            <td style="text-align:center;">
+              <nobr>{{row.f_operator_data}}</nobr>
+            </td>
+            <td style="text-align:center;" v-if="row.f_instruct_state === '待发送' && row.f_instruct_state !== '取消发送'">
+              <nobr>
+                {{row.f_instruct_state}}
+                <button v-if="$login.r.includes('取消指令')" @click="$parent.$parent.$parent.backSend(row)" class="button_search" style="margin-left:1rem" v-el:cba>取消指令</button>
+              </nobr>
+            </td>
+            <td style="text-align:center;" v-if="row.f_instruct_state !== '待发送' && row.f_instruct_state !== '取消发送'">
+              <nobr>
+                {{row.f_receive_state}}
+
+              <button v-if="$login.r.includes('指令重发')" @click="$parent.$parent.$parent.reSend(row)" class="button_search" style="margin-left:1rem" v-el:cba>指令重发</button>
+              </nobr>
+            </td>
+            <td style="text-align:center;" v-if="row.f_instruct_state === '取消发送'">
+              <nobr>
+                <span title="操作人:{{row.f_cancel_inputtor}},操作原因:{{row.f_comments}}">已取消</span>
+              </nobr>
+            </td>
+            <!-- <td style="text-align:center;"><nobr>{{row.f_info}}</nobr></td>
+             <td style="text-align:center;"><nobr>{{row.f_comments}}</nobr></td>-->
+            <td style="text-align:center;">
+              <nobr><span >{{row.f_info}}</span></nobr>
+            </td>
+            <th style="text-align:center;"  v-if="['HaiLiSystem','BoGuanSystem'].includes( $parent.$parent.$parent.row.f_alias)">
+<!--            <th style="text-align:center;">-->
+              <button @click.stop='$parent.$parent.$parent.instructWriteCard(row)'
+                      class="button_search" type="button"
+                      v-show="row.f_instruct_type === '远程充值'">写卡</button>
+            </th>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="handcental" backdrop="false" v-ref:modal>
+      <header class="modal-header" slot="modal-header">
+        <h4 class="modal-title">取消发送</h4>
+      </header>
+      <article class="modal-body" slot="modal-body">
+        <div class="form-group">
+          <label  class="font_normal_body" >取消发送原因</label>
+          <textarea class="form-control" placeholder="请填写取消发送原因" rows="3" v-model="cancelreason"></textarea>
+        </div>
+      </article>
+      <footer class="modal-footer" slot="modal-footer">
+        <button @click='close' class="btn btn-default" type="button" v-show="handcental">取消</button>
+        <button @click='confirmcenta()' class="button_search" type="button" v-show="handcental">确认</button>
+      </footer>
+    </modal>
+  </div>
+
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '指令查看',
+  name: 'Querylnstruct',
+  props: {
+    row: {},
+    tablename: {
+      type: String,
+      default: 't_instruct'
+    },
+    orderitem: {
+      type: String,
+      default: 'f_instruct_date desc'
+    },
+    items: {
+      type: String,
+      default: '*'
+    }
+  },
+  data () {
+    return {
+      handcental: false,
+      cancelreason: '',
+      cancelid: '',
+      f_userfiles_id: '',
+      model: new PagedList('rs/sql/insturctDetailQuery', 30, {f_userfiles_id: this.row.f_userfiles_id}),
+      row: null,
+      searchshow: false,
+      show: false,
+      maxId: ''
+    }
+  },
+
+  async ready () {
+    console.log(this.$login.r)
+    await this.$refs.paged.$refs.criteria.search()
+    // if (this.row.f_meter_brand === '承德NB物联网表') {
+    // // if (true) {
+    //   let http = new HttpResetClass()
+    //   let getMax = await http.load('POST', 'rs/sql/querySingleTable', {data: {items: 'max(id) id',
+    //     tablename: 't_instruct',
+    //     condition: ` f_userfiles_id='${this.row.f_userfiles_id}' `
+    //   }}, {resolveMsg: null, rejectMsg: null})
+    //   this.maxId = getMax.data[0].id
+    // }
+  },
+  watch: {
+    'row' (val) {
+      this.f_userfiles_id = val.f_userfiles_id
+      if (this.row != null) {
+        this.$refs.paged.$refs.criteria.search()
+      }
+    }
+  },
+  methods: {
+    async instructWriteCard (row) {
+      let res = await this.$CardService.instructWriteCard(this.row)
+      if (res) {
+        let sql = `update t_instruct set f_instruct_state = '执行成功' WHERE id = ${row.id}`
+        await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
+        await this.$refs.paged.$refs.criteria.search()
+      }
+    },
+    async reSend (param) {
+      let data = {
+        id: param.id,
+        f_user_name: this.row.f_user_name,
+        f_userinfo_id: param.f_userinfo_id,
+        operateInfo: {
+          f_operator: Vue.$login.f.name,
+          f_operatorid: Vue.$login.f.id,
+          f_orgid: Vue.$login.f.orgid,
+          f_orgname: Vue.$login.f.orgs,
+          f_depid: Vue.$login.f.depids,
+          f_depname: Vue.$login.f.deps,
+          f_zoneid: Vue.$login.f.zoneid,
+          f_zones: Vue.$login.f.zones
+        }
+      }
+      await this.$resetpost('rs/logic/iotResendInstruct', {data: data}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
+      this.$refs.paged.$refs.criteria.search()
+    },
+    stateFlow: function (row) {
+      console.log(row)
+      let state = ''
+      if (row.f_instruct_type.includes('阀门控制')) {
+        let content = JSON.parse(row.f_instruct_content)
+        if (content.isOpen !== null) {
+          if (content.isOpen === 1) {
+            state = '开阀'
+          } else if (content.isOpen === 0) {
+            state = '关阀'
+          } else {
+            state = row.f_state
+          }
+          return state
+        }
+      } else {
+        return row.f_state
+      }
+    },
+    clickshow () {
+      this.searchshow = !this.searchshow
+    },
+    backSend (megrow) {
+      if (megrow.f_inputtor != '系统必需') {
+        this.handcental = true
+        this.cancelid = megrow.id
+      } else {
+        this.$showAlert('该指令为系统必需状态，无法取消发送。', 'warning', 3000)
+      }
+    },
+    confirmcenta () {
+      let send = {
+        id: this.cancelid,                                       // 当前记录ID
+        f_cancel_inputtor_id: this.$login.f.id,         // 撤销人id
+        f_cancel_inputtor: this.$login.f.name,         // 撤销人姓名
+        f_instruct_state: '取消发送',
+        f_comments: this.cancelreason
+      }
+      let param = {
+        tablename: 't_instruct',
+        basedata: send
+      }
+      this.$resetpost('rs/logic/iot_saveTable', param).then(() => {
+          // this.params.rows.splice(index, 1)
+        console.log('更新成功！')
+      })
+      this.handcental = false
+      this.$refs.paged.$refs.criteria.search()
+    },
+    search (arg) {
+      arg.condition = `${arg.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
+      this.model.search(arg.condition, arg.model)
+    }
+  },
+  computed: {
+    instructType () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('指令类型')]
+    },
+    instructState () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('指令状态')]
+    }
+  }
+}
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+</style>

package/src/filiale/jingyang/sale.js

@@ -37,4 +37,6 @@ export default function () {
   Vue.component('meter-charge-record-query', (resolve) => { require(['./ChargeRecordQuery'], resolve) })
   // pos对账界面
   Vue.component('wechat-validate-manage', (resolve) => { require(['./wechatValidateManage.vue'], resolve) })
+  // pos对账界面
+  Vue.component('query-instruct', (resolve) => { require(['./QueryInstruct.vue'], resolve) })
 }

package/src/filiale/qianneng/revenue/machineHandManage/machineHand.vue

@@ -1030,6 +1030,7 @@ export default {
       console.log('下发参数：', param)
       if (this.danhu.info.f_meter_classify === '物联网表' && this.webhand) {
         param.f_meter_base = this.danhu.f_tablebase
+        param.f_input_person = this.$login.f.name
         param.f_hand_date = this.downModel.downDate
         param.f_userfiles_id = param.userfilesid
         this.$resetpost('rs/logic/iotSettlement', {data: param}, {resolveMsg: '单户抄表成功', rejectMsg: '单户抄表失败'}).then((res)=>{