sale-client 3.5.37 → 3.5.39

package/src/components/webMeter/paramSaveNew/ParamSetDefault.vue

@@ -1,13 +1,13 @@
 <template>
   <div id="unit" class="flex-row">
     <div class="flex basic-main" style="width:auto;">
-      <param-set-default-list></param-set-default-list>
+      <param-set-default-list v-ref:defaultlist></param-set-default-list>
     </div>
     <div class="flex binary-right" style="flex:1; ">
       <work-busy :is-busy="seaching"></work-busy>
       <div class="row form-horizontal select-overspread container-fluid auto" partial>
         <div novalidate class="form-inline auto" partial>
-          <div class="col-sm-5">
+          <div class="col-sm-8">
             <label class="font_normal_body">选择要设置参数的表具</label>
             <v-select
               placeholder='气表品牌'
@@ -33,8 +33,9 @@
               <span partial>
                 {{ row.data.name }}
                  <span style="float: right">
+                   {{row.data.default_value ? `当前默认值为：${row.data.default_value}` : ''}}
                   <button class="button_spacing button_clear" v-if="!row.data.children"
-                          @click.stop="$parent.$parent.modifyRes(row.data)">修改默认值</button>
+                          @click.stop="$parent.$parent.modifyRes(row.data,row.parent.data.name)">修改默认值</button>
                 </span>
               </span>
               </tree-grid-item>
@@ -43,23 +44,56 @@
         </tree-grid>
       </div>
     </div>
-      <modal :show.sync="showDefault" title="修改默认值" v-ref:modal large backdrop="false">
-        <article slot="modal-body" class="modal-body">
-         <span> {{row.remark}}</span>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
+    <modal :show.sync="showDefault" title="修改默认值" v-ref:modal  backdrop="false" @modal-close="setClose">
+      <article slot="modal-body" class="modal-body">
+        <div class="col-sm-12" style="height: auto">
+          <div class="col-sm-4">
+            <label class="font_normal_body" style="text-align:right;float:right">{{ row.name }}：</label>
+          </div>
+          <div class="col-sm-8" v-if="row.type!=='option'">
+            <input :type="row.type" v-model="paramSetVal" :value.sync="paramSetVal" style="width:70%" placeholder=""
+                   class="input_search">
+          </div>
+          <div class="col-sm-8" v-if="row.type==='option'">
+            <v-select
+              :placeholder='row.name'
+              :value.sync="paramSetVal"
+              style="width:70%"
+              width="70%"
+              :value-single="true"
+              v-model="paramSetVal"
+              :options='row.params'
+              close-on-select
+            >
+            </v-select>
+          </div>
+        </div>
+        <center>
+          <span> {{ row.remark }}</span>
+        </center>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='setConfirm' :disabled="!paramSetVal">确认</button>
+        <button type="button" class="btn btn-default" @click='setClose'>取消</button>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
 import ParamSetDefaultList from './ParamSetDefaultList'
 
-let handleTree = function (data) {
+let handleTree = function (data, defaultData) {
   return data.map(item => {
-    let children = item.params.map(item1 => {
-      delete item1['size']
-      return item1
+    let children = item.params.map(c => {
+      for (let i = 0; i < defaultData.length; i++) {
+        if (c.name === defaultData[i].f_param_name && item.name === defaultData[i].f_group_name && defaultData[i].f_param_title === c.title) {
+          c.default_value = defaultData[i].f_param_value
+          c.default_id = defaultData[i].default_id
+          break
+        }
+      }
+      delete c['size']
+      return c
     })
     return {label: item.name, name: item.name, value: item.name, children: children}
   })
@@ -89,25 +123,68 @@ export default {
       quanxian: this.$login.r,
       f_gasbrand_id: '',
       showDefault: '',
-      row: {}
+      row: {},
+      groupName: '',
+      paramSetVal: ''
     }
   },
   ready () {
     initGen(this)
   },
   methods: {
+    setConfirm () {
+      let data = {
+        f_gasbrand_id: this.f_gasbrand_id,
+        f_group_name: this.groupName,
+        f_param_name: this.row.name,
+        f_param_title: this.row.title,
+        f_new_value: this.paramSetVal,
+        f_param_value: this.paramSetVal,
+        f_old_value: this.row.default_value,
+        default_id: this.row.default_id,
+        f_describe: `${this.$login.f.name}将 ${this.row.name} 默认值设置为 ${this.paramSetVal}`,
+        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
+      }
+      this.$resetpost('/rs/logic/setDefaultValue', data, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then(() => {
+        this.searchData()
+        this.setClose()
+      })
+    },
+    setClose () {
+      this.row = {}
+      this.paramSetVal = ''
+      this.groupName = ''
+      this.showDefault = false
+    },
     async searchData () {
       this.seaching = true
-      this.$resetpost('webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: this.f_gasbrand_id}}, {resolveMsg: null, rejectMsg: null}).then(({data}) => {
-        this.model = handleTree(data)
+      this.$resetpost('webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: this.f_gasbrand_id}}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then(async ({data}) => {
+        let allDefaultValue = await this.$resetpost('/rs/sql/getAllDefaultValues', {data: {gasBrandId: this.f_gasbrand_id}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        this.model = handleTree(data, allDefaultValue.data)
+        this.$refs.defaultlist.search()
       })
       this.seaching = false
     },
     // 修改资源
-    modifyRes (obj) {
-      console.log(obj)
+    modifyRes (obj, groupName) {
       this.row = obj
-      this.row.remark = `描述信息：${obj.max ? `最大值为${obj.max};` : ''}${obj.max ? `最小值为${obj.min};` : ''}`
+      this.paramSetVal = ''
+      this.groupName = groupName
+      this.row.remark = `描述信息：${obj.default_value ? `当前默认值为：${obj.default_value}；` : ''} ${obj.max ? `最大值为${obj.max};` : ''}${obj.max ? `最小值为${obj.min};${obj.remark}` : obj.remark}`
       this.showDefault = true
     },
     async confirm () {
@@ -119,10 +196,7 @@ export default {
   watch: {
     'f_gasbrand_id' (newVal) {
       if (newVal) {
-        this.$resetpost('webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: this.f_gasbrand_id}}, {resolveMsg: null, rejectMsg: null}).then(({data}) => {
-          this.model = handleTree(data)
-        }
-        )
+        this.searchData()
       }
     }
   },

package/src/components/webMeter/paramSaveNew/ParamSetDefaultList.vue

@@ -9,11 +9,12 @@
       <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.row">
         <template partial='head'>
           <tr>
-            <th style="white-space: nowrap;" colspan="6">参数维护记录</th>
+            <th style="white-space: nowrap;" colspan="7">参数维护记录</th>
           </tr>
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">操作描述</th>
+            <th style="white-space: nowrap;">操作时间</th>
             <th style="white-space: nowrap;">参数组别</th>
             <th style="white-space: nowrap;">参数名称</th>
             <th style="white-space: nowrap;">参数旧值</th>
@@ -22,11 +23,12 @@
         </template>
         <template partial='body'>
           <td style="text-align: center;">{{ $index + 1 }}</td>
-          <td style="text-align: center;">{{ $index + 1 }}</td>
-          <td style="text-align: center;">{{ $index + 1 }}</td>
-          <td style="text-align: center;">{{ $index + 1 }}</td>
-          <td style="text-align: center;">{{ $index + 1 }}</td>
-          <td style="text-align: center;">{{ $index + 1 }}</td>
+          <td style="text-align: center;">{{ row.f_describe }}</td>
+          <td style="text-align: center;">{{ row.f_operate_date }}</td>
+          <td style="text-align: center;">{{ row.f_group_name }}</td>
+          <td style="text-align: center;">{{ row.f_param_name }}</td>
+          <td style="text-align: center;">{{ row.f_old_value }}</td>
+          <td style="text-align: center;">{{ row.f_new_value }}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -43,12 +45,20 @@ export default {
   title: 'ParamSetDefaultList',
   data () {
     return {
-      model: new PagedList('rs/sql/sale_getUser', 30, {orderitem: '"' + this.orderitem + ' DESC"'})
+      model: new PagedList('rs/sql/getAllDefaultRecord', 30, {})
     }
   },
   ready () {
+    this.search()
+  },
+  methods: {
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch (args) {
+      this.model.search(args.condition, args.model)
+    }
   },
-  methods: {},
   watch: {},
   computed: {}
 }

package/src/components/webMeter/paramSaveNew/ParamSetForm.vue

@@ -20,28 +20,36 @@
         -----{{row.overdueMessageValue}}
         <input :type="text" v-model="row.overdueMessageValue" :value.sync="row.overdueMessageValue" style="width:70%" placeholder=""  class="input_search">
       </div>-->
-      <div v-for="data in newmeterinfo" style="height: auto">
-        <div class="col-sm-12"  style="height: auto" v-if="data.name===paramtype" v-for="param in data.params">
+      <div v-for="(index,data) in newmeterinfo" style="height: auto">
+        <div class="col-sm-12"  style="height: auto" v-if="data.name===paramtype" v-for="(param_index,param) in data.params">
           <div class="col-sm-4">
             <label class="font_normal_body" style="text-align:left">{{param.name}}：</label>
-            <p class="glyphicon glyphicon-info-sign" style="margin-top:7%;color:#4a7cae" :title="param.remark"></p>
+            <p class="glyphicon glyphicon-info-sign" style="margin-top:5%;color:#4a7cae" :title="param.remark"></p>
           </div>
-          <div class="col-sm-8" v-if="param.type!=='option'">
-            <input :type="param.type" v-model="row[param.title]" :value.sync="row[param.title]" style="width:70%" placeholder=""  class="input_search">
+          <div class="col-sm-4" >
+            <label class="font_normal_body" style="text-align:left">{{param.default_value ? `当前默认值为：${param.default_value}；` : '当前未设置默认值'}}</label>
           </div>
-          <div class="col-sm-8" v-if="param.type==='option'">
-            <v-select
-              :placeholder='param.name'
-              :value.sync="row[param.title]"
-              style="width:70%"
-              width="70%"
-              :value-single="true"
-              v-model="row[param.title]"
-              :options='param.params'
-              close-on-select
-            >
-            </v-select>
+          <div class="col-sm-4" >
+            <radio-btn v-model="param.isenbale" :value.sync="param.isenbale" :disabled="!param.default_value"></radio-btn>
+<!--            <label>启用<input type="radio" v-model="param.isenbale"  @click="reMeterinfo(index,param_index,data.params)" :disabled="!param.default_value" value="启用"/></label>-->
+<!--            <label>保持不变<input type="radio" v-model="param.isenbale" @click="reMeterinfo(index,param_index,data.params)"  value="保持不变"/></label>-->
           </div>
+<!--          <div class="col-sm-8" v-if="param.type!=='option'">-->
+<!--            <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'">-->
+<!--            <v-select-->
+<!--              :placeholder='param.name'-->
+<!--              :value.sync="row[param.title]"-->
+<!--              style="width:70%"-->
+<!--              width="70%"-->
+<!--              :value-single="true"-->
+<!--              v-model="row[param.title]"-->
+<!--              :options='param.params'-->
+<!--              close-on-select-->
+<!--            >-->
+<!--            </v-select>-->
+<!--          </div>-->
         </div>
       </div>
       <div class="form-group col-sm-4" style="float:right;white-space: nowrap;width: auto">
@@ -118,11 +126,11 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
-
+  import RadioBtn from './RadioBtn'
 export default {
     title: '参数设置',
     props: ['user', 'checked1', 'gasbrandid', 'condition'],
-
+    components: {RadioBtn},
     data () {
       return {
         newmeterinfo: [{}],
@@ -131,7 +139,8 @@ export default {
         paramtypes: [],
         paramtype: '',
         param: {},
-        history: []
+        history: [],
+        isenbale: false
       }
     },
     ready () {
@@ -183,18 +192,13 @@ export default {
         for (let i = 0; i < this.newmeterinfo.length; i++) {
           for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
             if (this.newmeterinfo[i].name === this.paramtype) {
-              for (let key in this.row) {
-                if (key === this.newmeterinfo[i].params[j].title) {
-                  let data = {}
-                  data.param_group = this.newmeterinfo[i].name
-                  data.param_name = this.newmeterinfo[i].params[j].name
-                  data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
-                  data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
-                  data.param_lname = this.newmeterinfo[i].params[j].title
-                  if (this.row[key]) {
-                    params.push(data)
-                  }
-                }
+              if (this.newmeterinfo[i].params[j].isenbale) {
+                let data = {}
+                data.param_value = data.param_content = this.newmeterinfo[i].params[j].default_value
+                data.param_group = this.newmeterinfo[i].name
+                data.param_name = this.newmeterinfo[i].params[j].name
+                data.param_lname = this.newmeterinfo[i].params[j].title
+                params.push(data)
               }
             }
           }
@@ -232,19 +236,13 @@ export default {
         for (let i = 0; i < this.newmeterinfo.length; i++) {
           for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
             if (this.newmeterinfo[i].name === this.paramtype) {
-              for (let key in this.row) {
-                if (key === this.newmeterinfo[i].params[j].title) {
-                  let data = {}
-                  data.param_group = this.newmeterinfo[i].name
-                  data.param_name = this.newmeterinfo[i].params[j].name
-                  data.tag = this.newmeterinfo[i].params[j].tag
-                  data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
-                  data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
-                  data.param_lname = this.newmeterinfo[i].params[j].title
-                  if (this.row[key]) {
-                    params.push(data)
-                  }
-                }
+              if (this.newmeterinfo[i].params[j].isenbale) {
+                let data = {}
+                data.param_value = data.param_content = this.newmeterinfo[i].params[j].default_value
+                data.param_group = this.newmeterinfo[i].name
+                data.param_name = this.newmeterinfo[i].params[j].name
+                data.param_lname = this.newmeterinfo[i].params[j].title
+                params.push(data)
               }
             }
           }
@@ -283,10 +281,22 @@ export default {
         this.newmeterinfo = [{}]
 
         let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: '参数已加载', rejectMsg: null})
+        let allDefaultValue = await this.$resetpost('/rs/sql/getAllDefaultValues', {data: {gasBrandId: val}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
         this.newmeterinfo = res.data
         for (let i = 0; i < this.newmeterinfo.length; i++) {
           this.paramtypes.push({label: this.newmeterinfo[i].name, value: this.newmeterinfo[i].name})
           for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
+            this.newmeterinfo[i].params[j].isenbale = false
+            for (let n = 0; n < allDefaultValue.data.length; n++) {
+              if (this.newmeterinfo[i].params[j].name === allDefaultValue.data[n].f_param_name && this.newmeterinfo[i].name === allDefaultValue.data[n].f_group_name && allDefaultValue.data[n].f_param_title === this.newmeterinfo[i].params[j].title) {
+                this.newmeterinfo[i].params[j].default_value = allDefaultValue.data[i].f_param_value
+                this.newmeterinfo[i].params[j].default_id = allDefaultValue.data[i].default_id
+                break
+              }
+            }
             if (this.newmeterinfo[i].params[j].params instanceof Array) {
               for (let k = 0; k < this.newmeterinfo[i].params[j].params.length; k++) {
                 this.newmeterinfo[i].params[j].params[k].value = {

package/src/components/webMeter/paramSaveNew/RadioBtn.vue

@@ -0,0 +1,30 @@
+<template>
+  <label>启用<input type="radio" v-model="value"  @input="onChange(true)" :disabled="disabled"  :value="true"/></label>
+  <label>保持不变<input type="radio" v-model="value" @click="onChange(false)"  :value="false"/></label>
+</template>
+
+<script>
+export default {
+  name: 'RadioBtn',
+  title: 'RadioBtn',
+  props: ['value', 'disabled'],
+  data () {
+    return {
+
+    }
+  },
+  model: {
+    prop: 'value'
+  },
+  methods: {
+    onChange (e) {
+      this.$emit('input', e)
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/guangxi/CardService.js

@@ -535,7 +535,7 @@ let offlineWriteGen = async function (row) {
         throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
       } else {
         // 更新 上次写卡气量
-        await getParamGen(row.f_userfiles_id, param.ql)
+        await modify(row.f_userfiles_id, param.ql)
         // 写卡成功 更新收费记录
         let update = {
           id: row.unWriteSell[0].id,
@@ -1006,8 +1006,8 @@ let sendCardSaleGasGenremanent = async function (model, row) {
         await modify(row.f_userfiles_id, params.ql)
         // 写卡成功
         // 更新卡密码
-        row.version = result.data.version - 1,
-          await Vue.CommonService.updatePassword(row, cardRes)
+        row.version = result.data.version - 1
+        await Vue.CommonService.updatePassword(row, cardRes)
         Vue.showAlert('补气购气成功', 'success', 2000)
         return result
       }