sale-client 3.4.74 → 3.4.78

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/UserInfoDetailManageNew.vue

@@ -2,9 +2,9 @@
   <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"  @cancel-main="cancel"></user-base-info-new></div>
-      <saletabbut  v-if="row" v-ref:list :active="-1" style="height:72%;margin-top: 1%">
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">
-          <record-query-user :row="row" v-if="show == '流水查询'" @deal-msg="dealMsg"></record-query-user>
+          <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>

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

@@ -1,90 +1,90 @@
-<template>
-  <div class="auto form-horizontal">
-    <modal :show.sync="show" v-ref:modal large backdrop="false" :width="900">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeShow"><span>&times;</span></button>
-        <h4 class="modal-title">发票信息</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <div class="auto select-overspread form-horizontal">
-          <div class="row auto">
-            <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
-              <label class="control-label">开票名称:</label>
-              <input class="form-control col-sm-2"
-                     v-model="row.f_paper_name" placeholder="开票名称">
-            </div>
-            <div class="col-sm-6 form-group form-input-group">
-              <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
-              <v-select v-model="row.invoice_is_pax"
-                        placeholder='请选择'
-                        :value.sync="row.invoice_is_pax"
-                        close-on-select
-                        :width="60" disabled
-                        :value-single="true"
-                        :search="false"
-                        :options='is_pax' clear-button>
-              </v-select>
-            </div>
-            <div class="col-sm-12 form-group form-input-group">
-              <label class="control-label">开户行及账号:</label>
-              <input class="form-control col-sm-2"
-                     v-model="row.f_paper_account" placeholder="购方开户行及账号">
-            </div>
-            <div class="col-sm-12 form-group form-input-group" >
-              <label class="control-label">纳税人识别号:</label>
-              <input class="form-control col-sm-2"
-                     v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
-            </div>
-            <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
-              <label class="control-label">开票地址电话:</label>
-              <input class="form-control col-sm-2"
-                     v-model="row.f_address_phone" placeholder="开票地址">
-            </div>
-            <div class="col-sm-12 form-group form-input-group" >
-              <label class="control-label">发票备注:</label>
-              <input class="form-control col-sm-2"
-                     v-model="row.f_eticket_reason" placeholder="发票备注">
-            </div>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn button_search"
-                :disabled="!(row.f_paper_name&&row.f_address_phone)"
-                @click='confirm'>确认收费
-        </button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '电子发票',
-  data () {
-    return {
-      is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
-    }
-  },
-  props: ['row','show'],
-  ready () {
-  },
-  methods: {
-    confirm(){
-        this.$dispatch('confirm')
-    },
-    closeShow(){
-      this.$dispatch('closeModalShow')
-    }
-  },
-  watch: {
-    'row'(){
-      this.row.invoice_is_pax=['征税']
-    }
-  },
-  events: {}
-}
-</script>
-<style>
-</style>
+<template>
+  <div class="auto form-horizontal">
+    <modal :show.sync="show" v-ref:modal large backdrop="false" :width="900">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeShow"><span>&times;</span></button>
+        <h4 class="modal-title">发票信息</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="auto select-overspread form-horizontal">
+          <div class="row auto">
+            <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
+              <label class="control-label">开票名称:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_paper_name" placeholder="开票名称">
+            </div>
+            <div class="col-sm-6 form-group form-input-group">
+              <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+              <v-select v-model="row.invoice_is_pax"
+                        placeholder='请选择'
+                        :value.sync="row.invoice_is_pax"
+                        close-on-select
+                        :width="60" disabled
+                        :value-single="true"
+                        :search="false"
+                        :options='is_pax' clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-12 form-group form-input-group">
+              <label class="control-label">开户行及账号:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_paper_account" placeholder="购方开户行及账号">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" >
+              <label class="control-label">纳税人识别号:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+              <label class="control-label">开票地址电话:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_address_phone" placeholder="开票地址">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" >
+              <label class="control-label">发票备注:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_eticket_reason" placeholder="发票备注">
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn button_search"
+                :disabled="!(row.f_paper_name&&row.f_address_phone)"
+                @click='confirm'>确认收费
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '电子发票',
+  data () {
+    return {
+      is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+    }
+  },
+  props: ['row','show'],
+  ready () {
+  },
+  methods: {
+    confirm(){
+        this.$dispatch('confirm')
+    },
+    closeShow(){
+      this.$dispatch('closeModalShow')
+    }
+  },
+  watch: {
+    'row'(){
+      this.row.invoice_is_pax=['征税']
+    }
+  },
+  events: {}
+}
+</script>
+<style>
+</style>