sale-client 3.5.90 → 3.5.92

package/package.json

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

package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue

@@ -136,7 +136,7 @@
             <td style="text-align:center"><nobr>{{row.f_value}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_filiale_name}}</nobr></td>
             <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.f_price_id,row.f_price_name,row.f_filialeid)" class="btn btn-link"><b>{{row.usercount}}</b></button></td>
-            <td style="text-align:center">{{row.f_state === '待审核' ? '待审核' : '使用中'}}</td>
+            <td style="text-align:center">{{row.f_price_state}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.config.audit">
               <button :disabled="$login.r.includes('气价审核')" @click.stop="$parent.$parent.$parent.passPrice(row)"
                       class="btn btn-link" v-if="row.f_state === '待审核'">通过

package/src/components/webMeter/paramSaveNew/ParamHistory.vue

@@ -6,24 +6,39 @@
           <li class="active"><a>{{data.name}}</a></li>
         </ul>
         <div class="col-sm-12"  style="height: auto" v-for="param in data.params">
-          {{param.name}}：{{row[param.title]}}
+          {{param.name}}：{{row[param.title].bak_val}}
         </div>
       </div>
+      <div style="height: auto">
+        <ul class="nav nav-tabs col-sm-12" >
+          <li class="active"><a>软件版本号</a></li>
+        </ul>
+        {{row['getMeterVersion'].bak_val||'暂无数据'}}
+<!--        [{"yjbbhlength":28,"softversionNo":"n0100081","mzbbhlength":15,"mzversion":"BC25PAR01A04_BT","version":"2022-07-28","yjversion":"YIMS-M-T1-3-1-H-2-13-17_V1.1"}]-->
+      </div>
+      <div style="height: auto">
+        <ul class="nav nav-tabs col-sm-12" >
+          <li class="active"><a>下次上报日期</a></li>
+        </ul>
+        {{row['readNextreportTime'].bak_val||'暂无数据'}}
+      </div>
     </div>
   </div>
   <div class="binary-right" style="width:74%;overflow-y: auto;max-height:1000px;">
     <div class="row list_area table_sy">
       <table class="table table-bordered table-striped table-hover" id="table1" >
         <thead>
-        <th style="text-align:center"><nobr>操作</nobr></th>
-        <th style="text-align:center"><nobr>指令发送状态</nobr></th>
+        <tr>
+          <th style="text-align:center"><nobr>指令发送状态</nobr></th>
+          <th style="text-align:center"><nobr>操作</nobr></th>
+        </tr>
         <!--        <th style="text-align:center"><nobr>客户类型</nobr></th>-->
         <!--        <th style="text-align:center"><nobr>气表品牌</nobr></th>-->
         </thead>
         <tbody>
         <tr v-for="row in history">
-          <td><nobr>{{row.msg}}</nobr></td>
           <td><nobr>{{row.f_instruct_state}}</nobr></td>
+          <td><nobr>{{row.msg}}</nobr></td>
           <!--          <td><nobr>{{row.f_user_type}}</nobr></td>-->
           <!--          <td><nobr>{{row.f_meter_brand}}</nobr></td>-->
         </tr>
@@ -35,77 +50,92 @@
 
 
 <script>
-  import {PagedList} from 'vue-client'
-
 export default {
-    title: '表计信息修改',
-    props: ['user', 'checked1', 'gasbrandid'],
-
-    data () {
-      return {
-        newmeterinfo: [{}],
-        history: [],
-        row: {},
-        gasbrand: null
-      }
-    },
-    ready () {
+  title: '表计信息修改',
+  props: ['user', 'checked1', 'gasbrandid'],
+  data () {
+    return {
+      newmeterinfo: [{}],
+      history: [],
+      row: {},
+      gasbrand: null
+    }
+  },
+  ready () {
 
-    },
-    watch: {
-      'user': {
-        handler: async function (val) {
-          this.history = []
-          if (val.length === 1) {
-            await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
-              this.row = {}
-              console.log('=============', rat.data)
-              this.row.forceSafeCheckUsedDayCount = 0
-              this.row.currStairUsedGasCount = 0
-              this.row.forceScrapUsedDayCount = 0
-              this.row.isForceSrape = '1'
-              if (rat.data.length > 0) {
-                rat.data.forEach((item) => {
-                  if(item.f_param_value === '1'){
-                    item.f_param_value = '开'
+  },
+  watch: {
+    'user': {
+      handler: async function (val) {
+        this.history = []
+        if (val.length === 1) {
+          await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
+            this.row = {}
+            console.log('=============', rat.data)
+            this.row.forceSafeCheckUsedDayCount = 0
+            this.row.currStairUsedGasCount = 0
+            this.row.forceScrapUsedDayCount = 0
+            this.row.isForceSrape = '1'
+            if (rat.data.length > 0) {
+              rat.data.forEach((item) => {
+                if (item.f_param_value === '1') {
+                  item.f_param_value = '开'
+                }
+                if (item.f_param_value === '0') {
+                  item.f_param_value = '关'
+                }
+                if (item.f_param_name === '读表功能') {
+                  if (item.f_param_value && item.f_param_value === 'getMeterVersion') {
+                    item.f_back_content = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['softversionNo']
                   }
-                  if(item.f_param_value === '0'){
-                    item.f_param_value = '关'
+                  if (item.f_param_value && item.f_param_value === 'readNextreportTime') {
+                    let str = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['datetime']
+                    item.f_back_content = '20' + str.substr(0, 2) + '-' + str.substr(2, 2) + '-' + str.substr(4, 2) + ' ' +
+                    str.substr(6, 2) + ':' + str.substr(8, 2) + ':' + str.substr(10, 2)
                   }
-                  this.row[item.f_param_lname] = item.f_param_value
-                })
+                  if (!item.f_param_value) {
+                    item.f_param_value = '暂无数据'
+                  }
+                  this.row[item.f_param_value] = {set_val: item.f_param_value, bak_val: item.f_back_content}
+                } else {
+                  this.row[item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
+                }
+              })
                 // let param = JSON.parse(rat.data[0].f_data)
                 // console.log(param)
                 // this.row= param
-              }
-            })
-            await this.$resetpost('rs/sql/getParamInstruct', {data: {condition: `i.f_userfiles_id='${val[0].f_userfiles_id}'` }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-              this.history = res.data
-            })
-          }
-          if (this.gasbrandid[0]) {
-            await this.refreshParam(this.gasbrandid[0])
-          }
-        },
-        deep: true
+            }
+          })
+          await this.$resetpost('rs/sql/getParamInstruct', {data: {condition: `i.f_userfiles_id='${val[0].f_userfiles_id}'` }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.history = res.data
+          })
+        }
+        if (this.gasbrandid[0]) {
+          await this.refreshParam(this.gasbrandid[0])
+        }
+      },
+      deep: true
 
-      }
+    }
+  },
+  methods: {
+    close () {
+      this.$dispatch('close')
     },
-    methods: {
-      close () {
-        this.$dispatch('close')
-      },
-      async refreshParam (val) {
-        this.newmeterinfo = [{}]
-        try {
-          let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
-          this.newmeterinfo = res.data
-        } catch (error) {
-          this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
-        }
+    async refreshParam (val) {
+      this.newmeterinfo = [{}]
+      try {
+        let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
+        this.newmeterinfo = res.data.filter(item => { return (item.name !== '读表功能' && item.name !== '读记录数据') })
+      } catch (error) {
+        this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
       }
+    },
+    readNextReportTime_parse () {
+      let str = JSON.parse(row['readNextreportTime'].bak_val)[0].datetime
     }
   }
+}
 </script>
 <style>
   .btn-border {

package/src/filiale/tongchuan/TransferRecords.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="flex-column">
+    <div class="span" style="">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转出方编号</label>
+              <input class="input_search" style="width:60%" type="text" title="转出方编号" v-model="model.out_userinfo_code"
+                  readonly   placeholder="用户姓名">
+            </div>
+            <div class="col-sm-4">
+            <label for="f_newuser_name" id="label" class="font_normal_body">转出方姓名</label>
+              <input class="input_search" style="width:60%" type="text" title="转出方姓名" v-model="model.out_user_name"
+                  readonly   placeholder="用户姓名">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4" title="回车搜索传出方信息" :class="[$v.in_userinfo_code.required ? 'has-error' : 'has-success']">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转&emsp;入&emsp;方</label>
+              <input class="input_search" style="width:60%" type="text" title="回车搜索转入方信息" v-model="model.in_userinfo_code"
+                     v-validate:in_userinfo_code='{required: true }'  @keydown.enter="searchByCode"  placeholder="转出方编号，按下回车进行查询">
+            </div>
+            <div class="col-sm-4" :class="[$v.in_user_name.required ? 'has-error' : 'has-success']">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转入方姓名</label>
+              <input class="input_search" style="width:60%" type="text" title="转入方姓名" v-model="model.in_user_name"
+                     v-validate:in_user_name='{required: true }' readonly  placeholder="转入方姓名">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-12" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
+              <label id="label" for="f_comments" class="font_normal_body">&nbsp;备&emsp;&emsp;注</label>
+              <input class="input_search" style="width:87%" v-model="model.f_comments"
+                     v-validate:f_comments='{required: true }'
+                     placeholder="备注"/>
+            </div>
+          </div>
+        </form>
+        <div style="text-align:right;height:auto;">
+          <button class="button_search" @click="notarize = true" :disabled='!$v.valid'>
+            确认
+          </button>
+          <button class="button_clear" @click="clear()">
+            取消
+          </button>
+        </div>
+        <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="用户记录转移管理"></upload>
+      </validator>
+    </div>
+    <modal v-if="notarize" :show.sync="notarize" width="100%" title="信息确认" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="text-align: center">
+          <strong>此操作具有一定的风险性，需要您再次确认转出方用户信息，请输入转入方用户编号</strong>
+        <div class="row">
+          <div class="col-sm-6 col-sm-offset-3">
+            <label for="f_newuser_name" id="label" class="font_normal_body">再次确认用户编号</label>
+            <input class="input_search" style="width:60%" type="text" title="用户编号" v-model="notarize_userinfo_code"
+                      placeholder="用户编号">
+          </div>
+        </div>
+        <!--<div class="row" v-if="row.f_meter_type== '物联网表'||row.f_meter_type== '机表' || row.f_meter_type == '金额卡表'">-->
+          <!--<div class="col-sm-6 col-sm-offset-3">-->
+            <!--<label for="f_auto_operate" id="f_auto_operate" class="font_normal_body">自动生成补费扣费</label>-->
+            <!--<v-select :value.sync="model.f_auto_operate" v-model='model.f_auto_operate'-->
+                      <!--style="width:60%"-->
+                      <!--:options='autoOperate' placeholder='是否自动生成补费扣费'-->
+                      <!--close-on-select-->
+                      <!--condition="f_state = '{}'"></v-select>-->
+          <!--</div>-->
+        <!--</div>-->
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search" @click="confirm()" :disabled='!notarize_userinfo_code'>
+          确认
+        </button>
+        <button class="button_clear" @click="notarize = false">
+          取消
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+import {HttpResetClass} from 'vue-client'
+
+let asyncTransferManage = async function (self) {
+  // await self.$getConfig(self, 'TransferRecord')
+}
+
+export default {
+  title: '过户管理',
+  props: ['row', 'records'],
+  data () {
+    return {
+      // 附件上传必须
+      blodid: '',
+      notarize: false,
+      notarize_userinfo_code: '',
+      config: {
+        showupload: true,
+        tableNames: [
+          {
+            table: 't_sellinggas',
+            name: '收费记录',
+            checked: true,
+            disabled: true
+          }, {
+            table: 't_chargeprice',
+            name: '划价记录',
+            checked: true,
+            disabled: true
+          }, {
+            table: 't_record',
+            name: '记录',
+            checked: true,
+            disabled: true
+          }]
+      },
+      model: {
+        table_name: [],
+        in_userinfo_id: '',
+        in_userfiles_id: '',
+        in_userinfo_code: '',
+        in_user_id: '',
+        out_userinfo_id: '',
+        out_userfiles_id: '',
+        out_user_id: '',
+        // f_auto_operate: '否',
+        out_userinfo_code: '',
+        in_user_name: '',
+        out_user_name: '',
+        f_orgid: '',
+        f_orgname: '',
+        f_depid: '',
+        f_depname: '',
+        f_operatorid: '',
+        f_operator: '',
+        f_comments: ''
+      },
+      autoOperate: [{ label: '是', value: '是' }, { label: '否', value: '否' }]
+    }
+  },
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+    Object.assign(this.model, {
+      out_userinfo_id: this.row.f_userinfo_id,
+      out_userinfo_code: this.row.f_userinfo_code,
+      out_userfiles_id: this.row.f_userfiles_id,
+      out_user_id: this.row.f_user_id,
+      out_user_name: this.row.f_user_name,
+      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
+    })
+    asyncTransferManage(this)
+  },
+  methods: {
+    confirm () {
+      // 首先验证用户
+      new HttpResetClass().load('post', 'rs/sql/sale_getUser',
+        {
+          data: {
+            condition: `f_userinfo_code = '${this.notarize_userinfo_code}'`,
+            orderitem: ` f_userinfo_code Desc`
+          }
+        },
+        {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+        res => {
+          if (res.data.length === 0) {
+            this.$showAlert('验证信息有误，请重新输入用户编号进行查询并谨慎核对！！！', 'warning', 2000)
+          } else if (this.model.in_user_id !== res.data[0].f_user_id || this.model.in_userinfo_id !== res.data[0].f_userinfo_id || this.model.in_userfiles_id !== res.data[0].f_userfiles_id) {
+            this.$showAlert('验证信息有误，请重新输入用户编号进行查询并谨慎核对！！！', 'warning', 2000)
+            this.model.in_user_name = undefined
+          } else {
+            this.model.table_name = this.config.tableNames.map(item => item.table)
+            // this.model.f_auto_operate = this.model.f_auto_operate[0]
+            new HttpResetClass().load('post', 'rs/logic/transferRecords',
+              {
+                model: this.model,
+                records: this.records
+              },
+              {resolveMsg: null, rejectMsg: '转移记录出错'}).then(
+              res => {
+                this.$showAlert('操作成功', 'success', 2000)
+                this.clear()
+              }
+            )
+          }
+        }
+      )
+    },
+    clear () {
+      this.$dispatch('refresh')
+    },
+    searchByCode () {
+      if (this.model.in_userinfo_code === this.model.out_userinfo_code) {
+        this.$showAlert('转出方转入方信息不能一致，请谨慎核对！！！', 'warning', 2000)
+        return
+      }
+      new HttpResetClass().load('post', 'rs/sql/sale_getUser',
+        {
+          data: {
+            condition: `f_userinfo_code = '${this.model.in_userinfo_code}'`,
+            orderitem: ` f_userinfo_code Desc`
+          }
+        },
+        {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+          res => {
+            if (res.data.length > 0) {
+              Object.assign(this.model, {
+                in_userinfo_code: res.data[0].f_userinfo_code,
+                in_user_id: res.data[0].f_user_id,
+                in_userinfo_id: res.data[0].f_userinfo_id,
+                in_userfiles_id: res.data[0].f_userfiles_id,
+                in_user_name: res.data[0].f_user_name
+              })
+            } else {
+              this.$showAlert('查无用户信息，请谨慎核对！！！', 'warning', 2000)
+              this.model.in_user_name = undefined
+            }
+          }
+      )
+    }
+  },
+  events: {}
+}
+</script>
+
+<style scoped>
+#label {
+  margin-top: 5px;
+}
+</style>

package/src/filiale/tongchuan/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="binary flex" >
-    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+    <div class="col-12 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 style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">

package/src/filiale/tongchuan/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -139,7 +139,7 @@
     <modal v-if="transfer" :show.sync="transfer" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header" style="display: none">
       </header>
-      <article slot="modal-body" class="modal-body" style="padding:4rem 20px;">
+      <article slot="modal-body" class="modal-body" style="padding:4rem 20px;height:700px;">
         <transfer-records :row="row" :records="records" @refresh="transfer = false"></transfer-records>
       </article>
       <footer slot="modal-footer" class="modal-footer" style="display:none"> </footer>

package/src/filiale/tongchuan/sale.js

@@ -112,6 +112,8 @@ let specialComp = {
 
   // 发票信息提示框
   'eticket-modal': (resolve) => { require(['./bill/EticketModal'], resolve) },
-  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) }
+  'card-meter-center': (resolve) => { require(['./CardMeterCenter'], resolve) },
+  // 过户
+  'transfer-records':(resolve) => { require(['./TransferRecords'], resolve) }
 }
 exports.specialComp = specialComp