sale-client 3.5.23 → 3.5.24

package/package.json

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

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)
       }
     }
   }