sale-client 3.7.54 → 3.7.56

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Mar 24 09:35:09 CST 2026
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:9014/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['https://www.qtxbnrq.cn:6300/', 'http://localhost:8080/', 'https://www.qtxbnrq.cn:6300/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,14 +20,15 @@ var devConfig = {
     },
     proxy: {
 
-      '/rs/file': {
-        pathRewrite: {
-          '^/rs/file/': '/api/af-revenue/file/'
-        },
-        target: serverRul
-      },
+      // '/rs/file': {
+      //   pathRewrite: {
+      //     '^/rs/file/': '/api/af-revenue/file/'
+      //   },
+      //   target: serverRul
+      // },
       '/api': {
-        target: v4Url
+        target: v4Url,
+        ws: true
       },
       '/sketch': {
         target: serverRul,
@@ -46,7 +47,8 @@ var devConfig = {
         target: serverRul
       },
       '/rs/sql/singleTable': {
-        target: localUrl
+        target: serverRul,
+        ws: true
       },
       '/invoice': {
         // pathRewrite: {
@@ -60,65 +62,18 @@ var devConfig = {
 
       // 查找资源服务数据
       '/rs/search': {
-        target: serverRul
+        target: serverRul,
+        ws: true
       },
       // 查找资源服务数据
       '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: localUrl
-      },
-      // 用户登录服务地址
-      '/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/webHandReverse': {
-        target: 'http://localhost:8085'
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/entity': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
+        target: serverRul,
+        ws: true
       },
       '/rs': {
-        target: serverRul
-        // changeOrigin: true
+        target: serverRul,
+        changeOrigin: true,
+        ws: true
       }
     }
   }

package/kdn

@@ -0,0 +1,44 @@
+  TaiYuan
+  V3
+  V3_修复阳春机表查询
+  V3_卡表抄表：使用类型条件筛查项
+  V3_商洛补气记录维护布局调整
+  V3_巴彦卡表收费四舍五入
+  V3_巴彦卡表收费计算公式添加结果
+  V3_巴彦退费问题
+  V3_巴彦问题修改
+  V3_巴彦需求
+  V3_府谷欠费停用
+  V3_府谷欠费停用修改之前的错
+  V3_德信其他欠费需求
+  V3_武安添加表前封号和表后封号
+  V3_泾阳发票管理需求
+  V3_泾阳对账添加商户号
+  V3_泾阳报错
+  V3_泾阳自助机对账
+  V3_清涧
+  V3_清涧批量修改调压箱
+  V3_清零换表写卡问题
+  V3_燎原问题
+  V3_石门增加自助机对账汇总
+  V3_石门评价
+  V3_科莱需求
+  V3_综合收费查询添加查询条件证件号
+  V3_荣创其他收费服务人员改必选
+  V3_荣成报警器年限
+  V3_荣成改错
+  V3_贵州鼎城附件上传问题
+  V3_附件查看图片显示
+* V3toV4
+  aode
+  aodelinshi
+  fanxiangas
+  jincheng
+  ningdu
+  weinan-v3
+  xianyangOracle
+  巩义V3
+  巴彦淖尔
+  府谷正式
+  彩虹V3
+  龙山V3

package/package.json

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

package/src/filiale/qingtongxia/MeterDisable/DisableManage.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">停用原因</label>
+            <v-select v-model="model.f_reason"
+                      placeholder='停用原因'
+                      :value.sync="model.f_reason"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <upload :blodid="blodid"  :businessid="randomBusinessId" isremark="true" :deleteimg="true" fusetype="停用"></upload>
+</template>
+<script>
+  /**
+   *综合业务
+   表具停用组件
+   */
+  export default {
+    title: '表具停用',
+    props: ['row'],
+    data () {
+      return {
+        blodid: '',
+        showupload: true,
+        model: {},
+        randomBusinessId: '',
+        reason: this.$appdata.getParam('停用原因')
+      }
+    },
+    ready () {
+      this.blodid = this.row.f_userinfo_id
+      this.getRandomId()
+    },
+    methods: {
+      getRandomId () {
+        this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
+      async confirm () {
+        await this.$LogicService.meterDisable(this.model, this.row)
+        let array = [{
+          f_user_id: this.row.f_user_id,
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_alias: this.row.f_alias,
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_orgname: this.$login.f.orgs,
+          f_orgid: this.$login.f.orgid,
+          f_meternumber: this.row.f_meternumber
+        }]
+        // if (this.row.f_meter_type === '物联网表') {
+        //   await this.$resetpost('rs/logic/iot_instructUpdateAndDelect',
+        //     {
+        //       data: {
+        //         data1: {
+        //           f_apply_type: '阀门控制',
+        //           userid: array,
+        //           nowDate: new Date(),
+        //           f_apply_value: '关阀',
+        //           f_apply_beizhu: '表具停用自动关阀',
+        //           f_apply_operator: this.$login.f.name
+        //         },
+        //         data2: {
+        //           userid: array,
+        //           instructtype: '阀门控制',
+        //           isOpen: '关阀',
+        //           instructTitle: '手动关阀',
+        //           reasonInfo: '表具停用自动关阀',
+        //           f_instruct_state: '待发送',
+        //           inputtor: this.$login.f.name
+        //         }
+        //       }
+        //     })
+        // }
+        this.$dispatch('success')
+      },
+      clean () {
+        this.$dispatch('refresh')
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/qingtongxia/MeterEnable/EnableManage.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-6  form-group">
+            <label class="font_normal_body">停用时间</label>
+            <input type="text" class="input_search" v-model="disable.f_operate_date" style="width:60%" disabled placeholder="上次停用时间"/>
+          </div>
+          <div class="col-sm-6  form-group">
+            <label class="font_normal_body">操作人</label>
+            <input type="text" class="input_search" v-model="disable.f_operator" style="width:60%" disabled placeholder="操作人"/>
+          </div>
+          <div class="col-sm-12  form-group">
+            <label class="font_normal_body">停用原因</label>
+            <input type="text" class="input_search" v-model="disable.f_comments" style="width:60%" disabled placeholder="停用原因"/>
+          </div>
+          <div class="col-sm-12  form-group">
+            <label class="font_normal_body">其他原因</label>
+            <input type="text" class="input_search" v-model="disable.f_othereason" style="width:60%" disabled placeholder="停用原因"/>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">启用原因</label>
+            <v-select v-model="model.f_comments" style="width:60%"
+                      placeholder='启用原因'
+                      :value.sync="model.f_comments"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+          <div class="checkbox col-sm-4" style="margin-left:5%" v-if="!kaifa&&row.f_meter_type ==='物联网表'">
+            <label>
+              <input style="zoom: 200%;top: 1px;left: 14px;" @click="changeisuse(true)" type="checkbox" name="optionsRadios" :id="'optionsRadios'+index" value="option1"  :checked="kaifa?'checked':''">
+              开阀
+            </label>
+          </div>
+          <div class="checkbox col-sm-4" style="margin-left:5%" v-if="kaifa&&row.f_meter_type ==='物联网表'">
+            <label>
+              <input style="zoom: 200%;top: 1px;left: 14px;" @click="changeisuse(false)" type="checkbox" name="optionsRadios" :id="'optionsRadios'+index" value="option1"  :checked="kaifa?'checked':''">
+              开阀
+            </label>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+/**
+*综合业务
+*表具启用组件
+*/
+
+let meterEnable = async function (self, model, row) {
+  let data = {
+    f_userfiles_id: {
+      f_userfiles_id: row.f_userfiles_id,
+      f_table_state: '正常',
+      version: row.version
+    },
+    f_user_id: row.f_user_id,
+    record_userinfo: row.f_userinfo_id,
+    f_userinfo_id: row.f_userinfo_id,
+    f_user_name: row.f_user_name,
+    f_user_phone: row.f_user_phone,
+    f_state: '有效',
+    f_comments: model.f_comments[0],
+    f_othereason: model.f_othereason,
+    f_operat_type: '启用',
+    f_describe: `${self.$login.f.name}对客户${row.f_user_name}进行表具启用操作`,
+    f_operator: self.$login.f.name,
+    f_operatorid: self.$login.f.id,
+    f_orgid: self.$login.f.orgid,
+    f_orgname: self.$login.f.orgs,
+    f_depid: self.$login.f.depids,
+    f_depname: self.$login.f.deps,
+    f_zoneid: self.$login.f.zoneid,
+    f_zones: self.$login.f.zones
+  }
+  await self.$resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
+  if (self.kaifa) {
+    let array = [{
+      f_user_id: self.row.f_userfiles_id,
+      f_alias: self.row.f_alias,
+      f_userinfo_id: self.row.f_userinfo_id,
+      f_orgname: self.$login.f.orgs,
+      f_orgid: self.$login.f.orgid,
+      f_meternumber: self.row.f_meternumber
+    }]
+    // await self.$resetpost('rs/logic/iot_instructUpdateAndDelect',
+    //   {
+    //     data: {
+    //       data1: {
+    //         f_apply_type: '阀门控制',
+    //         userid: array,
+    //         nowDate: new Date(),
+    //         f_apply_value: '开阀',
+    //         f_apply_beizhu: '表具停用自动开阀',
+    //         f_apply_operator: self.$login.f.name
+    //       },
+    //       data2: {
+    //         userid: array,
+    //         instructtype: '阀门控制',
+    //         isOpen: '开阀',
+    //         instructTitle: '手动开阀',
+    //         f_instruct_state: '待发送',
+    //         inputtor: self.$login.f.name
+    //       }
+    //     }
+    //   }).then(res => {
+    //     console.log(res)
+    //     let sql = `update t_userfiles set f_network_valve = 0  where f_userfiles_id = '${self.row.f_userfiles_id}'`
+    //     self.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
+    //   })
+  }
+  self.$dispatch('success')
+}
+
+export default {
+  title: '启用管理',
+  props: ['row'],
+  data () {
+    return {
+      model: {
+      },
+      select: {
+        f_date: '',
+        f_reason: ''
+      },
+      reason: this.$appdata.getParam('启用原因'),
+      disable: {},
+      kaifa: false
+    }
+  },
+  ready () {
+    this.deactivatedReason()
+  },
+  methods: {
+    changeisuse (val) {
+      if (val) {
+        this.kaifa = true
+      } else {
+        this.kaifa = false
+      }
+    },
+    // 查询停用原因
+    async deactivatedReason () {
+      let data = {
+        tablename: 't_disable',
+        condition: `id = (select max(id) from t_disable where f_userfiles_id = '${this.row.f_userfiles_id}')`
+      }
+      let res = await this.$resetpost('rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取上次停用原因失败'})
+      this.disable = res.data[0]
+    },
+    confirm () {
+      meterEnable(this, this.model, this.row)
+      // this.$LogicService.meterEnable(this.model, this.row)
+      // .then(
+      //   (res) => this.$dispatch('success', '表具启用', this.row, res)
+      // ).catch(
+      //   (error) => {
+      //     if (error.state === 603) {
+      //       this.$error('重复提交')
+      //       return
+      //     }
+      //     this.$dispatch('error', '表具启用', this.row, error)
+      //   }
+      // )
+    },
+    clean () {
+      this.$dispatch('refresh')
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/qingtongxia/UserBaseInfoNew.vue

@@ -173,7 +173,7 @@
         <button v-if="row.f_meter_type.includes('物联网表')"
                 class="button_search" type="button" @click="openUser">开户
         </button>
-        <button v-if="row.f_meter_type.includes('物联网表') && valveLimit && row.f_network_valve === '1'"
+        <button v-if="row.f_meter_type.includes('物联网表') && valveLimit"
                 class="button_search" type="button" @click="valvecontrol">开关阀
         </button>
         <button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"

package/src/filiale/qingtongxia/sale.js

@@ -24,4 +24,8 @@ export default function () {
   Vue.component('meter-message', (resolve) => { require(['./MeterMessage.vue'], resolve) })
   // 换表
   Vue.component('change-meter', (resolve) => { require(['./newchangemeter/ChangeMeter.vue'], resolve) })
+  // 表具停用
+  Vue.component('disable-manage', (resolve) => { require(['./MeterDisable/DisableManage'], resolve) })
+  // 表具启用
+  Vue.component('enable-manage', (resolve) => { require(['./MeterEnable/EnableManage'], resolve) })
 }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/kelai/sale'
+import FilialeSale from './filiale/qingtongxia/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'