sale-client 4.2.69 → 4.2.71

package/src/filiale/jinhong/FilesComplete.vue

@@ -0,0 +1,266 @@
+<template>
+  <div class="auto">
+      <validator name='m'>
+        <form novalidate class="form-horizontal select-overspread">
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4">
+              <label for="f_user_name" class="font_normal_body ">客户姓名</label>
+              <input class="input_search " style="width:60%"  v-model="model.f_user_name" placeholder='客户姓名' :value="row.f_user_name">
+            </div>
+            <div class="col-sm-4">
+              <label for="f_user_phone" class="font_normal_body ">客户电话</label>
+              <input class="input_search " style="width:60%"  v-model="model.f_user_phone" placeholder='电话' :value="row.f_user_phone">
+            </div>
+            <div class="col-sm-4">
+              <label for="f_idnumber" class="font_normal_body ">证件号码</label>
+              <input class="input_search " style="width:60%"  v-model="model.f_idnumber" placeholder='证件号码' :value="row.f_idnumber">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-8">
+              <label for="f_address" class="font_normal_body ">客户地址</label>
+              <input class="input_search " style="width:80%"  v-model="model.f_address" placeholder='客户地址' :value="row.f_address" readonly>
+            </div>
+            <div class="col-sm-4"
+                 :class="[$m.f_meternumber.required ? 'has-error' : 'has-success']">
+              <label for="f_meternumber" class="font_normal_body ">表&emsp;&emsp;号</label>
+              <input class="input_search " style="width:60%"  v-model="model.f_meternumber"
+                     v-validate:f_meternumber='{required: true}'
+                     placeholder='表号' :value="row.f_meternumber">
+            </div>
+
+          </div>
+          <div class="row" style="margin-top:10px;">
+
+            <div class="col-sm-4">
+              <label for="f_user_name" class="font_normal_body ">左&ensp;右&ensp;表</label>
+              <input class="input_search " style="width:60%"  v-model="model.f_aroundmeter" placeholder='左右表' :value="row.f_aroundmeter" readonly>
+            </div>
+            <div class="col-sm-8">
+              <label for="f_user_phone" class="font_normal_body ">备&emsp;&emsp;注</label>
+              <input class="input_search " style="width:80%"  v-model="model.f_comments" placeholder='备注' :value="row.f_comments" readonly>
+            </div>
+
+          </div>
+          <div class="row" style="margin-top:10px;">
+
+            <div :class="[$m.f_gasbrand_id.required ? 'has-error' : 'has-success']" class="col-sm-4">
+              <input type="text" v-show="false" v-model="model.f_gasbrand"
+                     v-validate:f_gasbrand_id='{required: true }' >
+
+              <label for="f_gasbrand_id" class=" font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_gasbrand" @change="verifigasbrand()"
+                        :options='meterbrands'
+                        :placeholder="model.f_gasbrand[0]!==null?model.f_gasbrand[0].f_meter_brand:'请选择'"
+                        v-model='model.f_gasbrand'
+                        v-ref:brand
+                        close-on-select>
+              </v-select>
+            </div>
+
+
+            <div :class="[$m.f_gasmodel_id.required ? 'has-error' : 'has-success']" class="col-sm-4">
+              <input type="text" v-show="false" v-model="model.f_gasmodel"
+                     v-validate:f_gasmodel_id='{required: true }'>
+              <label for="f_gasmodel_id" class=" font_normal_body">气表型号</label>
+              <v-select :value.sync="model.f_gasmodel"
+                        :options='model.f_gasbrand[0].gasmodel'
+                        :placeholder="model.f_gasbrand[0]!==null?model.f_gasbrand[0].f_meter_style:'请选择'"
+                        close-on-select
+                        v-model='model.f_gasmodel'
+                        v-ref:model></v-select>
+
+
+            </div>
+            <div class="col-sm-4" :class="[$m.pricename.required ? 'has-error' : '']">
+              <input type="text" v-show="false" v-model="model.f_price_name" v-validate:pricename='{required: true }'>
+              <label class="font_normal_body">气价名称</label>
+              <v-select :value.sync="model.f_price_name"
+                        v-model="model.f_price_name"
+                        placeholder='气价名称'
+                        :options="getPricenames"
+                        @change="priceChange"
+                        close-on-select  v-ref:pricename></v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body">气价备注</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_price_comments" placeholder='气价备注' disabled>
+            </div>
+            <div class="col-sm-4 form-group"
+                 :class="[$m.f_meter_base.required || $m.f_meter_base.dctest ? 'has-error' : 'has-success']">
+              <label for="f_meter_base" class=" font_normal_body">气表底数</label>
+              <input class="input_search" style="width:60%" type="number" id="pregasFocue"
+                     v-model="model.f_meter_base"
+                     v-validate:f_meter_base='{required: true, dctest: [0, ">=" ]}'
+                     placeholder="气表底数">
+            </div>
+
+          </div>
+
+          <!--<div class="row" style="margin-top:10px;">-->
+            <!--<div class="col-sm-4"-->
+                 <!--:class="[$m.gas.required ? 'select-error' : '']">-->
+              <!--<label for="f_username" class="font_normal_body">用气性质</label>-->
+              <!--<input type="text" v-show="false" v-model="model.f_gasproperties" v-validate:gas='{required: true }'>-->
+              <!--<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"-->
+                        <!--:options='gasproperties' placeholder='用气性质'-->
+                        <!--close-on-select v-ref:gas></v-select>-->
+            <!--</div>-->
+            <!--<div class="col-sm-4" :class="[$m.type.required ? 'select-error' : '']">-->
+              <!--<label for="pricetype" class="font_normal_body">气价类型</label>-->
+              <!--<v-select :value.sync="model.f_price_type" v-model="model.f_price_type"-->
+                        <!--placeholder='气价类型' :options="pricetypes"-->
+                        <!--close-on-select v-ref:type>-->
+              <!--</v-select>-->
+              <!--<input type="text" v-show="false" v-model="model.f_price_type" v-validate:type='{required: true }'>-->
+            <!--</div>-->
+            <!---->
+          <!--</div>-->
+        </form>
+        <div style="text-align:right;">
+          <button class="button_search btn-gn" @click="confirm()" :disabled='!$m.valid || validateOk'>确认</button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+  </div>
+  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="档案完善"></upload>
+</template>
+<script>
+  export default {
+    title: '档案完善',
+    data () {
+      return {
+        model: {
+          f_userfiles_id: '',
+          f_user_name: '',
+          f_user_phone: '',
+          f_idnumber: '',
+          f_gasproperties: [],
+          f_gasbrand: [],
+          f_gasmodel: [],
+          f_address: '',
+          f_price_id: '',
+          f_gasbrand_id: '',
+          f_gasmodel_id: '',
+          // f_meter_brand:'',
+          // f_meter_style:'',
+          f_price_type: [],
+          f_price_name: '',
+          f_meter_base: null,
+          f_price_comments: '',
+          f_filialeid: '',
+          f_userinfo_id: ''
+        },
+        blodid: '',
+        showupload: true,
+        gasproperties: [],
+        validateOk: false,
+        pricetypes: this.$appdata.getParam('气价类型')
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.row = this.data ? this.data : this.row
+      this.blodid = this.row.f_userinfo_id
+      this.gasproperties = this.$appdata.getParam(this.row.f_user_type)
+      if (this.row.f_gasproperties) {
+        this.model.f_gasproperties.push(this.row.f_gasproperties)
+      }
+      if (this.row.f_price_type) {
+        this.model.f_price_type.push(this.row.f_price_type)
+      }
+
+      if (this.row.f_gasbrand_id) {
+        this.meterbrands.forEach((val) => {
+          if (this.row.f_gasbrand_id == val.value.id) {
+            this.model.f_gasbrand.push(val.value)
+          }
+        })
+      }
+
+      if (this.row.f_gasmodel_id) {
+        console.log('气表下的型号。。。', this.model.f_gasbrand[0].gasmodel)
+        this.model.f_gasbrand[0].gasmodel.forEach((res) => {
+          if (this.row.f_gasmodel_id == res.value.id) {
+            this.model.f_gasmodel.push(res.value)
+          }
+        })
+      }
+
+      this.model.f_userfiles_id = this.row.f_userfiles_id
+      this.model.f_user_type = this.row.f_user_type
+      this.model.f_filialeid = this.$login.f.orgid
+      this.model.f_userinfo_id = this.row.f_userinfo_id
+    },
+    methods: {
+      priceChange (val) {
+        if (val.length > 0) {
+          // 展示气价备注
+          this.model.f_price_comments = val[0].f_comments ? val[0].f_comments : '无'
+        }
+      },
+      async confirm () {
+        this.model.f_gasbrand_id = this.model.f_gasmodel[0].f_gasbrand_id
+        this.model.f_gasmodel_id = this.model.f_gasmodel[0].id
+        this.model.f_price_id = this.model.f_price_name[0].f_price_id
+        this.model.f_gasproperties = this.model.f_price_name[0].f_gasproperties
+        this.model.f_user_type = this.model.f_price_name[0].f_user_type
+        this.model.f_user_name = this.model.f_user_name
+        this.model.f_user_phone = this.model.f_user_phone
+        this.model.f_meter_classify = this.model.f_gasbrand[0].f_meter_type
+
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
+        this.model.f_orgid = this.$login.f.orgid
+        this.model.f_orgname = this.$login.f.orgs
+        this.model.f_depid = this.$login.f.depids
+        this.model.f_depname = this.$login.f.deps
+
+        await this.$resetpost('api/af-revenue/logic/file_complete', this.model, {resolveMsg: '档案信息已完善成功', rejectMsg: '档案信息完善失败'})
+        this.clean()
+      },
+      clean () {
+        this.$info('取消操作')
+        this.$dispatch('refresh', this.row)
+      },
+
+      printok () {
+        this.$dispatch('success')
+      },
+      validateBill (val) {
+        this.validateOk = !val.isOk
+      },
+
+      verifigasbrand () {
+        this.verifi()
+      },
+      verifi () {
+        if ((this.row == null) && (this.model.f_meternumber) && (this.model.f_gasbrand)) {
+          veri(this)
+        }
+      }
+    },
+    computed: {
+      meterbrands () {
+        return this.$GetSaleParam.getGasbrand()
+      },
+      getPricenames () {
+        let f_filialeid = this.$login.f.orgid
+        let result = []
+        this.$GetSaleParam.prices.forEach((item) => {
+          if (item.f_state === '有效' && f_filialeid == item.f_filialeid) {
+            let value = {
+              label: item.f_price_name,
+              value: item
+            }
+            result.push(value)
+          }
+        })
+        return Array.from(new Set(result))
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/jinhong/IOTMeterCenterInner.vue

@@ -340,6 +340,7 @@ let IOTChargeGen = async function (self) {
       param.insurance.f_user_phone = self.row.f_user_phone
       param.insurance.f_state = '有效'
       param.insurance.f_receivable = self.insurance.f_money_all
+      param.insurance.f_email = self.insurance.f_email
       param.insurance.f_user_name = self.row.f_user_name
       param.insurance.f_opreator = self.$login.f.name
         // await self.$resetpost('api/af-revenue/logic/saveInsInfo', {data: self.model})
@@ -755,6 +756,12 @@ export default {
         if (!this.insurance.f_insurance_company) {
           return this.$showMessage('请填写保险公司')
         }
+        if (this.insurance.f_email) {
+          const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+          if (!REG_EMAIL.test(this.insurance.f_email)) {
+            return this.$showMessage('请输入正确的邮箱')
+          }
+        }
       }
       let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行物联网表缴费吗？`, ['confirm', 'cancel'])
       if (res != 'confirm') return

package/src/filiale/jinhong/InsuranceTemp.vue

@@ -43,6 +43,11 @@
           <label class="font_normal_body">结束日期</label>
           <input v-model="model.f_expiration_date"  style="width: 60%" placeholder="保险到期时间"  :value.sync='model.f_expiration_date'       class="input_search" type="text"  >
         </div>
+        <div class="col-sm-4 form-group" >
+          <label class="font_normal_body">&nbsp;&nbsp;&nbsp;邮&nbsp;箱&nbsp;&nbsp;&nbsp;</label>
+          <input v-model="model.f_email" class="input_search" placeholder="邮箱" style="width:60%"
+                 type="text">
+        </div>
         <div class="col-sm-4 form-group" :class="[$v.f_insurance_company.required ? 'has-error' : '']">
           <label class="font_normal_body" title="参数:保险公司">保险公司</label>
           <input v-show="false" v-model="$refs.f_insurance_company.selectedItems" v-validate:f_insurance_company='{required: true }'
@@ -86,6 +91,7 @@ export default {
         f_insurance_company: '',
         f_insurance_number: '',
         f_expiration_date: '',
+        f_email: '',
         f_salecount: null,
         f_money_all: null
       },
@@ -101,7 +107,7 @@ export default {
     row: Object
   },
   ready () {
-    if(this.row.f_ins_stop_date && this.row.f_ins_stop_date>Util.toStandardTimeString()){
+    if (this.row.f_ins_stop_date && this.row.f_ins_stop_date > Util.toStandardTimeString()) {
       this.model.f_ins_start_date = this.row.f_ins_stop_date
     } else {
       this.model.f_ins_start_date = Util.toStandardTimeString()
@@ -172,7 +178,7 @@ export default {
       let val = this.$appdata.getSingleValue(this.model.f_insurance_type)
       console.log(val)
       this.model.f_money = val || 0
-      if(this.model.f_salecount){
+      if (this.model.f_salecount) {
         this.getTotal()
       }
     },

package/src/filiale/jinhong/MachineMeterCenter.vue

@@ -205,6 +205,7 @@ let asyncMachineMeterCenter = async function (self) {
         insurance.f_depid = self.$login.f.depids
         insurance.f_depname = self.$login.f.deps
         insurance.f_receivable = self.insurance.f_money_all
+        insurance.f_email = self.insurance.f_email
         insurance.f_userinfo_id = self.row.f_userinfo_id
         self.model.insurance = insurance
         // await self.$resetpost('api/af-revenue/logic/saveInsInfo', {data: self.model})
@@ -505,6 +506,12 @@ let asyncMachineMeterCenter = async function (self) {
           if (!this.insurance.f_insurance_company) {
             return this.$showMessage('请填写保险公司')
           }
+          if (this.insurance.f_email) {
+            const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+            if (!REG_EMAIL.test(this.insurance.f_email)) {
+              return this.$showMessage('请输入正确的邮箱')
+            }
+          }
         }
         this.eticket_msg = false
         // 如果有变更原因说明有变更

package/src/filiale/jinhong/ShowCardSellGasInner.vue

@@ -395,6 +395,7 @@ let initCardGen = async function (self) {
       insurance.f_depid = self.$login.f.depids
       insurance.f_depname = self.$login.f.deps
       insurance.f_receivable = self.insurance.f_money_all
+      insurance.f_email = self.insurance.f_email
       self.model.insurance = insurance
       // await self.$resetpost('api/af-revenue/logic/saveInsInfo', {data: self.model})
     }
@@ -797,7 +798,17 @@ export default {
           return
         }
       }
-
+      if (this.insurance && this.insurance.f_money_all > 0) {
+        if (!this.insurance.f_insurance_company) {
+          return this.$showMessage('请填写保险公司')
+        }
+        if (this.insurance.f_email) {
+          const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+          if (!REG_EMAIL.test(this.insurance.f_email)) {
+            return this.$showMessage('请输入正确的邮箱')
+          }
+        }
+      }
       this.clickConfirm = true
       this.model.f_curbalance = this.curbalance
       this.model.f_open_fee = this.openFee

package/src/filiale/jinhong/Userinfo.vue

@@ -367,6 +367,11 @@ export default {
       this.close()
     },
     async modifyUserIdNumberReason () {
+      const idCardReg = /^(?:[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{3}[0-9Xx]|[1-9]\d{5}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{3})$/
+      if (!idCardReg.test(this.newuseridnumber)) {
+        this.$showMessage('请输入正确的身份证号码')
+        return
+      }
       let param = {
         new_idnumber: this.newuseridnumber,
         f_userinfo_id: this.data.f_userinfo_id,
@@ -415,6 +420,11 @@ export default {
       this.newrentphone = ''
     },
     async modifyUser () {
+      const phoneReg = /^[1](([3][0-9])|([4][01456789])|([5][012356789])|([6][2567])|([7][0-8])|([8][0-9])|([9][012356789]))[0-9]{8}$/
+      if (!phoneReg.test(this.newuserphone)) {
+        this.$showMessage('请输入正确的手机号码')
+        return
+      }
       let param = {
         new_userphone: this.newuserphone,
         f_userinfo_id: this.data.f_userinfo_id,
@@ -434,6 +444,11 @@ export default {
       this.close()
     },
     async modifyUserRent () {
+      const phoneReg = /^[1](([3][0-9])|([4][01456789])|([5][012356789])|([6][2567])|([7][0-8])|([8][0-9])|([9][012356789]))[0-9]{8}$/
+      if (!phoneReg.test(this.newrentphone)) {
+        this.$showMessage('请输入正确的手机号码')
+        return
+      }
       let param = {
         new_rentphone: this.newrentphone,
         f_userinfo_id: this.data.f_userinfo_id,

package/src/filiale/jinhong/sale.js

@@ -58,4 +58,6 @@ export default function () {
   Vue.component('record-cancel', (resolve) => { require(['./RecordCancel'], resolve) })
   // 历史抄表
   Vue.component('hand-list', (resolve) => { require(['./HandList'], resolve) })
+  // 档案完善
+  Vue.component('files_complete', (resolve) => { require(['./FilesComplete'], resolve) })
 }