manage-client 3.2.266 → 3.2.267

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400'
+var bendi = 'http://61.240.138.248:8400'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://127.0.0.1:8084'
+var wode = 'http://61.240.138.248:8400'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.266",
+  "version": "3.2.267",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -142,9 +142,19 @@
                     <label class="font_normal_body">气表品牌</label>
                     <v-select :value.sync="model.f_meter_brand"
                               v-model="model.f_meter_brand" multiple
+                              @change="$parent.$parent.getMeterStyle"
                               :options='$parent.$parent.meterbrands' placeholder='请选择'
                               condition="f_meter_brand in {}"
-                              ></v-select>
+                    ></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">气表型号</label>
+                    <v-select :value.sync="model.f_meter_style"
+                              v-model="model.f_meter_style" multiple
+                              :options='$parent.$parent.meterStyle' placeholder='请选择'
+                              condition="f_meter_style in {}"
+                    ></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">表&emsp;&emsp;号</label>
@@ -931,6 +941,7 @@
         sumsmodel: {},
         //表册片区
         bookSlice:[{label: '全部',value: ''}],
+        meterStyle:[{label: '全部',value: ''}],
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
         networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
@@ -946,6 +957,34 @@
       })
     },
     methods: {
+      recombine (param) {
+        // 条件拼接数据，多用于in （）。将数组转成字符串时加上单引号处理
+        let str = ''
+        if (param && param.length > 0) {
+          param.forEach((p) => {
+            str += `'${p}',`
+          })
+        }
+        return `(${str.substring(0, str.length - 1)})`
+      },
+      async getMeterStyle(val){
+        if (val.length > 0){
+          // 获取气表型号下拉框
+          let HttpReset = new HttpResetClass()
+          let param = {
+            items: 'distinct f_meter_style',
+            tablename: 't_gasmodel gm left join t_gasbrand tg on gm.f_gasbrand_id = tg.id',
+            condition: `tg.f_meter_brand in ${this.recombine(val)}`,
+            orderitem: 'f_meter_style'
+          }
+          let data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
+          for (let row of data.data) {
+            this.meterStyle.push({label: row.f_meter_style, value: row.f_meter_style})
+          }
+        } else {
+          this.meterStyle = [{label: '全部',value: ''}]
+        }
+      },
       ReadIDCard(){
         this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
           console.log('======',msg)

package/src/filiale/wenxi/WebHandQuery.vue

@@ -194,7 +194,7 @@
                 <th style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_total_fee}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_total_gas}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_balance_amount}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.cycleGas}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.cycleFee}}</nobr></th>

package/src/filiale/yuansheng/DayReportList.vue

@@ -40,6 +40,7 @@
               <label class="font_normal_body">操作类型</label>
               <v-select :value.sync="model.f_type" v-model="model.f_type"
                         :options='$parent.$parent.operates' placeholder='请选择'
+                        condition="f_type = '{}'"
                         close-on-select></v-select>
             </div>
             <div :class="$parent.$parent.style">
@@ -294,6 +295,7 @@ export default {
     readyGen(this)
     this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
     this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
+    this.$refs.paged.$refs.cri.model.f_type = ['卡表收费']
     this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
     this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
     // this.search()