sale-client 3.6.450 → 3.6.452

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Nov 20 11:54:44 CST 2024
+gradle.version=5.2.1

package/package.json

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

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

@@ -760,11 +760,22 @@
       },
       calText (val) {
         let str = ''
+        let num = 0
         val.forEach((item) => {
+          if (item.f_gas > 0) {
+            num = num + 1
+          }
           str = str + item.f_price + ' x ' + item.f_gas + '+'
         })
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str
+        if (num > 1) {
+          if (this.$login.r.find(item => item == '阶梯提示无按钮')) {
+            this.$showAlert('友好提示：本次购气已跨阶梯', 'warning', 3000)
+          } else {
+            this.$showMessage('友好提示：本次购气已跨阶梯', ['confirm', 'cancel'])
+          }
+        }
       },
       close () {
         this.print = false

package/src/filiale/meihekou/CardHand.vue

@@ -274,12 +274,12 @@
                   <td style="text-align: center;">
                     <div class="form-group" style="margin-bottom:0px;"
                          v-if="row.f_meter_state === '未抄表' ">
-                      <input type="text" class="form-control" v-model="row.f_unused_gas"
+                      <input type="text" class="form-control" v-model="row.f_shengyu_gas"
                              v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'"
                       >
                     </div>
                     <div v-else>
-                      <span>{{row.f_unused_gas}}</span>
+                      <span>{{row.f_shengyu_gas}}</span>
                     </div>
                   </td>
 
@@ -613,7 +613,7 @@
               // || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0
         if (row.f_tablebase) {
           row.f_actualtablebase = (row.f_tablebase - 0) - (row.f_last_tablebase - 0)
-          row.f_unused_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
                   /* this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
                       console.log('返回数据', res)
                       row.id = res.data.id

package/src/filiale/meihekou/handOperate.vue

@@ -38,7 +38,7 @@
                         v-model="model.f_input_date"
                         :value.sync="model.f_input_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
-                        >
+            >
             </datepicker>
           </div>
           <div class="col-sm-4 form-group">
@@ -58,10 +58,10 @@
           </div>
         </div>
 
-          <!--<div class="col-sm-4 form-group">
-            <label class="font_normal_body">用户编号</label>
-            <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
-          </div>-->
+        <!--<div class="col-sm-4 form-group">
+          <label class="font_normal_body">用户编号</label>
+          <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
+        </div>-->
         <div class="row">
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">上期结余</label>
@@ -88,7 +88,7 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="参数:是否">是否缴费</label>
-<!--            <input type="text" v-model="model.f_whether_pay"  style="width: 60%" class="input_search">-->
+            <!--            <input type="text" v-model="model.f_whether_pay"  style="width: 60%" class="input_search">-->
             <v-select :value.sync="model.f_whether_pay" v-model="model.f_whether_pay"
                       :options='writePays' placeholder='是否缴费'
                       :value-single="true"
@@ -117,18 +117,27 @@
           <div class="col-sm-4 form-group">
             <!--<label class="font_normal_body" title="参数:操作人员">操作人员</label>-->
             <!--<v-select :value.sync="model.f_operatorid"-->
-                      <!--v-model="model.f_operatorid"-->
-                      <!--:value-single="true"  @change="selectoperator()"-->
-                      <!--:options='foperator'-->
-                      <!--close-on-select></v-select>-->
+            <!--v-model="model.f_operatorid"-->
+            <!--:value-single="true"  @change="selectoperator()"-->
+            <!--:options='foperator'-->
+            <!--close-on-select></v-select>-->
             <label class="font_normal_body" title="参数:录入人员">录入人员</label>
             <v-select :value.sync="model.f_input_person"
-            v-model="model.f_input_person"
-            :value-single="true"
-            :options='person'
-            close-on-select></v-select>
+                      v-model="model.f_input_person"
+                      :value-single="true"
+                      :options='person'
+                      close-on-select></v-select>
           </div>
           <div class="row">
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" title="开票标识">开票标识</label>
+              <v-select :value.sync="model.f_isbill" v-model="model.f_isbill"
+                        :options='isbills' placeholder='开票标识'
+                        :value-single="true"
+                        :search="false"
+                        close-on-select>
+              </v-select>
+            </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">审核人</label>
               <input type="text" v-model="model.f_audit_person"  style="width: 60%" class="input_search">
@@ -167,7 +176,7 @@
         </div>
         <div class="row">
           <div class="col-sm-12">
-              <label for="f_user_type" class="font_normal_body">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <label for="f_user_type" class="font_normal_body">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
 
             <div class="col-sm-10" id="f_comments" style="margin-left: 8px;margin-bottom: 5px;width: 86.333333%;">
               <textarea class="col-sm-3 form-control" type="text" v-model="model.f_comments"></textarea>
@@ -197,234 +206,244 @@
   </div>
 </template>
 <script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  import * as Util from "../../components/../Util";
-  var data
-  let readyGen = async function (self) {
-    await  self.$LoadParams.loadParam(self.f_filialeid)
-    await    self.$GetSaleParam.initinputtor()
-    await self.initperson()
-  }
-  export default {
-    title: '基本信息',
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import * as Util from "../../components/../Util";
+var data
+let readyGen = async function (self) {
+  await  self.$LoadParams.loadParam(self.f_filialeid)
+  await    self.$GetSaleParam.initinputtor()
+  await self.initperson()
+}
+export default {
+  title: '基本信息',
 
-    data () {
-      return {
-        // 构建数组来存储对象
-        editbank: true,
-        showfiles: false,
-        priceSplit: false,
-        recordList: [],
-        // foperator:[],
-        person:[],
-        // meterstate:[{label:'已抄',value:'已抄'},{label:'未抄',value:'未抄'}],
-        // handstate:[{label:'有效',value:'有效'},{label:'冲正',value:'冲正'},{label:'作废',value:'作废'},{label:'待审核',value:'待审核'}],
-        fileNameSet: {
-          'f_meter_state': '抄表状态',
-          'f_hand_state': '抄表单状态',
-          'f_meter_source': '抄表数据来源',
-          'f_accounting_date': '财务核算日期',
-          'f_inputtor': '抄表员',
-          'f_end_date': '截止日期',
-          'f_input_date': '录入时间',
-          'f_hand_date': '下发时间',
-          'f_user_name': '客户姓名',
-          'f_userinfo_code': '客户编号',
-          'f_user_address': '客户地址',
-          'f_audit_person': '审核人',
-          'f_audit_date': '审核时间',
-          'f_orgname': '所属公司',
-          'f_depname': '所属部门',
-          'f_operator':'操作人',
-          'f_operatorid':'操作人ID'
-        }
+  data () {
+    return {
+      // 构建数组来存储对象
+      editbank: true,
+      showfiles: false,
+      priceSplit: false,
+      recordList: [],
+      // foperator:[],
+      person:[],
+      // meterstate:[{label:'已抄',value:'已抄'},{label:'未抄',value:'未抄'}],
+      // handstate:[{label:'有效',value:'有效'},{label:'冲正',value:'冲正'},{label:'作废',value:'作废'},{label:'待审核',value:'待审核'}],
+      fileNameSet: {
+        'f_meter_state': '抄表状态',
+        'f_hand_state': '抄表单状态',
+        'f_meter_source': '抄表数据来源',
+        'f_accounting_date': '财务核算日期',
+        'f_inputtor': '抄表员',
+        'f_end_date': '截止日期',
+        'f_input_date': '录入时间',
+        'f_hand_date': '下发时间',
+        'f_user_name': '客户姓名',
+        'f_userinfo_code': '客户编号',
+        'f_user_address': '客户地址',
+        'f_isbill': '开票标识',
+        'f_audit_person': '审核人',
+        'f_audit_date': '审核时间',
+        'f_orgname': '所属公司',
+        'f_depname': '所属部门',
+        'f_operator':'操作人',
+        'f_operatorid':'操作人ID'
       }
+    }
+  },
+  props: {
+    oldmodel: Object,
+    model: Object
+  },
+
+  ready () {
+    /* console.log('logininfo',this.$login.r) */
+    if (this.$login.r.includes('维护银行转账信息')) {
+      this.editbank = true
+    }
+    // console.log(this.props.model)
+    this.oldmodel = JSON.parse(JSON.stringify(this.model))
+    readyGen(this)
+  },
+  created () {
+  },
+  methods: {
+    initperson () {
+      this.person = []
+      console.log("this.$login000", this.$login, this.oldmodel, this.model)
+      let arr = this.$GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.f_department_id == this.model.f_depid
+        }
+      })
+      arr.forEach((res) => {
+        this.person.push({label: res.name, value: res.name})
+      })
     },
-    props: {
-      oldmodel: Object,
-      model: Object
+    // initoperator(){
+    //   this.foperator=[]
+    //   console.log("this.$login",this.$login,this.oldmodel,this.model)
+    //   let arr = this.$GetSaleParam.inputtors.filter((res) => {
+    //     if (res.rolestr != null && res.rolestr != '') {
+    //       return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
+    //     }
+    //   })
+    //   arr.forEach((res) => {
+    //     this.foperator.push({label: res.name, value: res.id})
+    //   })
+    // },
+    // selectoperator () {
+    //   let id = this.model.f_operatorid
+    //   if(!this.model.f_operatorid){
+    //     return
+    //   }
+    //   let http = new HttpResetClass()
+    //   http.load('POST', 'rs/sql/saleSingleTable',
+    //     {data:{tablename: 't_user',
+    //         condition: `id = '${id}'`}},
+    //     {resolveMsg: null, rejectMsg: null}).then((res) => {
+    //     console.log('kanak,res', res)
+    //     if(res.data.length>0){
+    //       this.model.f_input_person = res.data[0].name
+    //     }else{
+    //       this.model.f_input_person=''
+    //       this.$showAlert('人员信息未找到','warning',2000)
+    //     }
+    //     console.log('this.f_input_person', this.model.f_input_person)
+    //   })
+    // },
+    fileterprice (row) {
+      this.priceSplit = true
+      console.log('row==>', row)
     },
-
-    ready () {
-      /* console.log('logininfo',this.$login.r) */
-      if (this.$login.r.includes('维护银行转账信息')) {
-        this.editbank = true
-      }
-      // console.log(this.props.model)
-      this.oldmodel = JSON.parse(JSON.stringify(this.model))
-      readyGen(this)
+    cancel () {
+      this.$dispatch('close')
     },
-    created () {
+    uploadFiles () {
+      this.showfiles = !this.showfiles
     },
-    methods: {
-      initperson(){
-        this.person=[]
-        console.log("this.$login000",this.$login,this.oldmodel,this.model)
-        let arr = this.$GetSaleParam.inputtors.filter((res) => {
-          if (res.rolestr != null && res.rolestr != '') {
-            return res.f_department_id == this.model.f_depid
-          }
-        })
-        arr.forEach((res) => {
-          this.person.push({label: res.name,value: res.name})
-        })
-        if (this.model.f_meter_classify === '物联网表' && this.model.f_input_person === ''){
-          this.model.f_input_person = '微信公众号'
+    async getenddate () {
+      var end_date = await this.$resetpost('rs/logic/getEndDate', {
+        data: {
+          f_userinfo_id: this.model.f_userinfo_id,
+          f_input_date: this.model.f_input_date
         }
-      },
-      // initoperator(){
-      //   this.foperator=[]
-      //   console.log("this.$login",this.$login,this.oldmodel,this.model)
-      //   let arr = this.$GetSaleParam.inputtors.filter((res) => {
-      //     if (res.rolestr != null && res.rolestr != '') {
-      //       return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
-      //     }
-      //   })
-      //   arr.forEach((res) => {
-      //     this.foperator.push({label: res.name, value: res.id})
-      //   })
-      // },
-      // selectoperator () {
-      //   let id = this.model.f_operatorid
-      //   if(!this.model.f_operatorid){
-      //     return
-      //   }
-      //   let http = new HttpResetClass()
-      //   http.load('POST', 'rs/sql/saleSingleTable',
-      //     {data:{tablename: 't_user',
-      //         condition: `id = '${id}'`}},
-      //     {resolveMsg: null, rejectMsg: null}).then((res) => {
-      //     console.log('kanak,res', res)
-      //     if(res.data.length>0){
-      //       this.model.f_input_person = res.data[0].name
-      //     }else{
-      //       this.model.f_input_person=''
-      //       this.$showAlert('人员信息未找到','warning',2000)
-      //     }
-      //     console.log('this.f_input_person', this.model.f_input_person)
-      //   })
-      // },
-      fileterprice (row) {
-        this.priceSplit = true
-        console.log('row==>', row)
-      },
-      cancel () {
-        this.$dispatch('close')
-      },
-      uploadFiles () {
-        this.showfiles = !this.showfiles
-      },
-      async getenddate () {
-        var end_date = await this.$resetpost('rs/logic/getEndDate', {data: {f_userinfo_id: this.model.f_userinfo_id, f_input_date: this.model.f_input_date}},{rejectMsg: null,resolveMsg: null})
-        this.model.f_end_date = end_date.data
-      },
-      addressValid (val) {
-      },
-      async save () {
-        for (var item in this.model) {
-          if (this.model[item] instanceof Array) {
-            this.model[item] = this.model[item].length > 0 ? this.model[item][0] : ''
-          }
-          if (this.model[item] != this.oldmodel[item] && this.model[item] !='s_timestamp') {
-            var car = {
-              chinesename: this.fileNameSet[item],
-              fieldname: item,
-              tablename: 't_handplan',
-              oldvalue: this.oldmodel[item],
-              newvalue: this.model[item],
-              state: '有效',
-              modifitime: Util.toStandardTimeString(),
-              operator: this.$login.f.name,
-              hand_id: this.model.id,
-              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,
-              f_audit_person : this.model.f_audit_person,
-              f_audit_date : this.model.f_audit_date
-            }
-            this.recordList.push(car)
-            // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
-            console.log(car)
-          }
+      }, {rejectMsg: null, resolveMsg: null})
+      this.model.f_end_date = end_date.data
+    },
+    addressValid (val) {
+    },
+    async save () {
+      for (var item in this.model) {
+        if (this.model[item] instanceof Array) {
+          this.model[item] = this.model[item].length > 0 ? this.model[item][0] : ''
         }
-        await this.$resetpost('rs/logic/saveHandRecord', {data: {recordlist: this.recordList, newData: this.model}})
-        if (this.model.f_meter_classify.indexOf('卡表') >= 0) {
-          this.model.f_result_state = this.model.f_hand_state
-          this.model.f_hand_date = this.model.f_input_date
-          await this.$resetpost('rs/entity/t_cardhand', this.model, {
-            resolveMsg: '修改成功',
-            rejectMsg: '未通过，修改出错!!!'
-          })
-        } else {
-          await this.$resetpost('rs/entity/t_handplan', this.model, {
-            resolveMsg: '修改成功',
-            rejectMsg: '未通过，修改出错!!!'
-          })
+        if (this.model[item] != this.oldmodel[item] && this.model[item] != 's_timestamp') {
+          var car = {
+            chinesename: this.fileNameSet[item],
+            fieldname: item,
+            tablename: 't_handplan',
+            oldvalue: this.oldmodel[item],
+            newvalue: this.model[item],
+            state: '有效',
+            modifitime: Util.toStandardTimeString(),
+            operator: this.$login.f.name,
+            hand_id: this.model.id,
+            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,
+            f_audit_person: this.model.f_audit_person,
+            f_audit_date: this.model.f_audit_date
+          }
+          this.recordList.push(car)
+          // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+          console.log(car)
         }
-        console.log('this.model', this.model)
-        this.$dispatch('close')
       }
+
+      await this.$resetpost('rs/logic/saveHandRecord', {data: {recordlist: this.recordList, newData: this.model}})
+      if (this.model.f_meter_classify.indexOf('卡表') >= 0) {
+        this.model.f_result_state = this.model.f_hand_state
+        this.model.f_hand_date = this.model.f_input_date
+        await this.$resetpost('rs/entity/t_cardhand', this.model, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+      } else {
+        await this.$resetpost('rs/entity/t_handplan', this.model, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+      }
+      console.log('this.model', this.model)
+      this.$dispatch('close')
+    }
+  },
+  computed: {
+    meterstate () {
+      return this.$appdata.getParam('抄表状态')
+    },
+    handstate () {
+      return this.$appdata.getParam('抄表单状态')
+    },
+    isbills () {
+      return this.$appdata.getParam('开票标识')
+    },
+    writePays () {
+      return this.$appdata.getParam('是否')
+    },
+    resultstate () {
+      return this.$appdata.getParam('抄表结果状态')
     },
-    computed: {
-      meterstate () {
-        return this.$appdata.getParam('抄表状态')
-      },
-      handstate () {
-        return this.$appdata.getParam('抄表单状态')
-      },
-      writePays () {
-        return this.$appdata.getParam('是否')
-      },
-      resultstate () {
-        return this.$appdata.getParam('抄表结果状态')
-      },
 
-      inputtores () {
-        // 获取抄表员
-        console.log('获取抄表员', this.$login.f)
-        let rs = new Array()
-        if (this.$login.f.f_gasman.length > 0) {
-          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-            let temp = {
-              label: this.$login.f.f_gasman[i].name,
-              value: this.$login.f.f_gasman[i].name
-            }
-            rs.push(temp)
+    inputtores () {
+      // 获取抄表员
+      console.log('获取抄表员', this.$login.f)
+      let rs = new Array()
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
           }
+          rs.push(temp)
         }
-        // let rs = this.$appdata.getParam('抄表员')
-        return rs
       }
+      // let rs = this.$appdata.getParam('抄表员')
+      return rs
+    }
 
-    },
-    watch: {
-      'model.f_input_date' (val) {
-        if (val) {
-          this.getenddate()
-        }
-      },
-      'model'(){
-        this.initperson()
+  },
+  watch: {
+    'model.f_input_date' (val) {
+      if (val) {
+        this.getenddate()
       }
+    },
+    'model' () {
+      this.initperson()
     }
   }
+}
 </script>
 <style lang="less" scoped>
-#meterInfoTest{
+#meterInfoTest {
   #addboxmap {
     height: 300px;
   }
+
   .glyphicon-map-marker:hover {
     color: red;
   }
+
   .glyphicon-map-marker {
     color: blue;
     cursor: pointer;
   }
+
   .col-sm-4 {
     .font_normal_body {
       width: 73px;
@@ -434,19 +453,23 @@
       &::-webkit-scrollbar-button {
         display: none;
       }
+
       // 滚动条的宽度
       &::-webkit-scrollbar {
         width: 5px !important;
         height: 5px !important;
       }
+
       // 滚动条的设置
       &::-webkit-scrollbar-thumb {
         background-color: #ddd;
         background-clip: padding-box;
       }
+
       &::-webkit-scrollbar-thumb:hover {
         background-color: #bbb;
       }
+
       &::-webkit-scrollbar-track {
         /*滚动条里面轨道*/
         box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);

package/src/filiale/meihekou/sale.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 export default function () {
   // 售气收费 --收费gas-move
   Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
+  Vue.component('hand-operate', (resolve) => { require(['./handOperate'], resolve) })
   Vue.component('charge-list', (resolve) => { require(['./ChargeList'], resolve)})
   Vue.component('card-hand', (resolve) => { require(['./CardHand'], resolve) })
   Vue.component('hand-manager', (resolve) => { require(['./HandManager'], resolve) })

package/src/filiale/ningjin/UserInfoDetailManageNew.vue

@@ -0,0 +1,233 @@
+<template>
+  <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" :buttonshow="buttonshow"
+                            @refresh="search"
+                            @cancel-main="cancel"
+                            @cancel-re="cancelRe"
+        @search-main="search"></user-base-info-new></div>
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <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>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+        <saletab header="合同查看"  v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
+        <saletab header="用户重点记录" >
+          <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
+        </saletab>
+<!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
+<!--          <supervisory-control :row="row"  ></supervisory-control>-->
+<!--        </saletab>-->
+<!--        <saletab header="报装收费记录"   v-if="permission('报装收费记录查看')">-->
+<!--          <apply-charge-search :row="row"  ></apply-charge-search>-->
+<!--        </saletab>-->
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // 导入IC卡相关查询界面
+  import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+  import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
+  import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+  import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+  import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
+  import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+  import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+  import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+  import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+  import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
+  import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
+  import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+  import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse'
+  import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser'
+  import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
+  import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
+  import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
+  import UserKeyRecord from '../../components/common/userinfo_detail/ic_detail/UserKeyRecord'
+  // import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
+  // import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
+  // 导入物联网相关查询
+  import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+  import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+  import WatchCollection from './WatchCollection'
+  import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning'
+  import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+  import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+  import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+  import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
+  import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+
+export default {
+    title: '用户详细信息',
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+    components: {
+      PriceAdjustmentQueryUser,
+      PriceChangeQueryUser,
+      AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      WebHandQueryUser,
+      Repurchase,
+      ChangeMeterQueryUser,
+      ChargeQueryUser,
+      ChargeRecordQueryUser,
+      FillCardQueryUser,
+      HandQueryUser,
+      OtherChargeQueryUser,
+      RecordQueryUser,
+      TransferQueryUser,
+      WatchWarning,
+      WatchCollection,
+      QueryInstruct,
+      QueryHistoryInstruct,
+      ChangeRecord,
+      CardHandRecord,
+      MeterParam,
+      DeveiceRecord,
+      MachineRecordQuery,
+      UserDeviceQuery,
+      contractSigningList,
+      UserKeyRecord
+      // SupervisoryControl,
+      // ApplyChargeSearch
+    },
+    data () {
+      return {
+        row: null,
+        name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
+        show: ''
+      }
+    },
+    ready () {
+      this.search()
+      console.log(this.$login)
+    },
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '收费综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      async search () {
+        let http = new HttpResetClass()
+        let condition = ' 1 = 1'
+        if (this.f_userfiles_id) {
+          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+        } else if (this.f_userinfo_id) {
+          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+        } else if (this.f_userinfo_code) {
+          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }
+
+        let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
+          {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
+      },
+
+      cancel (val) {
+        this.$emit('cancel-main', val)
+      },
+
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
+      butOper (val) {
+        this.name = val
+      }
+    },
+    watch: {
+      'f_userinfo_id' () {
+        this.search()
+      }
+    }
+  }
+</script>

package/src/filiale/ningjin/WatchCollection.vue

@@ -0,0 +1,115 @@
+<template >
+  <div id="stand-work-list" >
+    <div @keyup.enter="search" class="span">
+      <criteria-paged :model="model" 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>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="m.f_hand_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">&nbsp;至</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="m.f_hand_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><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>
+              <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' partial='list'>
+            <tr >
+              <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
+              <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : row.f_valvestate === '1' ? '关阀' : '未上报'}}</nobr>
+              <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: 'WatchCollection',
+    data () {
+      return {
+        model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      search (args) {
+        args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+      // 监听查询对象
+      'row' (val) {
+        if (this.row != null) {
+          this.$refs.paged.$refs.criteria.search()
+        }
+      }
+    }
+  }
+</script>
+

package/src/filiale/ningjin/sale.js

@@ -37,4 +37,5 @@ export default function () {
   Vue.component('card-hand', (resolve) => { require(['./CardHand'], resolve) })
   // 基本信息 表具信息
   Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }

package/src/filiale/yangchun/BlackList/BlackListList.vue

@@ -151,6 +151,17 @@
               <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_limit_times_big"
                      condition="f_limit_times <= '{}' " placeholder="小于等于">
             </div>
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">限购类型</label>
+              <v-select
+                :value.sync="model.f_limit_type"
+                v-model="model.f_limit_type"
+                :options="$parent.$parent.limitTypes"
+                placeholder='请选择'
+                condition="f_limit_type = '{}'"
+                close-on-select>
+              </v-select>
+            </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">气量/金额</label>
               <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_limit_amount_small"
@@ -176,6 +187,7 @@
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购日期</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>操作人</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购次数</th>
+            <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购类型</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>气量/金额</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>审核状态</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>移入原因</th>
@@ -196,6 +208,7 @@
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_parameter_value}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_operator}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_limit_times}}</td>
+          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_limit_type}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_limit_amount}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_black_state}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_comments}}</td>
@@ -248,9 +261,11 @@
           'f_parameter_value': '限购日期',
           'f_comments': '移入原因',
           'f_limit_times': '限购次数',
+          'f_limit_type': '限购类型',
           'f_limit_amount': '气量/金额',
           'f_remark': '备注'
-        }
+        },
+        limitTypes: [{label: '全部', value: ''}, {label: '气量', value: '气量'}, {label: '金额', value: '金额'}]
       }
     },
     props: {

package/src/filiale/yangchun/BlackList/BlackRecordQuery.vue

@@ -130,6 +130,18 @@
                   <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_limit_times_big"
                          condition="f_limit_times <= '{}' " placeholder="小于等于">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label  class=" font_normal_body">限购类型</label>
+                  <v-select
+                    :value.sync="model.f_limit_type"
+                    v-model="model.f_limit_type"
+                    :options="$parent.$parent.limitTypes"
+                    placeholder='请选择'
+                    condition="f_limit_type = '{}'"
+                    close-on-select
+                  >
+                  </v-select>
+                </div>
                 <div class="form-group col-sm-2">
                   <label class="font_normal_body">气量/金额</label>
                   <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_limit_amount_small"
@@ -178,6 +190,7 @@
                 <th style="text-align: center;">移入（移出）原因</th>
                 <th style="text-align: center;">备注</th>
                 <th style="text-align: center;">限购次数</th>
+                <th style="text-align: center;">限购类型</th>
                 <th style="text-align: center;">气量/金额</th>
                 <th style="text-align: center;">管控级别</th>
                 <th style="text-align: center;">限制功能</th>
@@ -204,6 +217,7 @@
               <td style="text-align: center;">{{row.f_comments}}</td>
               <td style="text-align: center;">{{row.f_remark}}</td>
               <td style="text-align: center;">{{row.f_limit_times}}</td>
+              <td style="text-align: center;">{{row.f_limit_type}}</td>
               <td style="text-align: center;">{{row.f_limit_amount}}</td>
               <td style="text-align: center;">{{row.f_level}}</td>
               <td style="text-align: center;">{{$parent.$parent.$parent.formatFunction(row.f_function)}}</td>
@@ -261,6 +275,7 @@
           'f_black_state': '审核状态',
           'f_audit_comments': '审核备注',
           'f_limit_times': '限购次数',
+          'f_limit_type': '限购类型',
           'f_limit_amount': '气量(金额)',
           'f_level': '管控级别',
           'f_function': '限制功能',
@@ -269,7 +284,8 @@
         },
         operateType: [{label: '全部', value: ''}, {label: '移入重点用户 ', value: '移入重点用户'}, {label: '移出重点用户', value: '移出重点用户'}],
         fstate: [{label: '移入', value: '移入'}, {label: '移出', value: '移出'}],
-        flevel: [{label: '高', value: '高'}, {label: '中', value: '中'}, {label: '低', value: '低'}]
+        flevel: [{label: '高', value: '高'}, {label: '中', value: '中'}, {label: '低', value: '低'}],
+        limitTypes: [{label: '全部', value: ''}, {label: '气量', value: '气量'}, {label: '金额', value: '金额'}]
       }
     },
     props: {

package/src/plugins/MachineChargeService.js

@@ -33,6 +33,8 @@ let MachineChargeService = {
       f_serial_number: f_serial_number,
       f_balance: row.f_balance,
       f_overdue: model.f_overdue,
+      userinfo_version: row.userinfo_version,
+      version: row.version,
       f_collection: model.f_collection - model.f_garbage_fee,
       f_preamount: model.f_totalcost,
       f_payment: model.f_payment[0],