sale-client 3.6.417 → 3.6.419

package/package.json

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

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -261,7 +261,7 @@ export default {
       }, ...this.$appdata.getParam('表具状态')] : [],
       // 控制单选
       radio: [],
-      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
       // 选中的页
       all: [],
       other: [],

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

@@ -119,7 +119,7 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
-  import axios from "axios";
+  import axios from 'axios'
 
 export default {
     title: '参数设置',
@@ -156,15 +156,22 @@ export default {
         this.row = {}
         if (val) {
           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 j = 0; j < this.newmeterinfo[i].params.length; j++) {
-                  if (this.newmeterinfo[i].params[j].data) {
-                    this.row[this.newmeterinfo[i].params[j].title] = this.newmeterinfo[i].params[j].data
-                  }
-                  if (this.newmeterinfo[i].params[j].multiple == true) {
-                    this.row[this.newmeterinfo[i].params[j].title] = []
-                    console.log('====>', this.row[this.newmeterinfo[i].params[j].title])
+            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.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.row[param.title] = param.data
                   }
                 }
               }

package/src/filiale/yuansheng/UserBaseInfoNew.vue

@@ -115,7 +115,7 @@
         </div>
         <div  class="col-sm-4">
           <label class="font_normal_body_new">阀门状态</label>
-          <input class="input-underline" style="width:60%" :value="row.f_valvestate === null ? '未知' : (row.f_valvestate === 0 ? '开阀' : '关阀')" readonly>
+          <input class="input-underline" style="width:60%" :value="row.f_valvestate === null ? '未知' : (row.f_valvestate === '0' ? '开阀' : '关阀')" readonly>
         </div>
         <div class="col-sm-4">
           <label class="font_normal_body_new">累计上报次数</label>

package/src/filiale/yuansheng/WatchCollection.vue

@@ -60,7 +60,7 @@
               <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
               <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
-              <th style="text-align:center"><nobr>{{ row.f_valvestate === null ? '未知' : (row.f_valvestate === 0 ? '开阀' : '关阀') }}
+              <th style="text-align:center"><nobr>{{ row.f_valvestate === null ? '未知' : (row.f_valvestate === '0' ? '开阀' : '关阀') }}
               </nobr></th>
               <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>

package/.npmignore

@@ -1,12 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/
-examples/
-gradle/
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-lib/**/lib