sale-client 3.5.24 → 3.5.25

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.24",
+  "version": "3.5.25",
   "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.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/filiale/tongchuan/common/userinfo_detail/ic_detail/MeterParam.vue

@@ -41,10 +41,11 @@
               <!--@change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>-->
               <!--</th>-->
               <th><nobr>读取类型</nobr></th>
-              <th><nobr>读取内容</nobr></th>
+              <!--<th><nobr>读取内容</nobr></th>-->
               <th><nobr>数据日期</nobr></th>
               <th><nobr>用量合计</nobr></th>
               <th><nobr>插入日期</nobr></th>
+              <th v-for="(key,value) in $parent.$parent.$parent.jsonFields"><nobr>{{value}}</nobr></th>
             </tr>
           </template>
           <template partial='body' partial='list' v-ref:grid>
@@ -54,10 +55,11 @@
               <!--:checked="$parent.$parent.$parent.ischecked($parent.model.pageIndex-1,$index)" style="width: 22px;height: 22px;"/>-->
               <!--</td>-->
               <td style="text-align:center"><nobr>{{row.f_type}}</nobr></td>
-              <td style="text-align:center"><nobr>{{row.f_data}}</nobr></td>
+              <!--<td style="text-align:center"><nobr>{{row.f_data}}</nobr></td>-->
               <td style="text-align:center"><nobr>{{row.f_data_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_data_total}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></td>
+              <td style="text-align:center" v-for="(key,value) in $parent.$parent.$parent.jsonFields"><nobr>{{row[key]}}</nobr></td>
             </tr>
           </template>
           <template partial='foot'></template>
@@ -82,6 +84,18 @@
         all: [],
         // row数据
         rowsdata: [],
+        jsonFields: {
+          factoryFlow: '工况流量',
+          dataDate: '记录时间',
+          factoryTotal: '工况累积量',
+          temperature: '温度',
+          standardTotal: '标况累积量',
+          pressure: '压力',
+          standardFlow: '标流量',
+          Result: '结果',
+          state: '状态',
+          error: '错误'
+        },
         fields: {'f_preamount': '购气金额', 'f_pregas': '购气量', 'f_operate_date': '缴费时间', 'f_operator': '操作员', 'f_comments': '备注'},
         defaultfield: [
           'f_preamount', 'f_pregas', 'f_operate_date', 'f_operator', 'f_comments'
@@ -93,9 +107,15 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      search () {
+      // search () {
+      //   this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userfiles_id = '${this.row.f_userfiles_id}'`
+      //   this.model.search(this.condition, this.model)
+      // },
+      async search () {
         this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userfiles_id = '${this.row.f_userfiles_id}'`
-        this.model.search(this.condition, this.model)
+        let res = await this.$resetpost('rs/logic/sale_meterparamQuery', {condition: this.condition})
+        this.model = res.data
+        // this.model.search(this.condition, this.model)
       },
     },
     computed: {

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Apr 02 10:09:16 CST 2021
-gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-