sale-client 3.5.179 → 3.5.181

package/package.json

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

package/src/components/revenue/third/transferAuditCenter.vue

@@ -51,7 +51,7 @@
           for (let item of res.data.data) {
             img = item
             console.log("图片名",img.name)
-            if (img.name.indexOf("买方身份证（买方提供）") !== -1 || img.name.indexOf("网签备案合同") !== -1){
+            if (img.name.indexOf("买方身份证（买方提供）") !== -1 || img.name.indexOf("网签备案合同") !== -1 || img.name.indexOf("不动产权证") !== -1){
               imgList.push(
                 {
                   name:img.name,

package/src/components/revenue/third/transferAuditDisposeBasics.vue

@@ -9,7 +9,10 @@
           <!--图片信息-->
           <div class="auto" v-if="imgInfo.length">
             <div class="form-group" v-for="row in imgInfo">
-              <label class="col-sm-3 control-label">{{row.key}}</label>
+              <label class="col-sm-3 control-label">
+                {{row.key}}
+                <a class="active" v-if="row.key.indexOf('不动产权证') !== -1" target="_blank" :href="searchUri">查询</a>
+              </label>
               <div class="col-sm-9">
                 <img :src="row.value" v-if="row.value"  width="70%"/>
               </div>
@@ -108,7 +111,8 @@
       return {
         show: false,
         f_operator: this.$login.f.name,
-        placeholder: ''
+        placeholder: '',
+        searchUri:'http://60.173.140.115:8191/#/'
       }
     },
     props: {

package/src/filiale/fugu/components/BlackList.vue

@@ -0,0 +1,311 @@
+<template>
+  <div class="flex-auto" style="overflow-y: scroll;height: 55%">
+    <validator name='v'>
+      <form novalidate class="form-horizontal select-overspread ">
+        <ul class="nav nav-tabs">
+          <li class="active a-tabs"><a href="#">用户拉黑</a></li>
+        </ul>
+        <div>
+          <div class="row">
+            <div class="col-sm-4 form-group" id="f_user_id">
+              <label for="f_userinfo_code" class="font_normal_body">表&emsp;&emsp;号</label>
+              <input class="input_search" style="width:60%" type="text"
+                     v-model="model.f_meternumber"  @keyup.enter="getinfo('f_meternumber')"
+                     :disabled='isEdit' placeholder="输入表号,回车查询">
+            </div>
+            <div class="col-sm-4 form-group" id="f_user_id">
+              <label for="f_userinfo_code" class="font_normal_body">卡&emsp;&emsp;号</label>
+              <input class="input_search" style="width:60%" type="text"
+                     v-model="model.f_card_id"  @keyup.enter="getinfo('f_card_id')"
+                     :disabled='isEdit' placeholder="输入卡号,回车查询">
+            </div>
+            <div class="col-sm-4 form-group" id="f_user_id" :class="[$v.f_userinfo_code.required ? 'has-error' : 'has-success']">
+              <label for="f_userinfo_code" class="font_normal_body">用户编号</label>
+              <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"
+                     v-model="model.f_userinfo_code"  @keyup.enter="getinfo('f_userinfo_code')"
+                     v-validate:f_userinfo_code='{required: true }' :disabled='isEdit' placeholder="输入编号,回车查询">
+            </div>
+            <div class="col-sm-4 form-group" id="name"  :class="[$v.f_user_name.required ? 'has-error' : 'has-success']">
+              <label for="f_user_name" class=" font_normal_body">用户姓名</label>
+              <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"   v-validate:f_user_name='{required: true }'
+                     v-model="model.f_user_name" readonly
+                     placeholder="用户姓名">
+
+            </div>
+            <div class="col-sm-4 form-group" id="phone" :class="[$v.f_user_phone.required ? 'has-error' : 'has-success']">
+              <label for="f_user_phone" class=" font_normal_body">联系方式</label>
+              <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"  v-validate:f_user_phone='{required: true }'
+                     v-model="model.f_user_phone" readonly
+                     placeholder="联系方式">
+
+            </div>
+            <div class="col-sm-4 form-group" id="f_limit_times" :class="[$v.f_limit_times.required ? 'has-error' : 'has-success']">
+              <!--              <label for="f_limit_times" class=" font_normal_body">限购次数</label>-->
+              <label class="font_normal_body">限购次数</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_limit_times"   v-validate:f_limit_times='{required: true }'
+                     placeholder="限购次数">
+
+            </div>
+            <div class="col-sm-2 form-group" id="f_limit">
+              <!--              <label for="f_limit_times" class=" font_normal_body">限购次数</label>-->
+              <v-select
+                v-model="f_limit"
+                :value.sync="f_limit"
+                :options='limites'
+                width="100%"
+                close-on-select>
+              </v-select>
+            </div>
+            <div class="col-sm-3 form-group" id="f_limit_gas" style="right: 3%;">
+              <input class="input_search" style="width:60%" type="number" v-if="f_limit=='限购气量'"
+                     v-model="model.f_limit_value"
+                     v-scale="[model.f_limit_value, 2]"
+                     @click="gg()"
+                     placeholder="限购气量">
+              <input class="input_search" type="number" v-if="f_limit=='限购金额'"
+                     v-model="model.f_limit_amount"
+                     v-scale="[model.f_limit_amount, 2]"
+                     @click="gg()"
+                     placeholder="限购金额">
+
+            </div>
+          </div>
+
+          <div class="row">
+            <div class="col-sm-12 form-group" id="address">
+              <label for="f_address" class=" font_normal_body">地&emsp;&emsp;址</label>
+              <input class="input_search" type="text" class="input_search" style="width:87%" v-model="model.f_address"
+                     readonly
+                     placeholder="地址">
+            </div>
+            <div class="col-sm-12 form-group" id="f_comments" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
+              <label for="f_comments" class=" font_normal_body">原&emsp;&emsp;因</label>
+              <input class="input_search" type="text" class="input_search" style="width:87%" v-model="model.f_comments"
+                     placeholder="原因" v-validate:f_comments='{required: true }' >
+            </div>
+
+          </div>
+
+          <div style="text-align:right;height:auto;margin-top:6px;">
+            <button class="button_search" type="button" style="width:80px;" @click="confirm('拉黑')"
+                    v-show="!isBlackList && model.isblacklist =='false'" :disabled='!$v.valid'>
+              拉黑
+            </button>
+            <button class="button_search"  type="button"  style="width:80px;" @click="confirm('取消拉黑')"
+                    v-show="isBlackList || model.isblacklist =='true'" :disabled='!$v.valid'>
+              取消拉黑
+            </button>
+            <button class="button_export"  type="button"  style="width:80px;" @click="close()">取消</button>
+          </div>
+        </div>
+
+      </form>
+
+
+    </validator>
+
+  </div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import Vue from 'vue'
+  let initGen = async function (self, val) {
+  // 获取低保气价
+    let http = new HttpResetClass()
+    let res = await http.load('POST', 'rs/sql/sale_getUserAndVersion', {data: {condition:`f_userinfo_code='${self.data.f_userinfo_code}'` , f_orgid: self.$login.f.orgid}}, {
+      resolveMsg: null,
+      rejectMsg: null
+    })
+    console.log(res.data)
+    console.log('用户id:' + res.data[0].f_userinfo_id)
+    self.model = Object.assign({}, self.model, val)
+    self.model.f_userinfo_code = res.data[0].f_userinfo_code
+    self.model.f_meternumber = res.data[0].f_meternumber
+    self.model.f_card_id = res.data[0].f_card_id
+    self.model.f_userinfo_id = res.data[0].f_userinfo_id
+    self.model.f_user_phone = res.data[0].f_user_phone
+    self.model.f_address = res.data[0].f_address
+    self.model.f_user_phone = res.data[0].f_user_phone
+    self.model.version = res.data[0].version
+    self.model.f_limit_value=res.data[0].f_limit_value
+    self.model.f_limit_times=res.data[0].f_limit_times
+    self.model.f_limit_amount=res.data[0].f_limit_amount
+  }
+
+  export default {
+    title: '黑名单',
+    props: {
+      f_islow_income: {
+        type: String,
+        default: '1'
+      },
+      data: {
+        type: Object
+      }
+    },
+    data () {
+      return {
+        pricename: [{value: '', label: ''}],
+        model: {
+          f_userinfo_code: '',
+          f_userinfo_id: '',
+          f_user_name: '',
+          f_address: '',
+          f_user_phone: '',
+          f_comments: '',
+          version: null,
+          // 限购次数
+          f_limit_times: '',
+          // 限购气量
+          f_limit_value: '',
+          // 限购金额
+          f_limit_amount: ''
+
+        },
+        // 编辑控制
+        isBlackList: false,
+        f_filialeid: '',  // 所属公司
+        f_filialename: '',  // 所属公司名称
+        f_limit: '限购气量',
+        limites: [{label: '限购气量', value: '限购气量'}, {label: '限购金额', value: '限购金额'}]
+
+      }
+    },
+    ready () {
+      if (this.data) {
+        console.log(this.data + '*****************************')
+        if(this.data.f_parameter_value){
+          this.isBlackList = true
+          initGen(this, this.data)
+        } else {
+          this.isBlackList = false
+          this.initNormalModel(this.data,this)
+        }
+      } else {
+        this.initModel()
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val) {
+          if(this.data.f_parameter_value){
+            this.isBlackList = true
+            initGen(this, this.data)
+          } else {
+            this.isBlackList = false
+            this.initNormalModel(this.data,this)
+          }
+        } else {
+          this.isBlackList = false
+          this.initModel()
+        }
+      }
+    },
+    methods: {
+      initNormalModel(obj,self){
+        this.$resetpost('rs/sql/sale_getUserAndVersion', {data: {condition: `f_userinfo_code='${obj.f_userinfo_code}'`, f_orgid: this.$login.f.orgid}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          self.model.version = res.data[0].version
+        })
+        self.model = Object.assign({}, self.model, obj)
+        self.model.f_userinfo_code = obj.f_userinfo_code
+        self.model.f_meternumber = obj.f_meternumber
+        self.model.f_card_id = obj.f_card_id
+        self.model.f_userinfo_id = obj.f_userinfo_id
+        self.model.f_user_phone = obj.f_user_phone
+        self.model.f_address = obj.f_address
+        self.model.f_user_phone = obj.f_user_phone
+        self.model = Object.assign({},self.model,{isblacklist:'false'})
+      },
+      gg () {
+        if (this.f_limit[0] === '限购气量') {
+          this.model.f_limit_amount = ''
+        } else {
+          this.model.f_limit_value = ''
+        }
+      },
+      getinfo (type) {
+        var condition =`${type} = '${this.model[type]}'`
+        this.$resetpost('rs/sql/sale_getUserAndVersion', {data: {condition: condition, f_orgid: this.$login.f.orgid}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          console.log(res.data[0])
+          this.model = res.data[0]
+          this.$parent.blodid = this.model.f_userinfo_id
+        })
+      },
+      async confirm (type) {
+        if (type == '取消拉黑' && !this.$login.r.find(value => value == '取消拉黑')) {
+          this.$showMessage('你没有取消拉黑的权限,请联系管理员!')
+          return
+        }
+        let data = {
+          f_operat_type: type,
+          f_state: '有效',
+          f_user_id: this.model.f_user_id,
+          f_user_name: this.model.f_user_name,
+          f_comments: this.model.f_comments,
+          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_operate_date: this.$login.toStandardTimeString(),
+          f_describe: `${this.$login.f.name}对客户${this.model.f_user_name}进行${type}`,
+          f_userinfo_id: {
+            f_userinfo_id: this.model.f_userinfo_id,
+            f_user_state: '正常',
+            version: this.model.version
+          },
+          f_limit_times: this.model.f_limit_times,
+          f_limit_amount: this.model.f_limit_amount,
+          f_limit_value: this.model.f_limit_value
+        }
+        console.log('查看参数data', data)
+        let res =await this.$resetpost('rs/logic/backlistOperate', data,{resolveMsg: null, rejectMsg: null})
+        if (res.data.code == 200) {
+          this.$showMessage(`${type}成功`)
+        }
+        if (res.data.code == 500) {
+          this.$showMessage(`${type}失败,用户已被拉黑,请先取消拉黑`)
+          return
+        }
+        this.initModel()
+        this.$dispatch('success')
+      },
+      getorg (id, name) {
+        this.f_filialeid = id[0]
+        this.f_filialename = name[0]
+      },
+      initModel () {
+        this.model = {
+          f_userinfo_code: '',
+          f_userinfo_id: '',
+          f_user_name: '',
+          f_address: '',
+          f_user_phone: '',
+          f_comments: '',
+          version: null,
+          isblacklist: 'false'
+        }
+      },
+      close () {
+        this.$dispatch('close')
+      }
+    }
+  }
+</script>
+<style lang="less">
+  #gas-price-form {
+    .form-group {
+      margin-left: 0px;
+      margin-right: 0px;
+    }
+  }
+
+</style>

package/src/filiale/fugu/components/BlackListList.vue

@@ -0,0 +1,355 @@
+<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 like '%{}%'" 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" :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">是否黑名单</label>
+              <v-select v-model="$parent.$parent.isBlack"
+                        :options="$parent.$parent.isBlackSelect"
+                        @change="$parent.$parent.isBlackChange"
+                        :value.sync="$parent.$parent.isBlack"
+                        close-on-select></v-select>
+            </div>
+            <div class="form-group col-sm-3 button-range" style="padding-right: 10px">
+              <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="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="sale_getBlackList" template-name='黑名单导出'
+                :choose-col="true">
+              </export-excel>
+              <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
+                      v-el:cx>新增黑名单
+              </button>
+              <button class="button_search button_spacing"
+                      @click="$parent.$parent.modelShow()" v-el:cx>
+                黑名单用户导入
+              </button>
+              <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 like '%{}%'" 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.$parent.isdetail">
+              <label class="font_normal_body">是否黑名单</label>
+              <v-select v-model="$parent.$parent.isBlack"
+                        :options="$parent.$parent.isBlackSelect"
+                        @change="$parent.$parent.isBlackChange"
+                        :value.sync="$parent.$parent.isBlack"
+                        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}"
+                 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}">
+              <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" v-show="$parent.$parent.isBlack[0] !== '否'" :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>
+
+        </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>
+          </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_comments}}</td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="handleBlacklistUsersImport" backdrop="false" width="45%" title="黑名单用户导入" v-ref:modal>
+      <article slot="modal-body" class="modal-body">
+        <file-upload class="my-file-uploader col-sm-8" name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+                     action="rs/file/uploadFile" tagname="确定" v-ref:file :accept="accept">
+        </file-upload>
+        <button class="button_clear btn-gn"
+                @click="downloadFiles()" style="margin-top: 10px;background-color: #6aa6e2;">
+          导入模板下载
+        </button>
+      </article>
+      <footer slot="modal-footer" class="modal-footer" style="text-align: right;border: 0">
+        <button class="btn button_search" @click="handleBlacklistUsersImportCancel()">取消</button>
+      </footer>
+    </modal>
+  </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,
+        model: new PagedList('rs/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_offsite_time': '安检日期',
+          'f_parameter_value': '限购日期',
+          'f_comments': '限购原因'
+        },
+        isBlackSelect: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+        isBlack: ['是'],
+        handleBlacklistUsersImport: false,
+        accept: ".xlsx,.xls",
+      }
+    },
+    props: {
+      style: {
+        type: String,
+        default: 'form-group col-sm-2'
+      },
+      row: {},
+      ispartial: false
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      handleBlacklistUsersImportCancel () {
+        this.handleBlacklistUsersImport = false
+      },
+      modelShow () {
+        this.handleBlacklistUsersImport = true
+      },
+      downloadFiles(){
+        let downurl='rs/downloadfile/file?filename=黑名单用户导入模板';
+        this.$resetget(downurl,{}).then(res=>{
+          var link = document.createElement('a');
+          link.target="_blank"
+          link.href =downurl ;
+          link.setAttribute("download", "黑名单用户导入模板.xlsx"); //指定下载后的文件名，防跳转
+          document.body.appendChild(link);
+          link.click();
+        })
+      },
+      isBlackChange (val) {
+        if (val != undefined) {
+          if (val == '是') {
+            this.model = new PagedList('rs/sql/sale_getBlackList', 20)
+          } else {
+            this.model = new PagedList('rs/sql/getNormalUsersFiles', 20)
+          }
+        } else {
+          this.isBlack = ['是']
+          this.model = new PagedList('rs/sql/sale_getBlackList', 20)
+        }
+      },
+      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}
+      }
+    },
+    events: {
+      onFileUpload: function (file, res) {
+        let data = {
+          filepath: res.f_downloadpath,
+          f_operat_type: '拉黑',
+          f_state: '有效',
+          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_operate_date: this.$login.toStandardTimeString()
+        }
+        this.$resetpost('rs/FuGuBlackListUsers/importExcel', data, {resolveMsg: null, rejectMsg: '导入失败'})
+          .then((res) => {
+            if(res.data.code === 200){
+              this.$showAlert(res.data.msg, 'info', 3000)
+              this.search()
+            }else{
+              this.$showAlert(res.data.msg, 'warning', 3000)
+            }
+            this.handleBlacklistUsersImport = false
+          })
+      }
+    }
+  }
+</script>

package/src/filiale/fugu/sale.js

@@ -14,6 +14,9 @@ let specialComp = {
   // 用户基本信息test
   'file-user-essential-info':(resolve) => { require(['./UserEssentialInfoTest'], resolve) },
   // 表具设备信息test
-  'file-user-device-info':(resolve) => { require(['./components/FilesManage/UserDeviceInfoTest'], resolve) }
+  'file-user-device-info':(resolve) => { require(['./components/FilesManage/UserDeviceInfoTest'], resolve) },
+  // 黑名单用户
+  'black-list-list':(resolve) => { require(['./components/BlackListList'], resolve) },
+  'black-list':(resolve) => { require(['./components/BlackList'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/shanggao/BankPayment.vue

@@ -221,7 +221,6 @@
       // 微信单方账单，系统可缴费
       async charge (row) {
           let str1 = JSON.parse(row.f_attach)
-          if (str1.isHand == 0) {
             let data = {
               f_user_id: str1.f_user_id,
               f_userfiles_id: str1.f_userfiles_id,
@@ -244,7 +243,6 @@
               resolveMsg: '',
               rejectMsg: '保存记录出错!!!'
             })
-          }
           this.$refs.paged.$refs.cri.search()
       }
         // })

package/src/filiale/wuan/meterinfodetail.vue

@@ -0,0 +1,247 @@
+<template>
+  <partial-view v-ref:pv>
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading"  style="height: 35px">
+        <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
+      </div>
+      <div class="auto ">
+<!--        <div class="row">-->
+<!--          <label class = "col-sm-5 " style="color: brown">团缴编号</label>-->
+<!--          <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>-->
+<!--        </div>-->
+        <div class="row">
+          <label class = "col-sm-5 " >气表类型</label>
+          <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表品牌</label>
+          <span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表型号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5" style="color: brown">表具状态</label>
+          <span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
+          <label class = "col-sm-5 " style="color: brown">系统余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
+          <label class = "col-sm-5 " style="color: brown">系统余量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
+          <label class = "col-sm-5 " style="color: brown">表上余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
+          <label class = "col-sm-5 " style="color: brown">表上余量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >初始表底数</label>
+          <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表当前底数</label>
+          <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >写卡次数</label>
+          <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">物联网次数</label>
+          <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">表累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">户累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
+          <label class = "col-sm-5 " >剩余抵扣量</label>
+          <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
+        </div>
+<!--        <div class="row" v-if="data.f_meter_type.includes('卡表')">-->
+<!--          <label class = "col-sm-5 " style="color: brown" >户累购气量</label>-->
+<!--          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>-->
+<!--        </div>-->
+        <div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}</span>
+        </div>
+<!--        <div class="row" v-if="data.f_meter_type.includes('卡表')">-->
+<!--          <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>-->
+<!--          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>-->
+<!--        </div>-->
+        <div class="row">
+          <label class = "col-sm-5 " >气表表号</label>
+          <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
+          <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
+          <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
+        </div>
+<!--        <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
+<!--          <label class = "col-sm-5 " >写卡次数</label>-->
+<!--          <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
+<!--        </div>-->
+        <div class="row">
+          <label class = "col-sm-5 " >用气性质</label>
+          <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气价名称</label>
+          <span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
+        </div>
+        <!--<div class="row" v-if="data.f_balance < 0">-->
+        <!--<label class = "col-sm-5 "  >账户欠费</label>-->
+        <!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <!--<div class="row" v-else>-->
+        <!--<label class = "col-sm-5 " >账户余额</label>-->
+        <!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <div class="row" v-if="data.f_remanent_money > 0">
+          <label class = "col-sm-5 " >应补金额</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
+        </div>
+        <div class="row" v-if="data.f_remanent_gas > 0">
+          <label class = "col-sm-5 " >应补气量</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
+          <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >抄表册名</label>
+          <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >抄表册册序号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >安装位置</label>
+          <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换人员</label>
+          <span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换时间</label>
+          <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >抄表员</label>
+          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >上次抄表日</label>
+          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >建档日期</label>
+          <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
+          <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
+        </div>
+      </div>
+    </div>
+  </partial-view>
+</template>
+
+<script>
+  /*用户档案相关信息组件*/
+  export default {
+    ready () {
+      console.log('看看userinfo里面接收的data数据', this.data)
+    },
+    title: '客户基本信息',
+    data () {
+      return {
+        dafault: {
+          f_total_gas_all: 0,
+          f_total_fee_all:0,
+          f_balance_amount: 0,
+          f_balance_gas: 0,
+          f_initial_base: 0,
+          f_meter_base: 0,
+          f_deduction_gas: 0,
+          f_total_gas: 0,
+          f_total_fee: 0,
+          f_card_id: '*****',
+          f_times: 0,
+          f_iot_times: 0,
+          f_meternumber: 0,
+          f_gasproperties: '****',
+          f_price_name: '****',
+          f_meter_brand: '****',
+          f_balance: 0,
+          f_user_type: '**',
+          f_remanent_gas: 0,
+          f_position: '****',
+          f_inputtor: '****',
+          f_jval: 0,
+          f_table_state: 0
+        },
+        model: null
+      }
+    },
+    props: ['data'],
+    methods: {
+      dealmsg (val) {
+        this.$dispatch('deal-msg', val)
+      }
+    },
+    watch: {
+      'data' (val) {
+        console.log('val========', val)
+      }
+    }
+  }
+</script>
+<style lang="less">
+  .row {
+    /*border-bottom:1px solid #F2F6FA;*/
+    margin-left: 0;
+    margin-right: 0;
+  }
+  // . {
+  //   height: 23px;
+  //   border-right: 1px solid #F2F6FA;
+  //   margin-bottom: 0;
+  //   text-align: left;
+  // }
+  // #address {
+  //   border-left: 1px solid #F2F6FA;
+  // }
+  // #user-info {
+  //   padding:6px;
+  //   span {
+  //     padding-left: 5px;
+  //   }
+  // }
+  // #address1 {
+  //   border-right: 0;
+  // }
+</style>

package/src/filiale/wuan/sale.js

@@ -8,6 +8,7 @@ let specialComp = {
   'file-meter-info': (resolve) => { require(['./charge/MeterinfoTest'], resolve) },
   // 用户基本信息test
   'file-user-essential-info': (resolve) => { require(['./UserEssentialInfoTest'], resolve) },
-  'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) }
+  'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) },
+  'user-meterinfodetail': (resolve) => { require(['./meterinfodetail'], resolve) }
 }
 exports.specialComp = specialComp