sale-client 3.6.399 → 3.6.400

package/package.json

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

package/src/components/common/searchuploadfile/uploadFilesHistory.vue

@@ -154,10 +154,11 @@ export default {
                   let temp = res.data.array[j].f_downloadpath
                   let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
                   if (res.data.array[j].fusetype == '安检照片') {
-                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
+                    res.data.array[j].f_downloadURL = location.protocol + location.host + '/rs/image/file/' + res.data.array[j].f_filename
                   } else {
-                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                    res.data.array[j].f_downloadURL = location.protocol + location.host + '/' + URL
                   }
+                  console.log('res.data.array[j].f_downloadURL', res.data.array[j].f_downloadURL)
                   this.files[i].arrays.push(res.data.array[j])
                 }
               }

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -305,7 +305,7 @@
       <h4 class="modal-title" align="center">阀控管理</h4>
     </header>
     <article slot="modal-body" class="modal-body">
-      <div class="form-group" style="padding-left: 8px">
+      <div class="form-group col-sm-12" style="padding-left: 8px">
         <label class="font_normal_body">阀控状态</label>
         <div class="col-sm-3">
           <select v-model="selectedOption" class="input_search">
@@ -317,7 +317,7 @@
         </div>
       </div>
 
-      <div class="form-group " style="padding-left: 8px">
+      <div class="form-group col-sm-12 " style="padding-left: 8px">
         <label class="font_normal_body" :class="operateReason?'':'text-danger'">操作原因</label>
         <textarea class="form-control" style="width:80%" v-model="operateReason" rows="1"
                   placeholder="请填写操作原因"></textarea>
@@ -352,7 +352,7 @@
           close-on-select>
         </v-select>
       </div>
-      <div class="form-group " style="padding-left: 8px">
+      <div class="form-group " style="padding-left: 8px" :class="{'color-red':f_beizhu}">
         <label class="font_normal_body">{{val1}}原因：</label>
         <textarea class="search_area" v-model="f_beizhu" rows="10" cols="75" placeholder="备注信息"></textarea>
       </div>
@@ -954,7 +954,9 @@ import axios from 'axios'
     width: 100%;
     height: 40px;
   }
-
+.text-danger{
+  color:darkred;
+}
   .PanelTD {
     width: 5%;
   }

package/src/filiale/rongchuang/BlackList.vue

@@ -0,0 +1,290 @@
+<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="[model.isshow ? 'col-sm-2 form-group' : 'col-sm-3 form-group']" id="f_limit">
+              <!--              <label for="f_limit_times" class=" font_normal_body">限购次数</label>-->
+              <label v-if="model.isshow" class="font_normal_body">{{ f_limit }}</label>
+              <v-select
+                v-model="f_limit"
+                :value.sync="f_limit"
+                :options='limites'
+                width="80%" v-if="!model.isshow">
+              </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" style="width:60%" 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:`u.f_userinfo_id='${self.data.f_userinfo_id}'` , 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
+  self.model.isshow = true
+  if (typeof res.data[0].f_limit_type === 'undefined') {
+    self.f_limit = '限购气量'
+  } else {
+    self.f_limit = (res.data[0].f_limit_type === '金额') ? '限购金额' : '限购气量'
+  }
+}
+
+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: '',
+        isshow: false
+
+      },
+      // 编辑控制
+      isBlackList: false,
+      f_filialeid: '',  // 所属公司
+      f_filialename: '',  // 所属公司名称
+      f_limit: '限购气量',
+      limites: [{label: '限购气量', value: '限购气量'}, {label: '限购金额', value: '限购金额'}]
+
+    }
+  },
+  ready () {
+    if (this.data) {
+      this.isBlackList = true
+      initGen(this, this.data)
+    } else {
+      this.initModel()
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val) {
+        this.isBlackList = true
+        initGen(this, val)
+      } else {
+        this.isBlackList = false
+        this.initModel()
+      }
+    }
+  },
+  methods: {
+    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',
+        isshow: false
+      }
+    },
+    close () {
+      this.$dispatch('close')
+    }
+  }
+}
+</script>
+<style lang="less">
+#gas-price-form {
+  .form-group {
+    margin-left: 0px;
+    margin-right: 0px;
+  }
+}
+
+</style>

package/src/filiale/rongchuang/sale.js

@@ -53,4 +53,6 @@ export default function () {
   Vue.component('file-user-general-info-new', (resolve) => { require(['./FilesManageNew/UserGeneralInfoTest'], resolve) })
   // 用户综合信息
   Vue.component('file-user-general-info', (resolve) => { require(['./FilesManage/UserGeneralInfoTest'], resolve) })
+  // 黑名单
+  Vue.component('black-list', (resolve) => { require(['./BlackList'], resolve) })
 }

package/src/filiale/wuhai/ChargeRecordQuery.vue

@@ -74,7 +74,7 @@
         let http = new HttpResetClass()
         // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
         this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
-        let record = await http.load('POST', 'rs/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
+        let record = await http.load('POST', 'rs/sql/sale_RecordQuery?pageNo=1&pageSize=9999999', {data: {condition: this.condition}}, {
           rejectMsg: '流水查询出错！！',
           resolveMsg: null
         })