sale-client 4.0.57-preview → 4.0.58-preview

package/package.json

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

package/src/filiale/ronghao/sale.js

@@ -1,21 +1,23 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-
-export default function () {
-  // 特殊用户
-  Vue.component('basic-living-list', (resolve) => { require(['./BasicLivingList'], resolve) })
-  // 表具停用
-  Vue.component('disable-manage', (resolve) => { require(['./DisableManage'], resolve) })
-  // 用户综合信息
-  Vue.component('file-user-general-info', (resolve) => { require(['./UserGeneralInfoTest'], resolve) })
-  // 发票信息公共
-  Vue.component('eticket-modal', (resolve) => { require(['./EticketModal'], resolve) })
-  // 补卡管理
-  Vue.component('replace-card-manage', (resolve) => { require(['./ReplaceCardManage'], resolve) })
-  // 发卡售气
-  Vue.component('show-card-sell-gas', (resolve) => { require(['./ShowCardSellGas'], resolve) })
-  // 特殊用户
-  Vue.component('special-user-manage', (resolve) => { require(['./SpecialUserManage'], resolve) })
-  // 黑名单
-  Vue.component('black-list-list', (resolve) => { require(['./BlackListList'], resolve) })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 特殊用户
+  Vue.component('basic-living-list', (resolve) => { require(['./BasicLivingList'], resolve) })
+  // 表具停用
+  Vue.component('disable-manage', (resolve) => { require(['./DisableManage'], resolve) })
+  // 用户综合信息
+  Vue.component('file-user-general-info', (resolve) => { require(['./UserGeneralInfoTest'], resolve) })
+  // 发票信息公共
+  Vue.component('eticket-modal', (resolve) => { require(['./EticketModal'], resolve) })
+  // 补卡管理
+  Vue.component('replace-card-manage', (resolve) => { require(['./ReplaceCardManage'], resolve) })
+  // 发卡售气
+  Vue.component('show-card-sell-gas', (resolve) => { require(['./ShowCardSellGas'], resolve) })
+  // 特殊用户
+  Vue.component('special-user-manage', (resolve) => { require(['./SpecialUserManage'], resolve) })
+  // 黑名单
+  Vue.component('black-list-list', (resolve) => { require(['./BlackListList'], resolve) })
+  // 当前选择用户的用户基本信息
+  Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
+}

package/src/filiale/siyang/BlackListList.vue

@@ -1,275 +0,0 @@
-<template>
-  <div @keyup.enter="search" class="flex-auto" style="flex:1;">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
-        <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
-          <div class="row">
-            <res-select-group :style="$parent.$parent.style" :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
-            <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 class="input_search" condition="f_userinfo_code like '%{}%'" placeholder="用户编号" style="width:60%"
-                     style="width: 90px"
-                     type="text" v-model="model.ename"
-              />
-            </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">用户姓名</label>
-              <input  class="input_search" condition="f_user_name = '{}'" placeholder="用户姓名" style="width:60%" style="width: 90px"
-                      type="text" v-model="model.name"
-              />
-            </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.downshow && !$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">电&emsp;&emsp;话</label>
-              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
-                     type="text"
-                     v-model="model.f_user_phone">
-            </div>
-            <div class="form-group col-sm-3 button-range" style="padding-right: 10px">
-              <import-excel v-if="$parent.$parent.blackImport === '黑名单导入'" template-name="黑名单用户导入模板" logic-name="BlackListImport" import-json="blacklist.json"></import-excel>
-              <button @click="$parent.$parent.search()" class="button_search button_spacing" style="width:80px;margin-left:30px;" v-el:cx>查询</button>
-              <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
-                      v-el:cx>新增异常用户
-              </button>
-              <export-excel
-                :data="$parent.$parent.getCondition"
-                :field="$parent.$parent.getfield"
-                sqlurl="api/af-revenue/logic/saleExport" progress="saleGetExportProgress" sql-name="sale_getBlackList" template-name='黑名单导出'
-                :choose-col="true">
-              </export-excel>
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
-            </div>
-          </div>
-          <div class="row" v-if="$parent.$parent.criteriaShow">
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">用户姓名</label>
-              <input  class="input_search" condition="f_user_name = '{}'" placeholder="用户姓名" style="width:60%" style="width: 90px"
-                      type="text" v-model="model.name"
-              />
-            </div>
-
-
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">表&emsp;&emsp;号</label>
-              <input  :size="model.f_meternumber ? model.f_meternumber.length * 2 : 4" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' style="width:60%"
-                      type="text"
-                      v-model="model.f_meternumber">
-            </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">卡&emsp;&emsp;号</label>
-              <input  :size="model.f_card_id ? model.f_card_id.length * 2 : 4" class="input_search" condition="f_card_id = '{}'" placeholder='卡号' style="width:60%"
-                      type="text"
-                      v-model="model.f_card_id">
-            </div>
-
-
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">地&emsp;&emsp;址</label>
-              <input  :size="model.f_address ? model.f_address.length * 2 : 4" class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
-                      type="text"
-                      v-model="model.f_address">
-            </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!(!$parent.$parent.downshow && !$parent.$parent.$parent.isdetail)">
-              <label class="font_normal_body">电&emsp;&emsp;话</label>
-              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
-                     type="text"
-                     v-model="model.f_user_phone">
-            </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!(!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail)">
-              <label class="font_normal_body">地&emsp;&emsp;址</label>
-              <input :size="model.f_address ? model.f_address.length * 2 : 4" class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
-                     type="text"
-                     v-model="model.f_address">
-            </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>
-              <datepicker placeholder="开始日期"
-                          style="width:60%"
-                          class="datepicker"
-                          v-model="model.f_last_check_date"
-                          :value.sync="model.f_last_check_date"
-                          :format="'yyyy-MM-dd'"
-                          condition="f_last_check_date >= '{} 00:00:00'"
-              ></datepicker>
-            </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>
-              <datepicker placeholder="开始日期"
-                          style="width:60%"
-                          class="datepicker"
-                          v-model="model.f_parameter_value"
-                          :value.sync="model.f_parameter_value"
-                          :format="'yyyy-MM-dd'"
-                          condition="f_parameter_value >= '{} 00:00:00'"
-              ></datepicker>
-            </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">操&nbsp;作&nbsp;人</label>
-              <input  :size="model.f_operator ? model.f_operator.length * 2 : 4" class="input_search" condition="f_operator like '%{}%'" placeholder='操作人' style="width:60%"
-                      type="text"
-                      v-model="model.f_operator">
-            </div>
-          </div>
-
-        </div>
-      </criteria>
-      <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th style="text-align: center; ">序号</th>
-            <th style="text-align: center;">用户编号</th>
-            <th style="text-align: center;">姓名</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;">地址</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>
-          </tr>
-        </template>
-        <template partial='body'>
-
-          <td style="text-align: center;">{{$index+1}}</td>
-          <td style="text-align: center;">{{row.f_userinfo_code}}</td>
-          <td style="text-align: center;">{{row.f_user_name}}</td>
-          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_meternumber}}</td>
-          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_card_id}}</td>
-          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_user_phone}}</td>
-          <td style="text-align: center;">{{row.f_address}}</td>
-          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_last_check_date}}</td>
-          <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_comments}}</td>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import Vue from 'vue'
-
-  export default {
-    data () {
-      return {
-        initres: {
-          org: [this.$login.f.orgid],
-          dep: [],
-          user: []
-        },
-        criteriaShow: false,
-        blackImport: '',
-        model: new PagedList('api/af-revenue/sql/sale_getBlackList', 20),
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
-        getfield: {
-          'f_userinfo_code': '用户编号',
-          'f_user_name': '姓名',
-          'f_meternumber': '表号',
-          'f_card_id': '卡号',
-          'f_user_phone': '电话',
-          'f_address': '地址',
-          'f_last_check_date': '安检日期',
-          'f_parameter_value': '限购日期',
-          'f_comments': '限购原因'
-        }
-      }
-    },
-    props: {
-      style: {
-        type: String,
-        default: 'form-group col-sm-2'
-      },
-      row: {},
-      ispartial: false
-    },
-    ready () {
-      this.getAuthority()
-      this.search()
-    },
-    methods: {
-      getAuthority () {
-        if (this.$login.r.find(value => value == '黑名单导入')) {
-          this.blackImport = '黑名单导入'
-        }
-      },
-      async getRes (condition, obj) {
-        console.log('condition =', condition)
-        console.log('obj =', obj)
-
-        // //更新抄表册
-        // this.meterbooks = [{label: '全部',value: ''}];
-        // if(this.lastorgstr != condition){
-        //   this.tempfalg = true;
-        //   this.lastorgstr = condition;
-        // }
-        // if(this.tempfalg && condition != null && condition!=''  && condition.indexOf("(")>-1){
-        //   this.tempfalg = false;
-        //   let a = condition.substring(condition.indexOf("(")+2)
-        // }
-        // this.orgCondtionStr = condition
-      },
-      hidden () {
-        this.criteriaShow = !this.criteriaShow
-      },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-        this.$dispatch('search')
-      },
-      getorg (val) {
-        this.f_orgid = val
-      },
-      selfSearch (args) {
-        if (!this.f_orgid) {
-          this.getorg('and f_orgid in' + '(\'' + [this.$login.f.orgid] + '\')')
-        }
-        console.log('查询。。。', this.f_orgid)
-        if (this.f_orgid) {
-          // args.condition = `${args.condition} and s.f_filialeid  in ${this.f_orgid}`
-          args.condition = `${args.condition}  ${this.f_orgid} `
-        }
-
-        this.model.search(args.condition, args.model)
-      },
-      add () {
-        if (!this.$login.r.find(value => value == '新增黑名单')) {
-          this.$showMessage('你没有新增黑名单的权限,请联系管理员!')
-          return
-        }
-        this.style = 'col-sm-3'
-        this.$dispatch('add')
-      },
-      dblclick (val) {
-        console.log(val)
-        this.$emit('dblclick', val)
-      }
-
-    },
-    watch: {
-      'model.rows.length' (val) {
-        if (val === 1) {
-          this.$refs.paged.$refs.grid.select(this.model.rows[0])
-        }
-      }
-    },
-    computed: {
-      getCondition () {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.f_orgid}
-      }
-    }
-  }
-</script>

package/src/filiale/siyang/DisableManage.vue

@@ -1,120 +0,0 @@
-<template>
-  <div class="auto">
-    <validator name='v'>
-      <form class="form-horizontal">
-        <div class="row">
-          <div class="col-sm-4 form-group">
-            <label for="f_reason" class="font_normal_body">停用原因</label>
-            <v-select v-model="model.f_reason"
-                      placeholder='停用原因'
-                      :value.sync="model.f_reason"
-                      :options='reason'
-                      v-ref:reason
-                      close-on-select ></v-select>
-          </div>
-          <div class="col-sm-4 form-group">
-            <input type="checkbox" class="large-checkbox" id="f_valveState" v-model="valveStateChecked">
-            <label for="f_operator" class="font-size-large">立即关阀</label>
-          </div>
-        </div>
-        <div class="row" style="margin-top:1px;">
-          <div class="col-sm-8 form-group">
-            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
-            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
-          </div>
-        </div>
-      </form>
-      <div style="text-align:right;">
-        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
-        <button class="button_clear" @click="clean()" >取消</button>
-      </div>
-    </validator>
-  </div>
-  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="表具停用"></upload>
-</template>
-<script>
-/**
- *综合业务
- 表具停用组件
- */
-export default {
-  title: '表具停用',
-  props: ['row'],
-  data () {
-    return {
-      valveStateChecked: false,
-      blodid: '',
-      showupload: true,
-      model: {},
-      reason: this.$appdata.getParam('停用原因')
-    }
-  },
-  ready () {
-    this.blodid = this.row.f_userinfo_id
-  },
-  methods: {
-    async confirm () {
-      await this.$LogicService.meterDisable(this.model, this.row)
-      let array = [{
-        f_user_id: this.row.f_user_id,
-        f_userfiles_id: this.row.f_userfiles_id,
-        f_alias: this.row.f_alias,
-        f_userinfo_id: this.row.f_userinfo_id,
-        f_orgname: this.$login.f.orgs,
-        f_orgid: this.$login.f.orgid,
-        f_meternumber: this.row.f_meternumber
-      }]
-      if (this.row.f_meter_type === '物联网表' && this.valveStateChecked) {
-        let data1 = {
-          f_apply_type: '阀门控制',
-          userid: array,
-          nowDate: new Date(),
-          f_apply_value: '关阀',
-          f_apply_beizhu: '表具停用自动关阀',
-          f_apply_operator: this.$login.f.name
-        }
-        // 根据复选框的状态添加条件
-        if (this.valveStateChecked) {
-          data1.f_valveState = 1
-        }
-        let data2 = {
-          userid: array,
-          instructtype: '阀门控制',
-          isOpen: '关阀',
-          instructTitle: '手动关阀',
-          reasonInfo: '表具停用自动关阀',
-          f_instruct_state: '待发送',
-          inputtor: this.$login.f.name
-        }
-        await this.$resetpost('api/af-revenue/logic/iot_instructUpdateAndDelect',
-          {
-            data: {
-              data1: data1,
-              data2: data2
-            }
-          })
-      }
-      this.$dispatch('success')
-    },
-    clean () {
-      this.$dispatch('refresh')
-    }
-  }
-}
-</script>
-
-<style>
-.large-checkbox {
-  width: 20px;
-  height: 20px;
-  transform: scale(1.4);
-  margin-right: 14px;
-  margin-top: 15px;
-}
-
-.font-size-large {
-  padding-top: 10px;
-  padding-left: 10px;
-  font-size: 16px;
-}
-</style>

package/src/filiale/siyang/EticketModal.vue

@@ -1,95 +0,0 @@
-<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-12 form-group " :class="[!row.f_paper_name ? 'has-error' : '']">
-              <label class="control-label col-sm-3">开票名称:</label>
-              <input class="form-control " :disabled="true"
-                     v-model="row.f_paper_name" placeholder="开票名称">
-            </div>
-            <div class="col-sm-12 form-group " :class="[ row.invoice_is_pax.length < 1 ? 'has-error' : '']">
-              <label class="control-label col-sm-3">是否征税:</label>
-              <v-select v-model="row.invoice_is_pax"
-                        placeholder='请选择'
-                        :value.sync="row.invoice_is_pax"
-                        close-on-select
-                        :width="60"
-                        :value-single="true"
-                        :search="false"
-                        :options='is_pax' clear-button>
-              </v-select>
-            </div>
-            <div class="col-sm-12 form-group ">
-              <label class="control-label col-sm-3">开户行及账号:</label>
-              <input class="form-control col-sm-2" :disabled="true"
-                     v-model="row.f_paper_account" placeholder="购方开户行及账号">
-            </div>
-            <div class="col-sm-12 form-group "
-                 :class="[ (row.f_taxpayer_id.length < 16 || row.f_taxpayer_id.length > 18) && row.f_paper_type === '数电专票' ? 'has-error' : '']">
-              <label class="control-label col-sm-3">纳税人识别号:</label>
-              <input class="form-control col-sm-2" :disabled="true"
-                     v-model="row.f_taxpayer_id" placeholder="纳税人识别号(16至18位)">
-            </div>
-            <div class="col-sm-12 form-group " :class="[!row.f_address_phone ? 'has-error' : '']">
-              <label class="control-label col-sm-3">开票地址电话:</label>
-              <input class="form-control col-sm-2" :disabled="true"
-                     v-model="row.f_address_phone" placeholder="开票地址">
-            </div>
-            <div class="col-sm-12 form-group " >
-              <label class="control-label col-sm-3">发票备注:</label>
-              <input class="form-control col-sm-2"
-                     v-model="row.f_eticket_reason" placeholder="发票备注">
-            </div>
-            <div class="col-sm-12 form-group ">
-              <label class="control-label col-sm-3">邮箱推送:</label>
-              <input class="form-control col-sm-2" :disabled="true"
-                     v-model="row.f_email" 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&&((row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18) || row.f_paper_type === '数电普票')&&row.invoice_is_pax.length >0)"
-                @click='confirm'>确认收费
-        </button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-
-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>