sale-client 3.6.568 → 3.6.569

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Apr 14 10:14:01 CST 2025
+#Wed Jun 25 17:54:33 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/components/charge/business/refund/machineRefund.vue

@@ -164,7 +164,7 @@
             f_user_id: this.data.f_user_id,
             f_userfiles_id: this.data.f_userfiles_id,
             version: this.data.version,
-            f_refund_fee: (this.model.f_refund_fee - 0),
+            f_refund_fee: this.model.f_refund_fee,
             f_comments: this.model.f_comments,
             f_payment: this.model.f_payment[0],
             f_print: this.model.f_print[0],

package/src/filiale/bayan/ChargeList.vue

@@ -129,7 +129,15 @@
                           condition="i.f_user_level = '{}'"
                           close-on-select style="width: 60%"></v-select>
               </div>
-
+              <div class="form-group col-sm-3" >
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid='$parent.$parent.curorgid'
+                            @res-select="$parent.$parent.getorg"
+                            class="select select_list"
+                            restype='organization'
+                            style="width: 60%">
+                </res-select>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">卡&emsp;&emsp;号</label>
                 <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
@@ -844,7 +852,9 @@ let cardBtnGen = async function (self, val) {
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-
+        if (this.f_orgid) {
+          args.condition = `u.f_filialeid in ${this.f_orgid} and ${args.condition}`
+        }
         this.excelCondition = args.condition
         args.condition = `${args.condition}`
         if (this.defbtn === '发卡售气') {

package/src/filiale/bayan/ChargeManage.vue

@@ -106,7 +106,7 @@ export default {
                     // 获取用户信息
                     getUser = await this.$resetpost('rs/sql/sale_getUser', {
                       data: {
-                        condition: `gb.f_meter_type in ('机表','物联网表') and i.f_userinfo_code='${res.data.CardID}'`,
+                        condition: `u.f_filialeid in ${forgid}  and gb.f_meter_type in ('机表','物联网表') and i.f_userinfo_code='${res.data.CardID}'`,
                         orderitem: `f_userinfo_id`
                       }
                     }, {resolveMsg: null, rejectMsg: '读卡失败'})

package/src/filiale/bayan/UploadIdCard.vue

@@ -220,11 +220,11 @@ export default {
           xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
         }
       }
-      xhr.send(form)
       if (Vue.$login && Vue.$login.jwt) {
         xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
         xhr.setRequestHeader('Token', Vue.$login.jwt)
       }
+      xhr.send(form)
       setTimeout(() => {
         this.load(this)
       }, 5000)

package/src/filiale/bayan/machineRefund.vue

@@ -0,0 +1,234 @@
+<template>
+    <div class="auto">
+        <validator name='v'>
+            <form novalidate class="form-horizontal">
+                <div class="row">
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+
+                        <v-select v-model="f_payment"
+                                  placeholder='请选择'
+                                  style="width:60%"
+                                  :value.sync="model.f_payment"
+                                  :options='paytype'
+                                  close-on-select clear-button></v-select>
+
+                    </div>
+                    <div class="col-sm-4 form-group">
+                        <label for="f_print" class="font_normal_body">打印格式</label>
+
+                        <v-select id="print"
+                                  v-model="f_print"
+                                  style="width:60%"
+                                  placeholder='请选择'
+                                  :value.sync="model.f_print"
+                                  :options='printstyle'
+                                  close-on-select clear-button>
+                        </v-select>
+                    </div>
+                  <div class="col-sm-4 form-group">
+                    <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+                    <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+                    <v-select :value.sync="model.f_add_gas" value-single
+                              :options='addGas' placeholder='请选择'
+                              selected="是否计入累购"
+                              style="width:60%"
+                              close-on-select></v-select>
+                  </div>
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body">剩余金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
+                    </div>
+                </div>
+
+                <div class="row">
+
+
+                    <div class="col-sm-8">
+                        <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+                        <input class="input_search" style="width:80%"  v-model="model.f_comments">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="!config.overBalance"
+                         :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">退费金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                               v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance, "<=" ]}' placeholder="退费金额">
+                    </div>
+                  <div class="col-sm-4 form-group" v-if="config.overBalance"
+                       :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+                    <label class="font_normal_body">退费金额</label>
+                    <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                           v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+                  </div>
+                </div>
+            </form>
+            <div style="text-align:right;">
+                <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+                <button class="button_clear btn-gn" @click="clean()">取消</button>
+            </div>
+        </validator>
+        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+        <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+        <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
+    </div>
+
+    <upload :blodid="data.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+    let readyGen = async function (self) {
+      await self.$getConfig(self, 'MachineTRefund')
+      console.log('机表退费config', self.config)
+        // 默认打印格式
+      self.blodid = self.data.f_userinfo_id
+      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+      self.model.f_payment = [self.config.payment]
+
+      self.model.f_use_type = self.config.billType
+      self.model.f_bill_type = self.model.f_print
+      self.hasValidateBill = self.config.hasBillManage
+    }
+
+    export default {
+      title: '机表退费',
+      data () {
+        return {
+          config: {
+            showupload: false, // 默认不上传附件
+            hasPrint: false,  // 默认打票
+            hasBillManage: false,  // 默认不启用发票管理
+            overBalance: false,   // 为true时退费金额可以大于余额
+            printType: '普通收据', // 收据/电子票/专用发票/国税发票
+            payment: '现金缴费',
+            billType: '燃气费'
+          },
+          model: {
+            f_refund_fee: '',
+            f_add_gas: '计入',
+            f_comments: '',
+            f_payment: '',
+            f_print: ''
+          },
+          addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
+          blodid: '',
+          hasValidateBill: false,
+          randomBusinessId: '',
+          resid: [],  // 存放新增的f_files表中id
+          validateOk: false,
+
+          printModel: {},
+          print: false,
+          billUrl: '',
+          billData: {
+            url: 'rs/report/refund_sell',
+            bill: ''
+          },
+
+                // 下拉框值
+          paytype: this.$appdata.getParam('付款方式'),
+          printstyle: this.$appdata.getParam('打印格式')
+        }
+      },
+      props: ['data'],
+      ready () {
+            /* if (this.data.f_billing === '按气量') {
+                this.$showAlert('按气量缴费的机表退费功能尚未开放！！', 'warning', 3000)
+                this.$dispatch('refresh')
+            } else { */
+        readyGen(this)
+           /* } */
+        this.getRandomId()
+      },
+      events: {
+        // 删除Resid数组元素
+        'delResid' (val) {
+          this.resid.$remove({id: val, f_biobid: ''})
+          // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+        },
+        // 增加Resid数组元素
+        'resid' (val) {
+          this.resid.push({id: val, f_biobid: ''})
+        }
+      },
+      methods: {
+        getRandomId () {
+          this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+            let res = Math.random() * 16 | 0
+            let v = c == 'x' ? res : (res & 0x3 | 0x8)
+            return v.toString(16)
+          })
+        },
+        async confirm () {
+          let param = {
+            f_user_id: this.data.f_user_id,
+            f_userfiles_id: this.data.f_userfiles_id,
+            version: this.data.version,
+            f_refund_fee: (this.model.f_refund_fee - 0),
+            f_comments: this.model.f_comments,
+            f_payment: this.model.f_payment[0],
+            f_print: this.model.f_print[0],
+            f_price_id: this.data.f_price_id,
+            f_add_gas: this.model.f_add_gas,
+            f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
+            f_stairprice_id: this.data.f_stairprice_id,
+            operInfo: {
+              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
+            }
+          }
+          if (this.model.f_add_gas !== '计入') {
+            param.f_total_fee = this.data.f_total_fee
+          }
+          let res = await this.$resetpost('rs/logic/machineRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+          console.log('机表退费返回的数据==========>', res)
+          let param1 = []
+          for (let row of this.resid) {
+            param1.push({id: row.id})
+          }
+          let data = {
+            param: param1,
+            f_blobid: res.data.id
+          }
+          await this.$resetpost('rs/logic/updatefiles', data)
+          if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
+            console.log('this.config.hasBillManage', this.config.hasBillManage)
+            if (this.config.hasBillManage) {
+                        // 启用发票管理，获取票据管理中的票号并存储记录
+              this.printModel.id = res.data.id
+              this.printModel.f_bill_type = '退费'
+              this.printModel.f_bill_style = this.model.f_print[0]
+                        // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            } else {
+              this.printModel.id = res.data.id
+                        // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            }
+          } else if (this.config.printType === '国税发票') {
+                    // TODO
+            this.$dispatch('success')
+          } else if (this.config.printType === '电子发票') {
+                    // TODO
+            this.$dispatch('success')
+          } else {
+            this.$dispatch('success')
+          }
+        },
+        clean () {
+          this.$dispatch('refresh')
+        },
+        printok () {
+          this.$dispatch('success')
+        },
+        validateBill (val) {
+          this.validateOk = !val.isOk
+          this.billData.bill = val.bill
+        }
+      }
+    }
+</script>

package/src/filiale/qianneng/ParamSetForm.vue

@@ -0,0 +1,406 @@
+<template>
+  <div class="binary-left" style="width:48%">
+    <div class="row auto">
+      <div class="col-sm-4">
+        <label class="font_normal_body" style="text-align:left">参数类型</label>
+      </div>
+      <div class="col-sm-8">
+        <v-select
+          placeholder="请选择参数类型"
+          :value.sync="paramtype"
+          style="width:40%"
+          width="40%"
+          :value-single="true"
+          v-model="paramtype"
+          :options='paramtypes'
+          close-on-select
+        ></v-select>
+      </div>
+      <!--<div class="col-sm-8" >
+        -&#45;&#45;&#45;&#45;{{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 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>
+          </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%"
+              :multiple="param.multiple ? param.multiple : false"
+              :value-single="param.multiple ? param.multiple == true ? false : true : true"
+              :close-on-select="param.multiple ? param.multiple == true ? false : true :true"
+              v-model="row[param.title]"
+              :options='param.params'
+            >
+            </v-select>
+          </div>
+        </div>
+      </div>
+      <div class="form-group col-sm-4" style="float:right;white-space: nowrap;width: auto">
+        <button class="button_search" @click="setParam()" v-if="paramtype && user ">提交</button>
+        <button class="button_search" @click="setParamDefault()" v-if="paramtype && !user">提交</button>
+      </div>
+    </div>
+  </div>
+  <div class="binary-right" style="width:48%;overflow-y: auto;max-height:1000px;" v-if="user">
+    <div class="row list_area table_sy">
+      <h4 style="display:inline-block;"><font style="font-weight: bold">已选中客户数:</font>{{user.length}}</h4>
+      <div  v-if="condition" class="row auto">
+        <h4 style="display:inline-block;"><font style="font-weight: bold">查询条件:</font>{{condition}}</h4>
+      </div>
+      <table class="table table-bordered table-striped table-hover" style="margin-top: 15px" id="table1" >
+        <thead>
+        <th style="text-align:center"><nobr>客户编号</nobr></th>
+        <th style="text-align:center"><nobr>客户姓名</nobr></th>
+        <th style="text-align:center"><nobr>客户类型</nobr></th>
+        <th style="text-align:center"><nobr>气表品牌</nobr></th>
+        </thead>
+        <tbody>
+        <tr v-for="row in user">
+          <td><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td><nobr>{{row.f_user_name}}</nobr></td>
+          <td><nobr>{{row.f_user_type}}</nobr></td>
+          <td><nobr>{{row.f_meter_brand}}</nobr></td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="binary-right flex-row" style="width:80%;overflow-y: auto;max-height:1000px;" v-if="!user">
+    <div class="binary-left" style="width:24% ;text-align:center;align-content: center;">
+      <div class="row">
+        <div v-for="data in newmeterinfo" style="height: auto">
+          <ul class="nav nav-tabs col-sm-12" >
+            <li class="active"><a>{{data.name}}</a></li>
+          </ul>
+          <div class="col-sm-12"  style="height: auto" v-for="p in data.params">
+           {{p.name}}：{{param[p.title]}}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="binary-right" style="width:74%;overflow-y: auto;max-height:1000px;">
+      <div class="row list_area table_sy">
+        <table class="table table-bordered table-striped table-hover" id="table1" >
+          <thead>
+          <th style="text-align:center"><nobr>参数类型</nobr></th>
+          <th style="text-align:center"><nobr>参数名</nobr></th>
+          <th style="text-align:center"><nobr>旧参数值</nobr></th>
+          <th style="text-align:center"><nobr>新参数值</nobr></th>
+          <!--        <th style="text-align:center"><nobr>气表品牌</nobr></th>-->
+          </thead>
+          <tbody>
+          <tr v-for="row in history">
+            <td><nobr>{{row.f_param_group_name}}</nobr></td>
+            <td><nobr>{{row.f_param_name}}</nobr></td>
+            <td><nobr>{{row.oldvalue}}</nobr></td>
+            <td><nobr>{{row.f_param_value}}</nobr></td>
+
+            <!--          <td><nobr>{{row.f_user_type}}</nobr></td>-->
+            <!--          <td><nobr>{{row.f_meter_brand}}</nobr></td>-->
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import axios from 'axios'
+
+export default {
+    title: '参数设置',
+    props: ['user', 'checked1', 'gasbrandid', 'condition'],
+
+    data () {
+      return {
+        newmeterinfo: [{}],
+        row: {},
+        gasbrand: null,
+        paramtypes: [],
+        paramtype: '',
+        param: {},
+        history: []
+      }
+    },
+    ready () {
+
+    },
+    watch: {
+      param: {
+        handler: function (val) {
+          console.log('--------------param变了', val)
+        },
+        deep: true
+      },
+      'gasbrandid' (val) {
+        if (val[0]) {
+          this.refreshParam(val[0])
+        }
+      },
+      'paramtype' (val) {
+        console.log('改了paramtype！', val)
+        this.row = {}
+        if (val) {
+          for (let i = 0; i < this.newmeterinfo.length; i++) {
+            if (this.newmeterinfo[i].name == this.paramtype) {
+              const params = this.newmeterinfo[i].params
+              for (let j = 0; j < params.length; j++) {
+                const param = params[j]
+                if (param.data) {
+                  if (Array.isArray(param.data)) {
+                    this.$set(`row['${param.title}']`, [])
+                    for (let u = 0; u < param.data.length; u++) {
+                      for (let z = 0; z < param.params.length; z++) {
+                        if (param.data[u] == param.params[z].value.code) {
+                          this.row[param.title].push(param.params[z].value)
+                        }
+                      }
+                    }
+                  } else {
+                    this.$set(`row['${param.title}']`, param.data)
+                  }
+                }
+              }
+            }
+          }
+          console.log('this.row', this.row)
+          // if (this.user.length === 1) {
+          //   this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: this.user[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
+          //     this.row = {}
+          //     if (rat.data.length > 0) {
+          //       rat.data.forEach((item) => {
+          //         console.log('=============>this.paramtype', val)
+          //         console.log('=============>item', item.f_param_group_name)
+          //         if (val === item.f_param_group_name) {
+          //           this.$set('row.' + item.f_param_lname, item.f_param_value)
+          //         }
+          //       })
+          //       // let param = JSON.parse(rat.data[0].f_data)
+          //       // console.log(param)
+          //       // this.row= param
+          //     }
+          //   })
+          // }
+        }
+      }
+    },
+    methods: {
+      close () {
+        this.row = {}
+        this.$dispatch('close')
+      },
+      async setParamDefault () {
+        let params = []
+        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.tag = this.newmeterinfo[i].tag
+                  data.param_group = this.newmeterinfo[i].name
+                  data.param_name = this.newmeterinfo[i].params[j].name
+                  if (this.row[key]) {
+                    if (Array.isArray(this.row[key])) {
+                      let valueArr = []
+                      let contentArr = []
+                      this.row[key].forEach((item, index) => {
+                        valueArr.push(item.code)
+                        contentArr.push(item.content)
+                      })
+                      data.param_value = valueArr
+                      data.param_content = contentArr
+                    } else if (Object.prototype.toString.call(this.row[key]) === '[object Object]') {
+                      data.param_value = this.row[key].code
+                      data.param_content = this.row[key].content
+                    } else {
+                      data.param_value = this.row[key]
+                      data.param_content = this.row[key]
+                    }
+                  } else {
+                    data.param_value = null
+                    data.param_content = null
+                  }
+                  data.param_lname = this.newmeterinfo[i].params[j].title
+                  if (this.row[key]) {
+                    params.push(data)
+                  }
+                }
+              }
+            }
+          }
+        }
+        let param = {
+          condition: 'g.f_gasbrand_id = ' + this.gasbrandid[0],
+          switchCheckAll: this.checked1,
+          users: '',
+          params: params,
+          f_alias: this.gasbrand.f_alias,
+          columnName: '',
+          // inputter_name: this.$login.f.name,
+          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_gasbrand_id: this.gasbrandid[0]
+        }
+        console.log(param)
+        await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {rejectMsg: '批量保存失败', resolveMsg: '保存成功'})
+        this.row = null
+        this.$dispatch('clear')
+      },
+      async setParam () {
+        let user = []
+        let filesid = ''
+        this.user.forEach((item) => {
+          user.push(item.f_userfiles_id)
+          filesid += item.f_userfiles_id + ','
+        })
+        filesid = filesid.substr(0, filesid.length - 1)
+        let params = []
+        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].tag
+                  if (this.row[key]) {
+                    if (Array.isArray(this.row[key])) {
+                      let valueArr = []
+                      let contentArr = []
+                      this.row[key].forEach((item, index) => {
+                        valueArr.push(item.code)
+                        contentArr.push(item.content)
+                      })
+                      data.param_value = valueArr
+                      data.param_content = contentArr
+                    } else if (Object.prototype.toString.call(this.row[key]) === '[object Object]') {
+                      data.param_value = this.row[key].code
+                      data.param_content = this.row[key].content
+                    } else {
+                      data.param_value = this.row[key]
+                      data.param_content = this.row[key]
+                    }
+                  } else {
+                    data.param_value = null
+                    data.param_content = null
+                  }
+                  data.param_lname = this.newmeterinfo[i].params[j].title
+                  if (this.row[key]) {
+                    params.push(data)
+                  }
+                }
+              }
+            }
+          }
+        }
+        debugger
+        let param = {
+          condition: 'g.f_gasbrand_id = ' + this.gasbrandid[0] + ' and f.f_userfiles_id in (' + filesid + ')',
+          switchCheckAll: this.checked1,
+          users: user,
+          params: params,
+          f_alias: this.gasbrand.f_alias,
+          columnName: 'g.f_userfiles_id',
+          // inputter_name: this.$login.f.name,
+          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_gasbrand_id: this.gasbrandid[0]
+        }
+        console.log(param)
+        await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {rejectMsg: '批量保存失败', resolveMsg: '保存成功'})
+        this.row = null
+        this.$dispatch('clear')
+      },
+      async refreshParam (val) {
+        this.paramtypes = []
+        let temp = {
+          tablename: 't_gasbrand',
+          condition: `id=${val}`
+        }
+        await this.$resetpost('rs/sql/saleSingleTable', {data: temp}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.gasbrand = res.data[0]
+        })
+        this.newmeterinfo = [{}]
+        let res = await axios.post('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {timeout: 10 * 60 * 1000})
+        // let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: '参数已加载', 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++) {
+            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 = {
+                  id: this.newmeterinfo[i].params[j].params[k].label,
+                  code: this.newmeterinfo[i].params[j].params[k].value,
+                  content: this.newmeterinfo[i].params[j].params[k].label
+                }
+              }
+            }
+          }
+        }
+        this.$dispatch('showparam', true)
+      },
+      async getBrandParamsHistory () {
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/getBrandParamHistory', {
+          data: {
+            condition: `ga.f_gasbrand_id= ${this.gasbrandid}`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取参数历史信息信息失败'})
+        this.history = res.data
+        let rat = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_gasparammanage',
+            condition: `f_gasbrand_id= ${this.gasbrandid}`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取参数历史信息信息失败'})
+        if (rat.data.length > 0) {
+          rat.data.forEach((item) => {
+            if (!this.param[item.f_param_lname]) {
+              console.log(item.f_param_value, item.f_param_content)
+              if (item.f_param_value != item.f_param_content && item.f_param_content) {
+                item.f_param_value = item.f_param_content
+              }
+              console.log('参数取出来了---', item.f_param_lname)
+              this.$set(`param['${item.f_param_lname}']`, item.f_param_value)
+            }
+            // this.param[item.f_param_lname] = item.f_param_value
+          })
+        }
+        console.log('参数取出来了', this.param)
+      }
+    }
+  }
+</script>
+<style>
+  .btn-border {
+    border: none;
+    border-radius: 6px;
+  }
+</style>

package/src/filiale/qianneng/sale.js

@@ -119,4 +119,5 @@ export default function () {
   Vue.component('account-message-list', (resolve) => { require(['./revenue/sms/AccountMessageList.vue'], resolve) })
   // 付款码支付
   Vue.component('payment-code', (resolve) => { require(['./PaymentCode.vue'], resolve) })
+  Vue.component('param-set-form', (resolve) => { require(['./ParamSetForm'], resolve) })
 }

package/src/filiale/shaoguan/FilesManage/MeterinfoTest.vue

@@ -203,8 +203,9 @@
                    :value.sync="row.f_price_ratio"
                    v-validate:meternumber='{required: true }' placeholder='比率'>
           </div>
-          <div class="col-sm-4 form-group" >
-            <label for="f_scrap_date" class="font_normal_body">&ensp;检测日期</label>
+          <div class="col-sm-4 form-group" :class="[$m.f_scrap_date.required ? 'has-error' : '']">
+            <input type="text" v-model="row.f_scrap_date" v-show="false"  v-validate:f_scrap_date='{required: true }'>
+            <label for="f_scrap_date" class="font_normal_body">&ensp;*检测日期</label>
             <datepicker style="width:60%" id="ScrapDate" placeholder="检测日期" width='100%'
                         v-model="row.f_scrap_date"
                         :value.sync="row.f_scrap_date"

package/src/filiale/yuncheng/UploadIdCard.vue

@@ -193,11 +193,11 @@ export default {
           xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
         }
       }
-      xhr.send(form)
       if (Vue.$login && Vue.$login.jwt) {
         xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
         xhr.setRequestHeader('Token', Vue.$login.jwt)
       }
+      xhr.send(form)
       setTimeout(() => {
         this.load(this)
       }, 5000)