sale-client 3.6.210 → 3.6.211

package/package.json

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

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -24,7 +24,7 @@
           <div class="col-sm-4 form-group" :class="[$v.f_alias.required ? 'has-error' : 'has-success']">
             <label for="f_alias" class="font_normal_body">别&emsp;&emsp;名</label>
             <input class="input_search" style="width: 60%" type="text" v-model="gasmessage.f_alias"
-                   v-validate:f_alias='{required: true }'>
+                   v-validate:f_alias='{required: true }' @blur="getInitMeterParamBefore">
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_checkout_limit" class="font_normal_body ">校检年限</label>
@@ -199,6 +199,12 @@
         <p class="bg-info text-center" style="padding: 8px;margin: 8px">气表型号</p>
         <add-gas-model :data="gasmessage" :modelvalid.sync="modelvalid" v-on:toggle="getArrParam"
                        v-ref:addgasmodel></add-gas-model>
+        <add-gas-meter-init-param :alias="alias"
+                                  :show="meterInitParamShow"
+                                  :paramstring="gasmessage.f_init_param"
+                                  v-if="meterInitParamShow"
+                                  >
+        </add-gas-meter-init-param>
         <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
           <button type="button" class="button_search " @click="confirm()" :disabled='!($v.valid && modelvalid) '
                   v-if='isConfirm'>保存
@@ -206,6 +212,9 @@
           <button type="button" class="button_search " @click="modify()" :disabled='!($v.valid && modelvalid)'
                   v-if='isModify'>修改
           </button>
+          <button type="button" class="button_search " v-if="permission('设置气表初始参数')"
+                  @click="meterInitParamClick()">设置气表初始参数
+          </button>
           <button type="button" class="button_search " @click="delMeter()" v-if='data.counts===0 && isModify'>删除
           </button>
           <button type="button" class="button_clear" @click="cancel()">取消</button>
@@ -254,10 +263,13 @@ export default {
         f_is_step: [],
         f_meterverification: '',
         f_meternumber_len: '',
+        f_init_param: '',
         f_dynamic_expire: ''
       },
+      alias: '',
       modelvalid: false, // 验证型号
       colletype: false,
+      meterInitParamShow: false,
       // 默认分公司显示
       defaultOrg: [],
       // 记录使用改气表的分公司
@@ -302,7 +314,36 @@ export default {
     console.log(4)
     this.judgeInitValue(this.data)
   },
+  events: {
+    'init-param-cancel' () {
+      this.meterInitParamShow = false
+      this.alias = ''
+    },
+    'init-param-confirm' (val) {
+      this.gasmessage.f_init_param = val
+      this.meterInitParamShow = false
+      this.alias = ''
+    }
+  },
   methods: {
+    permission (name) {
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      }
+      return true
+    },
+    meterInitParamClick () {
+      if (this.gasmessage.f_meter_type[0] !== '物联网表') {
+        this.$showMessage('只有物联网表才可以设置气表初始参数！！！', ['confirm'])
+        return
+      }
+      if (!this.gasmessage.f_alias) {
+        this.$showMessage('请输入气表别名！！！', ['confirm'])
+        return
+      }
+      this.alias = this.gasmessage.f_alias
+      this.meterInitParamShow = true
+    },
     getArrParam () {
       this.addGasModelArray = this.$refs.addgasmodel.addGasModelArr
       for (var i = 0; i < this.addGasModelArray.length; i++) {

package/src/components/revenue/comprehen/gasbrand/AddGasMeterInitParam.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="show" v-ref:modal large backdrop="false" width="80%">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">气表初始参数</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row">
+              <div v-for="data in meterInitParam" style="height: auto">
+                <div class="col-sm-6 form-group" style="height: auto" v-for="param in data.params" >
+                  <div class="col-sm-4" :class="[!row[param.title] ? 'has-error' : '']">
+                    <label class="font_normal_body" style="text-align:left">{{ param.name }}：</label>
+                    <p class="glyphicon glyphicon-info-sign" style="margin-top:4%;color:#4a7cae"
+                       :title="param.remark" ></p>
+                  </div>
+                  <div class="col-sm-8" v-if="param.type!=='option'"  :class="[!row[param.title] ? 'has-error' : '']">
+                    <input :type="param.type"
+                           v-model="row[param.title]"
+                           :value.sync="row[param.title]"
+                           style="width:70%"
+                           placeholder=""
+                           class="input_search">
+                  </div>
+                  <div class="col-sm-8" v-if="param.type==='option'"  :class="[!row[param.title] ? 'has-error' : '']">
+                    <v-select
+                      :placeholder='param.name'
+                      :value.sync="row[param.title]"
+                      style="width:70%"
+                      width="70%"
+                      :multiple="param.multiple ? param.multiple : false"
+                      v-model="row[param.title]"
+                      :options='param.params'
+                      :close-on-select="param.multiple ? param.multiple == true ? false : true :true"
+                    >
+                    </v-select>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_search btn-gn" @click="confirm">确认</button>
+        <button type="button" class="button_clear btn-gn" @click="cancel">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '限购配置',
+  data () {
+    return {
+      meterInitParam: [{}],
+      row: {},
+    }
+  },
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+    alias: {
+      type: String,
+      default: ''
+    },
+    paramstring: {
+      type: String,
+      default: ''
+    }
+  },
+  ready () {
+    this.getInitMeterParam()
+    if (this.paramstring) {
+      this.row = JSON.parse(this.paramstring)
+    }
+  },
+  methods: {
+    async getInitMeterParam () {
+      this.meterInitParam = [{}]
+      try {
+        let data = {
+          f_alias: this.alias
+        }
+        let http = new HttpResetClass()
+        let res = await http.load('POST', '/webmeter/rs/logic/getOACallbackParamsByGasBrand',
+          { data: data }, {resolveMsg: null, rejectMsg: null})
+        console.log(JSON.stringify(res))
+        if (res.data) {
+          this.meterInitParam = res.data
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async confirm () {
+      let hasError = false
+      let yaError = false
+      let hasStr = ''
+      let yzStr = ''
+      for (let param of this.meterInitParam) {
+        for (let subparam of param.params) {
+          let value = this.row[subparam.title]
+          if (value) {
+            if (subparam.type === 'number') {
+              if (value < parseFloat(subparam.min) || value > parseFloat(subparam.max)) {
+                yaError = true
+                console.log(subparam.name)
+                yzStr = yzStr + subparam.name + ' '
+              }
+            }
+            if (Object.prototype.toString.call(value) === '[object Array]') {
+              if (!value[0]) {
+                hasError = true
+                hasStr = hasStr + subparam.name + '  '
+              }
+            }
+          } else {
+            hasError = true
+            hasStr = hasStr + subparam.name + '  '
+          }
+        }
+      }
+      if (hasError) {
+        this.$showMessage(`${hasStr}表单项没有填写，请填写完所有的表单项再点击确认！！！`, ['confirm'])
+        return
+      }
+      if (yaError) {
+        this.$showMessage(`${yzStr}表单项格式错误，请悬浮到表单标签右侧的图标，按照悬浮文字提供的格式来填写表单项！！！`, ['confirm'])
+        return
+      }
+      let meterInitParam = JSON.stringify(this.row, function (key, value) {
+        if (Array.isArray(value) && value.length === 1) {
+          // 对于长度为1的数组，转换为字符串
+          return value[0].toString()
+        }
+        return value
+      })
+      this.$dispatch('init-param-confirm', meterInitParam)
+    },
+    cancel () {
+      this.$dispatch('init-param-cancel')
+    }
+  }
+}
+</script>

package/src/filiale/gaomi/plugins/LogicService.js

@@ -184,6 +184,7 @@ let LogicService = {
       f_overdr_lines: model.f_overdr_lines ? model.f_overdr_lines : 0,
       f_meter_limit: model.f_meter_limit ? model.f_meter_limit : 0,
       f_checkout_limit: model.f_checkout_limit ? model.f_checkout_limit : 0,
+      f_init_param: model.f_init_param ? model.f_init_param : '',
       f_alias: model.f_alias,
       f_isdecimal: model.f_isdecimal,
       f_collection_type: model.f_collection_type,

package/src/sale.js

@@ -627,6 +627,8 @@ export default function () {
   // 额外参数管理
   Vue.component('parames', (resolve) => { require(['./components/revenue/comprehen/gasbrand/Parames'], resolve) })
   Vue.component('add-json-parameter', (resolve) => { require(['./components/revenue/comprehen/gasbrand/AddJsonParameter'], resolve) })
+  // 设置气表初始化参数
+  Vue.component('add-gas-meter-init-param', (resolve) => { require(['./components/revenue/comprehen/gasbrand/AddGasMeterInitParam'], resolve) })
 
   /** ****************************短信管理**********************************************************/
   // 用户欠费记录查询，生成短信模板