sale-client 3.5.23 → 3.5.26

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/package.json

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

package/src/components/charge/ChargeList.vue

@@ -326,11 +326,11 @@
    */
   import {HttpResetClass, PagedList} from 'vue-client'
   import DetailManage from './DetailManage'
-  import Vue from "vue";
+  import Vue from 'vue'
 
-  let cardBtnGen = async function (self, val) {
+let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
-
+    let getUser = null
     // 判断读卡是否需要卡密码
     console.log('读卡上的信息', self.cardInfo)
 
@@ -342,8 +342,32 @@
             self.readCardParam = self.model.rows[0].f_card_password
             self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(self.model.rows[0].f_card_password)
           } else {
-            self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
-            return
+            if (self.cardInfo.Factory == 'JiBiao' || self.cardInfo.Factory == 'JiChengADSystem') {
+              // 获取用户信息
+              getUser = await self.$resetpost('rs/sql/sale_getUser', {
+                data: {
+                  condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
+                  orderitem: `${self.orderitem} Desc`
+                }
+              }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+            } else {
+              // 获取用户信息
+              getUser = await self.$resetpost('rs/sql/sale_getUser', {
+                data: {
+                  condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+                  orderitem: `${self.orderitem} Desc`
+                }
+              }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+            }
+            if (getUser.data.length == 1 && getUser.data[0].f_alias === self.cardInfo.Factory) {
+              self.readCardParam = getUser.data[0].f_card_password
+              self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(getUser.data[0].f_card_password)
+            } else {
+              self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
+              return
+            }
           }
         }
       }
@@ -421,12 +445,12 @@
           let hasMatchingData = false
           getUser.data.forEach((res, index) => {
             if (self.model.rows[0].f_userfiles_id == res.f_userfiles_id) {
-            self.model.rows = [getUser.data[index]]
-            self.model.state = '正确'
-            hasMatchingData = true
-            self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
-          }
-        })
+              self.model.rows = [getUser.data[index]]
+              self.model.state = '正确'
+              hasMatchingData = true
+              self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
+            }
+          })
           if (!hasMatchingData) {
             self.model.rows = getUser.data
             self.model.pageIndex = 1
@@ -548,12 +572,12 @@
           let hasMatchingData = false
           getUser.data.forEach((res, index) => {
             if (self.model.rows[0].f_userfiles_id == res.f_userfiles_id) {
-            self.model.rows = [getUser.data[index]]
-            self.model.state = '正确'
-            hasMatchingData = true
-            self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
-          }
-        })
+              self.model.rows = [getUser.data[index]]
+              self.model.state = '正确'
+              hasMatchingData = true
+              self.$dispatch('dblclick', getUser.data[index], 0, self.cardInfo)
+            }
+          })
           if (!hasMatchingData) {
             self.model.rows = getUser.data
             self.model.pageIndex = 1
@@ -640,7 +664,7 @@
         // 读卡是否需要额外参数
         readCardNeedParam: false,
         readCardParam: {},
-      systemTimes: '',
+        systemTimes: '',
         userCode: '',
         userName: '',
         userAddress: '',
@@ -656,9 +680,9 @@
 
         // 流水记录显示
         recordModel: {rows: []},
-      clientWidth: document.body.clientWidth,
+        clientWidth: document.body.clientWidth,
         showCardError: false
-    }
+      }
     },
     props: {
       orderitem: {
@@ -681,7 +705,7 @@
       window.onresize = () => {
         return (() => {
           this.clientWidth = document.body.clientWidth
-      })()
+        })()
       }
     },
     methods: {
@@ -699,16 +723,16 @@
       clear () {
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
-      })
+        })
       },
       initQueryParam () {
         let arr = []
         this.$GetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
           temp.label = item.label
-        temp.value = item.value.f_meter_brand
-        arr.push(temp)
-      })
+          temp.value = item.value.f_meter_brand
+          arr.push(temp)
+        })
         this.meterbrand = [{label: '全部', value: ''}, ...arr]
       },
       search () {
@@ -738,32 +762,32 @@
       },
 
       async selfSearch (args) {
-    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 === '发卡售气') {
-      args.condition = `${args.condition} and f_whether_hairpin = '未发' and f_meter_classify like '%卡表%'`
-    }
-    this.isPager = true
-    this.criteriaShow = true
-    this.$parent.warningInfo=null
-    this.cardInfo = ''
-    if (!this.specialCondition) {
-      if (args.condition.includes('1!=1')) {
-        args.condition = args.condition.replace('1!=1', '1=1')
-      }
-    }
-    this.specialCondition = false
+        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 === '发卡售气') {
+          args.condition = `${args.condition} and f_whether_hairpin = '未发' and f_meter_classify like '%卡表%'`
+        }
+        this.isPager = true
+        this.criteriaShow = true
+        this.$parent.warningInfo = null
+        this.cardInfo = ''
+        if (!this.specialCondition) {
+          if (args.condition.includes('1!=1')) {
+            args.condition = args.condition.replace('1!=1', '1=1')
+          }
+        }
+        this.specialCondition = false
 
-    await this.model.search(args.condition, args.model)
-    if (this.model.rows.length == 1) {
-      this.$parent.toBusiness(this.model.rows[0])
-    }
+        await this.model.search(args.condition, args.model)
+        if (this.model.rows.length == 1) {
+          this.$parent.toBusiness(this.model.rows[0])
+        }
   },
   cardBtn (val) {
     this.clear()
@@ -885,8 +909,8 @@
   },
   computed: {
     authArr () {
-      console.log('this.$login.r:',this.$login.r)
-      console.log('this.$login.r.includes:',this.$login.r.includes('收费综合导出权限'))
+      console.log('this.$login.r:', this.$login.r)
+      console.log('this.$login.r.includes:', this.$login.r.includes('收费综合导出权限'))
       return this.$login.r ? this.$login.r : []
     }
   }

package/src/components/revenue/comprehen/batch/batchUserList.vue

@@ -114,7 +114,7 @@
     // console.log('获取登录信息，', self.$login, self.$appdata, self.$appdata.getParam('用户类型'), Vue.$login.f.name)
     await self.search()
     await self.$LoadParams.loadParam()
-    let overdueset= []
+    let overdueset = []
     let res = await self.$resetpost('rs/sql/saleSingleTable', {
       data: {
         tablename: 't_overdue_set',
@@ -179,7 +179,7 @@
 
           // 是多选
           if (this.rowsdata.length) {
-            info = '确认批量修改档案吗?'
+            info = `共选中${this.rowsdata.length}条数据，确认批量修改档案吗?`
           }
           // 点击的是批量生成
           this.$showMessage(info, ['confirm', 'cancel']).then(

package/src/components/webMeter/paramSave/ParamSet.vue

@@ -245,10 +245,9 @@ let initGen = async function (self) {
       arr.push(temp)
       let styleArr = []
       for (let row of item.value.gasmodel) {
-        styleArr.push({label: row.label,value: row.value.id})
+        styleArr.push({label: row.label, value: row.value.id})
       }
       self.meterstyle[temp.value] = styleArr
-      console.log('jjjjkhk', styleArr)
     }
   })
   self.meterbrand = arr
@@ -268,7 +267,7 @@ export default {
       showParame: false,
       paramHistory: false,
       row: null,
-      setable: false,
+      setable: true,
       criteriaShow: false,
       condition: '',
       f_gasbrand_id: null,
@@ -347,16 +346,16 @@ export default {
     hidden () {
       this.criteriaShow = !this.criteriaShow
     },
-    async showParamDefault(){
-      this.user=null
+    async showParamDefault () {
+      this.user = null
       this.map.clear()
       await this.$refs.form.getBrandParamsHistory()
       this.showParame = !this.showParame
     },
     showParam () {
       this.conditionMsg = ''
-      if(!this.user){
-        this.user=[]
+      if (!this.user) {
+        this.user = []
       }
       if (this.user.length === 0) {
         this.$showMessage('是否要设置查询出来的所有表参数', ['confirm', 'cancel']).then((res) => {
@@ -438,7 +437,6 @@ export default {
     },
     mapset (array) {
       this.map.clear()
-      console.log(array)
       for (let i = 0; i < array.length; i++) {
         let userid = array[i].f_userfiles_id
         let alias = array[i].f_alias

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

@@ -117,9 +117,9 @@
 
 
 <script>
-  import {HttpResetClass} from "vue-client";
+  import {HttpResetClass} from 'vue-client'
 
-  export default {
+export default {
     title: '参数设置',
     props: ['user', 'checked1', 'gasbrandid', 'condition'],
 
@@ -130,8 +130,8 @@
         gasbrand: null,
         paramtypes: [],
         paramtype: '',
-        param:{},
-        history:[]
+        param: {},
+        history: []
       }
     },
     ready () {
@@ -140,8 +140,7 @@
     watch: {
       param: {
         handler: function (val) {
-          console.log("--------------param变了",val)
-
+          console.log('--------------param变了', val)
         },
         deep: true
       },
@@ -183,22 +182,21 @@
         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){
+            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_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]){
+                  if (this.row[key]) {
                     params.push(data)
                   }
                 }
               }
             }
-
           }
         }
         let param = {
@@ -233,24 +231,24 @@
         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){
+            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_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]){
+                  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,
@@ -276,40 +274,39 @@
         this.paramtypes = []
         let temp = {
           tablename: 't_gasbrand',
-          condition: `id=${val} and f_orgid='${this.$login.f.orgid}'`
+          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 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){
+        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.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)
-
+        }
+        this.$dispatch('showparam', true)
       },
-      async getBrandParamsHistory(){
+      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
+        this.history = res.data
         let rat = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
           data: {
             items: '*',
@@ -320,18 +317,18 @@
         }, {resolveMsg: null, rejectMsg: '获取参数历史信息信息失败'})
         if (rat.data.length > 0) {
           rat.data.forEach((item) => {
-            if(item.f_param_value === '1'){
+            if (item.f_param_value === '1') {
               item.f_param_value = '开'
             }
-            if(item.f_param_value === '0'){
+            if (item.f_param_value === '0') {
               item.f_param_value = '关'
             }
-            console.log("参数取出来了---",item.f_param_lname)
-            this.$set(`param['${item.f_param_lname}']`,item.f_param_value)
+            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)
+        console.log('参数取出来了', this.param)
       }
     }
   }