sale-client 4.0.36-preview → 4.0.38-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -215,7 +215,7 @@
           <div class="col-sm-4 ">
             <label class=" font_normal_body">阶梯累计</label>
             <v-select id="f_ladder_sync"
-                      v-model="f_payment"
+                      v-model="f_ladder_sync"
                       placeholder='是否累计'
                       :search="false"
                       :value-single="true"
@@ -236,7 +236,7 @@
                       || (model.f_type.includes('清零') && row.f_meter_type ==='物联网表' && row.f_hascard ==='是')">
             <label class=" font_normal_body">开户方式</label>
             <v-select id="f_open_type"
-                      v-model="f_payment"
+                      v-model="f_open_type"
                       placeholder='开户方式'
                       :search="false"
                       :value-single="true"

package/src/filiale/fugou/MeterinfoTest.vue

@@ -28,10 +28,10 @@
                    @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
                    v-next-el="{id: 'metertitles'}" :disabled="meterNumberDisabled && meterChangeDisabled">
           </div>
-          <div class="col-sm-4 form-group" v-else>
+          <div class="col-sm-4 form-group" v-else :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
-                   @blur="meternumberValidate()" placeholder='表号'
+                   @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
                    v-next-el="{id: 'metertitles'}">
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_defendcard.required ? 'has-error' : '']"
@@ -56,7 +56,7 @@
                v-show="(formconfig && formconfig.f_metertitles && formconfig.f_metertitles.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_metertitles')">
             <label for="f_metertitles" class="font_normal_body">&ensp;表&ensp;封&ensp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表封号'
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表封号' v-validate:f_metertitles='{required: true }'
                    v-next-el="{id: 'meterbase'}">
           </div>
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_table_state')"
@@ -273,14 +273,19 @@
                       close-on-select
                       v-model='row.f_use_limit'></v-select>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_gas_person.required ? 'has-error' : '']"
+          <div class="col-sm-4 form-group" :class="[$m.gas_person.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_gas_person && formconfig.f_gas_person.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_gas_person')">
             <label for="f_gas_person" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em"
                    class="font_normal_body">&ensp;{{getConfigLabelName('f_gas_person','通气人')}}</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_gas_person"
-                   v-validate:f_gas_person=getConfigValidate("f_gas_person",false)
-                   placeholder='通气人'></input>
+            <input type="text" v-model="$refs.gas_person.selectedItems" v-show="false" v-validate:gas_person='{required: true }'
+                   v-validate:f_gas_person=getConfigValidate("f_gas_person",false)>
+            <v-select :value.sync="row.f_gas_person" :options='repairers'
+                      :placeholder="getConfigPlaceholder('f_gas_person','通气人')"
+                      close-on-select style="width:60%"
+                      value-single
+                      v-ref:gas_person
+                      v-model='row.f_gas_person'></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_gas_date && formconfig.f_gas_date.required) || !onlyshowmust"
@@ -296,13 +301,17 @@
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_install_person.required ? 'has-error' : '']"
+          <div class="col-sm-4 form-group" :class="[$m.install_person.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_install_person && formconfig.f_install_person.required) || !onlyshowmust"
               >
-            <label for="f_install_person" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{'挂表人'}}</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_install_person"
+            <label for="f_install_person" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{'安装人'}}</label>
+            <input type="text"  v-model="row.f_install_person" v-show="false"
                    v-validate:f_install_person=getConfigValidate("f_install_person",false)
-                   placeholder='挂表人'></input>
+                   v-validate:install_person='{required: true }'
+                  ></input>
+            <v-select :value.sync="row.f_install_person" v-model="row.f_install_person" style="width:60%"   value-single
+                      v-ref:install_person
+              :options='installpersons' placeholder='安装人' close-on-select v-el:cc></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_position.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_position && formconfig.f_position.required) || !onlyshowmust"
@@ -444,16 +453,15 @@
                       :value-single="true"
                       v-model='row.f_garbage_fee'></v-select>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_inputtor.required ? 'has-error' : '']"
-               v-show="(formconfig && formconfig.f_inputtor && formconfig.f_inputtor.required) || !onlyshowmust"
-               v-if="getConfigShowItem('f_inputtor')">
+          <div class="col-sm-4 form-group" :class="[$m.inputtor.required ? 'has-error' : '']">
             <label class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em">&ensp;{{getConfigLabelName('f_inputtor','抄表员')}}</label>
-            <input type="text" v-model="row.f_inputtor" v-show="false"
-                   v-validate:f_inputtor=getConfigValidate("f_inputtor",false)>
+            <input type="text" v-model="$refs.inputtor.selectedItems" v-show="false" v-validate:inputtor='{required: true }'>
             <v-select :value.sync="row.f_inputtor" v-model='row.f_inputtor'
                       style="width:60%"
                       :options='inputtores' placeholder='抄表员'
                       close-on-select
+                      value-single
+                      v-ref:inputtor
                       condition="f_inputtor like '%{}%'" v-el:cc></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_usestate.required ? 'has-error' : '']"
@@ -640,6 +648,11 @@
   import co from 'co'
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
+
+  let readyGen = async function (self) {
+    self.getEmp()
+    self.installperson()
+  }
   let meterBookGen = function * (self) {
     if (self.$login.r.find(value => value == '抄表册建档')) {
       self.opteratormetrbook = true
@@ -706,6 +719,8 @@
     title: '表具信息',
     data () {
       return {
+        repairers: [], // 置换员数组
+        installpersons: [],
         config: {
           // 卡控流量计相关字段显示
           stuckFlowmeterShow: false,
@@ -783,6 +798,7 @@
       }
       await this.getConcentrators()
       co(meterBookGen(this))
+      await readyGen(this)
     },
     methods: {
       validateInput (event, key) {
@@ -811,7 +827,7 @@
         }
         return {}
       },
-      getConfigShowItem (name,defaultVal = true) {
+      getConfigShowItem (name, defaultVal = true) {
         if (this.formconfig && this.formconfig[name] && this.formconfig[name].hasOwnProperty('showItem')) {
           return this.formconfig[name].showItem
         } else {
@@ -1050,6 +1066,28 @@
           }
         }
         return flowmetermodels
+      },
+      getEmp () {
+        let filiale = this.$login.f.orgid
+        var source = 'tool.getChildrenOfResName($置换员$).where(row.getString($orgid$)==$' + this.$login.f.orgid + '$)'
+        var val = {source: source, userid: filiale}
+        let http = new HttpResetClass()
+        http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach((item) => {
+            this.repairers.push({label: item.name, value: item.name})
+          })
+        })
+      },
+      installperson () {
+        let filiale = this.$login.f.orgid
+        var source = 'tool.getChildrenOfResName($施工员$).where(row.getString($orgid$)==$' + this.$login.f.orgid + '$)'
+        var val = {source: source, userid: filiale}
+        let http = new HttpResetClass()
+        http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach((item) => {
+            this.installpersons.push({label: item.name, value: item.name})
+          })
+        })
       }
     },
     watch: {
@@ -1136,18 +1174,6 @@
         }
         return rs
       },
-      installperson () {
-        // return this.$login.f.f_installman
-        let rs = new Array()
-        for (let i = 0; i < this.$login.f.f_installman.length; i++) {
-          let temp = {
-            label: this.$login.f.f_installman[i].name,
-            value: this.$login.f.f_installman[i].name
-          }
-          rs.push(temp)
-        }
-        return rs
-      },
       meterbrands () {
         return this.$GetSaleParam.getGasbrand()
       },

package/src/filiale/fugou/components/revenue/Common/MeterMessage.vue

@@ -0,0 +1,200 @@
+<template>
+  <!--<div class="auto">-->
+  <validator name='v'  @valid="onValid()"  @invalid="onInvalid()">
+    <form novalidate class="form-horizontal">
+      <div class="row auto" >
+
+        <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">
+          <label for="f_meter_type" class="font_normal_body">新表类型</label>
+          <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
+          <v-select :value.sync="metermessage.f_meter_type"
+                    v-model="metermessage.f_meter_type"
+                    :options='meterType' placeholder='气表类型'
+                    close-on-select v-ref:metertype style="width: 60%"></v-select>
+        </div>
+
+        <div class="col-sm-4 form-group" :class="[$v.brand.required ? 'has-error' : '']">
+          <label for="gasbrand" class="font_normal_body">新表品牌</label>
+          <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+          <v-select :value.sync="metermessage.gasbrand" :options='getMeterBrands(metermessage.f_meter_type)' @change='brandChange' placeholder='气表品牌' close-on-select
+                    search v-model='metermessage.gasbrand' v-ref:brand></v-select>
+        </div>
+        <div class="col-sm-4 form-group" :class="[$v.model.required ? 'has-error' : '']">
+          <label for="gasmodel" class="font_normal_body">新表型号</label>
+          <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.model.selectedItems"  v-validate:model='{required: true }'>
+          <v-select :value.sync="metermessage.gasmodel" :options='metermessage.gasbrand[0] ? metermessage.gasbrand[0].gasmodel : [] ' placeholder='气表型号' close-on-select
+                    v-model='metermessage.gasmodel' :disabled= 'metermessage.gasbrand.length === 0 ' @change='modelChange' v-ref:model></v-select>
+        </div>
+
+      </div>
+      <div class="row auto" >
+        <div class="col-sm-4 form-group" :class="[$v.meternumber.required ? 'has-error' : '']">
+          <label for="f_meternumber" class="font_normal_body">新&ensp;表&ensp;号</label>
+          <input type="text" class="input_search" style="width:60%" class="input_search"
+                 @blur="meternumberValidate()"  v-model="metermessage.f_meternumber" v-validate:meternumber='{required: true }' placeholder='表号' >
+        </div>
+        <div class="col-sm-4 form-group" :class="[$v.f_metertitles.required ? 'has-error' : '']">
+          <label for="f_metertitles" class="font_normal_body">新表封号</label>
+          <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_metertitles='{required: true }' v-model="metermessage.f_metertitles" placeholder='表封号'>
+        </div>
+        <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
+          <label for="f_meter_base" class="font_normal_body">新表底数</label>
+          <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
+        </div>
+        <div class="col-sm-4 form-group" :class="[$v.f_aroundmeter.required ? 'has-error' : '']">
+          <label for="f_meter_base" class="font_normal_body">表&ensp;&ensp;向</label>
+          <input type="text" class="input_search" style="width:60%"  v-show="false" v-validate:f_aroundmeter='{required: true }' v-model="metermessage.f_aroundmeter" placeholder='表向' >
+          <v-select :value.sync="metermessage.f_aroundmeter" :options='aroundmeters'
+                    placeholder='表向'
+                    close-on-select style="width: 60%"
+                    v-model='metermessage.f_aroundmeter'></v-select>
+        </div>
+<!--        <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">-->
+<!--          <label for="f_meter_type" class="font_normal_body">新表类型</label>-->
+<!--          <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>-->
+<!--          <v-select :value.sync="metermessage.f_meter_type"-->
+<!--                    v-model="metermessage.f_meter_type"-->
+<!--                    :options='meterType' placeholder='气表类型'-->
+<!--                    close-on-select v-ref:metertype style="width: 60%"></v-select>-->
+<!--        </div>-->
+      </div>
+
+    </form>
+  </validator>
+  <!--</div>-->
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+/**
+ *公共组件
+ *获取气表信息
+ */
+export default {
+  data () {
+    return {
+      isdecimal: '否',
+      imgsrc: '/images/mainicon/biaopan.png',
+      imgmeter: '/images/mainicon/addmeter.png',
+      aroundmeters: this.$appdata.getParam('左右表'),
+      meterType: this.$appdata.getParam('气表类型')
+    }
+  },
+  props: ['f_userfiles_id', 'metermessage'],
+  methods: {
+    onValid () {
+      this.$dispatch('valid')
+    },
+    onInvalid () {
+      this.$dispatch('invalid')
+    },
+    brandChange (val) {
+      this.isdecimal = val.length > 0 ? val[0].f_isdecimal : '否'
+      this.meternumberValidate()
+    },
+    modelChange (val) {
+      this.$dispatch('gasmodel', this.metermessage.gasbrand)
+    },
+    resetValidate () {
+      this.$resetValidation()
+    },
+    meterbase () {
+      if (this.isdecimal === '是') {
+        this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(4)
+      } else {
+        this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
+      }
+    },
+    getMeterBrands (meterType) {
+      let res = []
+      if (meterType.length > 0) {
+        this.meterbrands.forEach((item) => {
+          if (item.value.f_meter_type === meterType[0]) {
+            res.push(item)
+          }
+        })
+      }
+      return res
+    },
+    async meternumberValidate () {
+      let http1 = new HttpResetClass()
+      let res1 = await http1.load('POST', '/api/af-revenue/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.metermessage.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+      if (res1.data.length > 0) {
+
+
+        // 已经选择了气表 则不再替换
+        if (this.metermessage.f_meter_type <= 0 ){
+          this.metermessage.f_meter_type = [res1.data[0].f_meter_classify]
+        }
+        // 替换表号自带的气表品牌和型号
+        let meterbrands = this.meterbrands
+        for (let row of meterbrands) {
+          if (row.label == res1.data[0].f_meter_brand) {
+            // 已经选择了气表品牌则不再替换
+            if (this.metermessage.gasbrand.length <= 0) this.metermessage.gasbrand = [row.value]
+            // 替换气表型号
+            if (res1.data[0].f_meter_style) {
+              for (let model of row.value.gasmodel) {
+                if (model.label == res1.data[0].f_meter_style) {
+                  // 已经选择了气表型号则不再替换
+                  if (this.metermessage.gasmodel.length <= 0) this.metermessage.gasmodel = [model.value]
+                  continue
+                }
+              }
+            }
+            continue
+          }
+        }
+      }
+      if (this.metermessage.f_meternumber && this.metermessage.gasbrand.length > 0) {
+        // 表号位数验证
+        let meternumberLen = this.metermessage.gasbrand[0].f_meternumber_len
+        if (meternumberLen) {
+          if (this.metermessage.f_meternumber.length != meternumberLen) {
+            this.metermessage.f_meternumber = ''
+            this.$showAlert(`表号位数不正确, 当前气表品牌表号位数是: ${meternumberLen}`, 'warning', 3000)
+            return
+          }
+        }
+        // 表计信息验证
+        if (this.metermessage.gasbrand[0].f_meterverification == '是') {
+          if (res1.data.length <= 0) {
+            this.$showAlert(`当前表号: ${this.metermessage.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
+            this.metermessage.f_meternumber = ''
+            return
+          }
+        }
+        if (this.metermessage.gasbrand[0].f_meter_type === '物联网表') {
+          let param = {
+            f_userfiles_id: this.f_userfiles_id,
+            f_meternumber: this.metermessage.f_meternumber,
+            f_gasbrand_id: this.metermessage.gasbrand[0].id
+          }
+
+          let res = await this.$resetpost('api/af-revenue/logic/meternumberValidate', param, {
+            resolveMsg: null,
+            rejectMsg: '表号验证失败！！'
+          })
+          console.log('标号验证返回：', res)
+          if (res.data) {
+            this.metermessage.f_meternumber = ''
+            this.$showAlert('表号已存在！！', 'warning', 3000)
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    usertypes () {
+      return this.$appdata.getParam('用户类型')
+    },
+    positions () {
+      return this.$appdata.getParam('安装位置')
+    },
+    meterbrands () {
+      return this.$GetSaleParam.getGasbrand()
+    }
+  }
+}
+</script>

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -18,15 +18,15 @@
             </v-select>
           </div>
           <div class="col-sm-4 form-group" v-if="!config.f_change_operator">
-            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <label for="f_change_operator" class=" font_normal_body">挂&ensp;表&ensp;人</label>
             <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
-                   placeholder="换表人">
+                   placeholder="挂表人">
           </div>
           <div class="col-sm-4 form-group" v-if="config.f_change_operator" :class="[$v.f_change_operator.required ? 'has-error' : '']">
-            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <label for="f_change_operator" class=" font_normal_body">挂&ensp;表&ensp;人</label>
             <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
                    v-validate:f_change_operator="{required: true }"
-                   placeholder="换表人">
+                   placeholder="挂表人">
           </div>
 
           <div class="col-sm-4 form-group"

package/src/filiale/fugou/sale.js

@@ -86,4 +86,6 @@ export default function () {
   Vue.component('charge-query-user', (resolve) => { require(['./ChargeQueryUser.vue'], resolve) })
   // 单个表具信息
   Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
+  // 获取气表信息
+  Vue.component('meter-message', (resolve) => { require(['./components/revenue/Common/MeterMessage'], resolve) })
 }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/beifangshiye/sale'
+import FilialeSale from './filiale/fugou/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'

package/src/plugins/LogicService.js

@@ -61,6 +61,7 @@ let LogicService = {
       f_user_id: row.f_user_id,
       f_userinfo_id: row.f_userinfo_id,
       f_user_name: row.f_user_name,
+      f_user_phone: row.f_user_phone,
       f_comments: model.f_reason[0],
       f_othereason: model.f_othereason,
       f_operat_type: '停用',