sale-client 3.4.78 → 3.4.82

package/src/components/chargeBatch/ChargeManageBatch.vue

@@ -1,214 +1,214 @@
-<template>
-  <div id="ChargeManageBatch" class="flex-row three" v-show="listpage">
-    <div class="binary-left" style="width:83%;overflow-y: scroll">
-      <charge-batch-list :row="row" @deal-msg="dealMsg" v-ref:list></charge-batch-list>
-    </div>
-    <div class="binary-right" style="width:22%">
-      <ul class="nav nav-pills span nav-tabs" style="height:auto;margin:8px 0px;padding:4px 0;border-bottom: 1px solid #e7e7e7;">
-        <li><a :style="selectFiled == '历史操作'?'color:#333333!important;':'color:#666666!important;'"
-               :class="{'tel_voiceActive':selectFiled == '历史操作','tel_f_size':selectFiled != '历史操作'}" href="#"
-               @click="setField('历史操作')">历史操作</a></li>
-      </ul>
-      <div class="tab-content span" style="overflow-y: auto">
-        <card-list-rewrite v-show="worktype === '历史操作'" :operationtype="['批量收费']" v-ref:card></card-list-rewrite>
-      </div>
-    </div>
-  </div>
-  <div v-if="!listpage">
-    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id"
-                                 @cancel-main="cancel"></user-info-detail-manage-new>
-  </div>
-  <div v-if="showModal">
-    <charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close"
-                  @modalsuccess="modalsuccess"></charge-modal>
-  </div>
-</template>
-<script>
-import CardListRewrite from './CardList'
-export default {
-  title: '批量缴费',
-  components: {CardListRewrite},
-  data () {
-    return {
-      // 页面开关
-      listpage: true,
-      f_orgid: '',
-      row: null,
-      cardInfo: null,
-      warningInfo: null,
-      modalrow: null,
-      showModal: false,
-      rowData: {},
-      dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
-      show: [true],
-      selectFiled: '历史操作',
-      worktype: '历史操作'
-    }
-  },
-  methods: {
-    setField (type) {
-      this.selectFiled = type
-      this.worktype = type
-    },
-    async toBusiness (obj) {
-      console.log('双击列表的时候传进来的数据：', obj)
-      if (!(obj instanceof Event)) {
-        // 对此数据进行验证
-        if (await this.validateRow(obj)) {
-          // 获取未写卡或者写卡失败记录
-          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
-          console.log('获取未写卡记录', getUnWriteSell)
-          if (getUnWriteSell.data.length > 1) {
-            this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
-          } else {
-            this.row = obj
-            this.row.unWriteSell = getUnWriteSell.data
-            this.cardInfo = this.$refs.list.cardInfo
-            this.$refs.list.criteriaShow = false
-            // 将列表只显示该条数据
-            this.$refs.list.refreshRow(obj)
-          }
-        }
-      }
-    },
-    close () {
-      this.showModal = false
-      this.warningInfo = null
-      this.clean()
-      this.$refs.list.search()
-      // this.$refs.card.search()
-    },
-    async validateRow (obj) {
-      console.log('查看传进来的参数:', obj)
-      this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
-        {
-          data: {
-            f_userfiles_id: obj.f_userfiles_id,
-            f_userinfo_code: obj.f_userinfo_code,
-            f_userinfo_id: obj.f_userinfo_id
-          }
-        }
-        , {resolveMsg: '', rejectMsg: '获取提示失败'})
-      if ((!this.warningInfo.data.state.info || !this.warningInfo.data.state.dibao || !this.warningInfo.data.state.ins || !this.warningInfo.data.state.blacklist || !this.warningInfo.data.state.invoice) && obj.f_user_state !== '预备') {
-        this.modalrow = obj
-        this.showModal = true
-        return false
-      } else {
-        return true
-      }
-    },
-    clean () {
-      this.row = null
-      this.cardInfo = null
-    },
-    clearCondition () {
-      Object.keys(this.$refs.list.$refs.paged.$refs.cri.model).forEach((key) => {
-        this.$refs.list.$refs.paged.$refs.cri.model[key] = ''
-      })
-      // console.log('清数据。。。', this.$refs.list.$refs.paged.$refs.grid.model.rows)
-      // this.$set('$refs.list.$refs.paged.$refs.grid.model.rows', [])
-    },
-    dealMsg (obj) {
-      console.log('==================obj', obj)
-      this.listpage = false
-      this.rowData = obj
-    },
-    cancel (obj) {
-      this.listpage = true
-    },
-    modalsuccess (obj) {
-      this.showModal = false
-      this.$refs.list.criteriaShow = false
-      this.row = obj
-      this.cardInfo = this.$refs.list.cardInfo
-      // 将列表只显示该条数据
-      this.$refs.list.refreshRow(obj)
-    },
-    async serRow (obj) {
-      let newdata = await this.$resetpost('rs/sql/sale_getUser', {
-        data: {
-          condition: `i.f_userinfo_code='${obj.f_userinfo_code}' and u.f_filialeid = '${obj.f_filialeid}'`,
-          orderitem: `f_userinfo_id Desc`
-        }
-      }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
-      this.toBusiness(newdata.data[0])
-      // this.$refs.list.search()
-    }
-  },
-  events: {
-    'error' (name, row, res) {
-      this.clean()
-    },
-    'success' (name, row, res) {
-      // name === '发卡售气' ? this.$refs.list.toNext(this.index) : null
-      if (name === '机表收费确认') {
-        this.serRow(row)
-        return
-      }
-      console.log('成功事件')
-      this.clean()
-      this.$refs.list.search()
-      // this.clearCondition()
-      this.$refs.card.$refs.paged.$refs.cri.search()
-      // this.$refs.info.$refs.recordstoryinfo.getdata()
-    },
-    'clean' (row) {
-      // this.$refs.list.singleRefresh(row)
-      this.clean()
-    },
-    'refresh' () {
-      this.clean()
-      // this.clearCondition()
-      this.$refs.list.search()
-      this.$refs.card.$refs.paged.$refs.cri.search()
-    },
-    'resflushvalue' () {
-      this.$refs.info.$refs.valueaddinfo.reflush()
-    },
-    'refreshrow' (val) {
-      console.log(val)
-      this.row = val
-      this.$refs.list.refreshRow(val)
-      // this.$refs.card.search()
-    },
-    'cancelclean' (row) {
-      this.clean()
-      this.$refs.list.searchNoData()
-      // this.$refs.card.search()
-    }
-  },
-  watch: {
-    'row' () {
-      // this.$refs.tab.$el.click()
-    }
-  }
-}
-</script>
-<style>
-.basic-main {
-  width: 79%;
-}
-
-.tel_voiceActive {
-  font-family: PingFang-SC-Bold;
-  font-size: 16px;
-  font-weight: normal !important;
-  font-stretch: normal !important;
-  line-height: 18px;
-  letter-spacing: 0px;
-  color: #333333 !important;
-  border-bottom: 3px solid #599fe5;
-  padding: 10px 10px !important;
-}
-
-.tel_f_size {
-  font-family: PingFang-SC-Medium;
-  font-size: 16px;
-  font-weight: normal;
-  font-stretch: normal;
-  line-height: 18px;
-  letter-spacing: 0px;
-  color: #666666 !important;
-  padding: 10px 10px !important;
-}
-</style>
+<template>
+  <div id="ChargeManageBatch" class="flex-row three" v-show="listpage">
+    <div class="binary-left" style="width:83%;overflow-y: scroll">
+      <charge-batch-list :row="row" @deal-msg="dealMsg" v-ref:list></charge-batch-list>
+    </div>
+    <div class="binary-right" style="width:22%">
+      <ul class="nav nav-pills span nav-tabs" style="height:auto;margin:8px 0px;padding:4px 0;border-bottom: 1px solid #e7e7e7;">
+        <li><a :style="selectFiled == '历史操作'?'color:#333333!important;':'color:#666666!important;'"
+               :class="{'tel_voiceActive':selectFiled == '历史操作','tel_f_size':selectFiled != '历史操作'}" href="#"
+               @click="setField('历史操作')">历史操作</a></li>
+      </ul>
+      <div class="tab-content span" style="overflow-y: auto">
+        <card-list-rewrite v-show="worktype === '历史操作'" :operationtype="['批量收费']" v-ref:card></card-list-rewrite>
+      </div>
+    </div>
+  </div>
+  <div v-if="!listpage">
+    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id"
+                                 @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
+  <div v-if="showModal">
+    <charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close"
+                  @modalsuccess="modalsuccess"></charge-modal>
+  </div>
+</template>
+<script>
+import CardListRewrite from './CardList'
+export default {
+  title: '批量缴费',
+  components: {CardListRewrite},
+  data () {
+    return {
+      // 页面开关
+      listpage: true,
+      f_orgid: '',
+      row: null,
+      cardInfo: null,
+      warningInfo: null,
+      modalrow: null,
+      showModal: false,
+      rowData: {},
+      dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+      show: [true],
+      selectFiled: '历史操作',
+      worktype: '历史操作'
+    }
+  },
+  methods: {
+    setField (type) {
+      this.selectFiled = type
+      this.worktype = type
+    },
+    async toBusiness (obj) {
+      console.log('双击列表的时候传进来的数据：', obj)
+      if (!(obj instanceof Event)) {
+        // 对此数据进行验证
+        if (await this.validateRow(obj)) {
+          // 获取未写卡或者写卡失败记录
+          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
+          console.log('获取未写卡记录', getUnWriteSell)
+          if (getUnWriteSell.data.length > 1) {
+            this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
+          } else {
+            this.row = obj
+            this.row.unWriteSell = getUnWriteSell.data
+            this.cardInfo = this.$refs.list.cardInfo
+            this.$refs.list.criteriaShow = false
+            // 将列表只显示该条数据
+            this.$refs.list.refreshRow(obj)
+          }
+        }
+      }
+    },
+    close () {
+      this.showModal = false
+      this.warningInfo = null
+      this.clean()
+      this.$refs.list.search()
+      // this.$refs.card.search()
+    },
+    async validateRow (obj) {
+      console.log('查看传进来的参数:', obj)
+      this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
+        {
+          data: {
+            f_userfiles_id: obj.f_userfiles_id,
+            f_userinfo_code: obj.f_userinfo_code,
+            f_userinfo_id: obj.f_userinfo_id
+          }
+        }
+        , {resolveMsg: '', rejectMsg: '获取提示失败'})
+      if ((!this.warningInfo.data.state.info || !this.warningInfo.data.state.dibao || !this.warningInfo.data.state.ins || !this.warningInfo.data.state.blacklist || !this.warningInfo.data.state.invoice) && obj.f_user_state !== '预备') {
+        this.modalrow = obj
+        this.showModal = true
+        return false
+      } else {
+        return true
+      }
+    },
+    clean () {
+      this.row = null
+      this.cardInfo = null
+    },
+    clearCondition () {
+      Object.keys(this.$refs.list.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.list.$refs.paged.$refs.cri.model[key] = ''
+      })
+      // console.log('清数据。。。', this.$refs.list.$refs.paged.$refs.grid.model.rows)
+      // this.$set('$refs.list.$refs.paged.$refs.grid.model.rows', [])
+    },
+    dealMsg (obj) {
+      console.log('==================obj', obj)
+      this.listpage = false
+      this.rowData = obj
+    },
+    cancel (obj) {
+      this.listpage = true
+    },
+    modalsuccess (obj) {
+      this.showModal = false
+      this.$refs.list.criteriaShow = false
+      this.row = obj
+      this.cardInfo = this.$refs.list.cardInfo
+      // 将列表只显示该条数据
+      this.$refs.list.refreshRow(obj)
+    },
+    async serRow (obj) {
+      let newdata = await this.$resetpost('rs/sql/sale_getUser', {
+        data: {
+          condition: `i.f_userinfo_code='${obj.f_userinfo_code}' and u.f_filialeid = '${obj.f_filialeid}'`,
+          orderitem: `f_userinfo_id Desc`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
+      this.toBusiness(newdata.data[0])
+      // this.$refs.list.search()
+    }
+  },
+  events: {
+    'error' (name, row, res) {
+      this.clean()
+    },
+    'success' (name, row, res) {
+      // name === '发卡售气' ? this.$refs.list.toNext(this.index) : null
+      if (name === '机表收费确认') {
+        this.serRow(row)
+        return
+      }
+      console.log('成功事件')
+      this.clean()
+      this.$refs.list.search()
+      // this.clearCondition()
+      this.$refs.card.$refs.paged.$refs.cri.search()
+      // this.$refs.info.$refs.recordstoryinfo.getdata()
+    },
+    'clean' (row) {
+      // this.$refs.list.singleRefresh(row)
+      this.clean()
+    },
+    'refresh' () {
+      this.clean()
+      // this.clearCondition()
+      this.$refs.list.search()
+      this.$refs.card.$refs.paged.$refs.cri.search()
+    },
+    'resflushvalue' () {
+      this.$refs.info.$refs.valueaddinfo.reflush()
+    },
+    'refreshrow' (val) {
+      console.log(val)
+      this.row = val
+      this.$refs.list.refreshRow(val)
+      // this.$refs.card.search()
+    },
+    'cancelclean' (row) {
+      this.clean()
+      this.$refs.list.searchNoData()
+      // this.$refs.card.search()
+    }
+  },
+  watch: {
+    'row' () {
+      // this.$refs.tab.$el.click()
+    }
+  }
+}
+</script>
+<style>
+.basic-main {
+  width: 79%;
+}
+
+.tel_voiceActive {
+  font-family: PingFang-SC-Bold;
+  font-size: 16px;
+  font-weight: normal !important;
+  font-stretch: normal !important;
+  line-height: 18px;
+  letter-spacing: 0px;
+  color: #333333 !important;
+  border-bottom: 3px solid #599fe5;
+  padding: 10px 10px !important;
+}
+
+.tel_f_size {
+  font-family: PingFang-SC-Medium;
+  font-size: 16px;
+  font-weight: normal;
+  font-stretch: normal;
+  line-height: 18px;
+  letter-spacing: 0px;
+  color: #666666 !important;
+  padding: 10px 10px !important;
+}
+</style>

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -120,7 +120,7 @@
         <div  class="col-sm-4">
           <label class="font_normal_body_new">是否自动阀控</label>
 
-          <input class="input-underline" style="width:45%" :value="row.f_network_valve == null ? '否' : '是'" readonly>
+          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '是' : '否'" readonly>
         </div>
       </div>
       <div v-if="row.f_collection_type == '按气量'" >

package/src/components/meterBook/MeterManger.vue

@@ -18,7 +18,7 @@
 
 <script>
   export default {
-    title: '抄表册管理',
+    title: '表册管理',
     components: {
     },
     data () {

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

@@ -36,6 +36,8 @@
     console.log('temp:', self)
     let temp = {
       reprint: "'正常'",
+      billdata: self.billData,
+      operator: `'${self.$login.f.name}'`,
       condition: self.data.id
     }
     if (self.data.fillgasid) {

package/src/components/revenue/HandManager/MeterBookManage.vue

@@ -34,7 +34,7 @@ let readGen = async function (self) {
 }
 
 export default {
-  title: '抄表册管理',
+  title: '表册管理',
   data () {
     return {
       f_userinfo_id: '',

package/src/components/revenue/HandManager/MeterBookUser.vue

@@ -290,6 +290,7 @@
             'f_meternumber': '表号',
             'f_address': '客户地址',
             'f_inputtor': '抄表员',
+            'f_meter_book_sort': '册内排序',
             'f_metertitles': '表箱号',
             'f_meter_base': '表底数',
             'f_user_type': '用户类型',

package/src/components/revenue/HandManager/OverdueSet.vue

@@ -17,7 +17,7 @@
 
 
   export default {
-    title: '滞纳金规则管理',
+    title: '滞纳金规则',
     data () {
       return {
         isdetail:false,

package/src/components/revenue/base/leftview/Mulitinfo.vue

@@ -1,70 +1,74 @@
-<template>
-  <div class="flex">
-    <!--<cardinfo :data="cardData" v-if="cardData.CardID"></cardinfo>-->
-    <userinfo @deal-msg="dealMsg" :data="data"></userinfo>
-    <user-meterinfodetail @deal-msg="dealMsg" :data="data"></user-meterinfodetail>
-    <!--<meter-use :data="data"></meter-use>-->
-    <!--<recordstoryinfo :data="data" v-ref:recordstoryinfo></recordstoryinfo>-->
-  </div>
-</template>
-
-<script>
-/**
-*客户相关信息
-*/
-
-export default {
-  title: '客户相关信息',
-  data () {
-    return {
-    }
-  },
-
-  props: {
-    data: {
-      type: Object
-    },
-    cardData: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    }
-  },
-  methods: {
-    dealMsg (obj) {
-      this.$dispatch('deal-msg', obj)
-    }
-  }
-}
-</script>
-<style lang="less">
-  #mulit-info-class {
-    width: 280px;
-    margin-right: 20px;
-    overflow-y: auto;
-    > div {
-      height: auto;
-      margin-bottom: 8px;
-    }
-  }
-  // 内容显示样式
-  .control-label {
-    height: 23px;
-    border-right: 1px solid #F2F6FA;
-    margin-bottom: 0;
-    text-align: left;
-  }
-
-  .info-content {
-    padding:6px;
-    span {
-      padding-left: 5px;
-    }
-  }
-// 信息区域的表格显示紧凑
-  .self-table > tbody > tr > td {
-    padding: 3px;
-    text-align: center;
-  }
-</style>
+<template>
+  <div class="flex">
+    <!--<cardinfo :data="cardData" v-if="cardData.CardID"></cardinfo>-->
+    <userinfo :warninginfo="warninginfo" @deal-msg="dealMsg" :data="data"></userinfo>
+    <user-meterinfodetail @deal-msg="dealMsg" :data="data"></user-meterinfodetail>
+    <!--<meter-use :data="data"></meter-use>-->
+    <!--<recordstoryinfo :data="data" v-ref:recordstoryinfo></recordstoryinfo>-->
+  </div>
+</template>
+
+<script>
+/**
+*客户相关信息
+*/
+
+export default {
+  title: '客户相关信息',
+  data () {
+    return {
+    }
+  },
+
+  props: {
+    data: {
+      type: Object
+    },
+    cardData: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    warninginfo: {
+      type: Object,
+      default: {}
+    }
+  },
+  methods: {
+    dealMsg (obj) {
+      this.$dispatch('deal-msg', obj)
+    }
+  }
+}
+</script>
+<style lang="less">
+  #mulit-info-class {
+    width: 280px;
+    margin-right: 20px;
+    overflow-y: auto;
+    > div {
+      height: auto;
+      margin-bottom: 8px;
+    }
+  }
+  // 内容显示样式
+  .control-label {
+    height: 23px;
+    border-right: 1px solid #F2F6FA;
+    margin-bottom: 0;
+    text-align: left;
+  }
+
+  .info-content {
+    padding:6px;
+    span {
+      padding-left: 5px;
+    }
+  }
+// 信息区域的表格显示紧凑
+  .self-table > tbody > tr > td {
+    padding: 3px;
+    text-align: center;
+  }
+</style>