sale-client 4.2.36 → 4.2.37

package/src/filiale/ronghao/ic_detail/ChargeRecordQuery.vue

@@ -1,106 +1,106 @@
-<template>
-    <div style="height:100%">
-      <data-grid :model="model" class="table_sy"   partial='list' v-ref:grid >
-        <template partial='head' >
-          <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>气量</nobr></th>
-            <th><nobr>应交</nobr></th>
-            <th><nobr>付款方式</nobr></th>
-            <th v-if="!$parent.$parent.f_calculation.includes('表端结算')"><nobr>上期结余</nobr></th>
-            <th v-if="$parent.$parent.searchdata.f_meter_type === '机表'"><nobr>上期底数</nobr></th>
-            <th><nobr>收款</nobr></th>
-            <th v-if="!$parent.$parent.f_calculation.includes('表端结算')"><nobr>本期结余</nobr></th>
-            <th v-if="$parent.$parent.searchdata.f_meter_type === '机表'"><nobr>本期底数</nobr></th>
-            <th><nobr>操作类型</nobr></th>
-            <th><nobr>操作时间 </nobr></th>
-            <th><nobr>操作员 </nobr></th>
-            <th><nobr>备注</nobr></th>
-            <th><nobr>写卡状态</nobr></th>
-          </tr>
-        </template>
-        <template partial='body' >
-          <tr >
-            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.gas}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_payment}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-if="!$parent.$parent.f_calculation.includes('表端结算')">{{row.f_balance}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-if="$parent.$parent.searchdata.f_meter_type === '机表'">{{row.f_last_tablebase}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-if="!$parent.$parent.f_calculation.includes('表端结算')">{{row.f_curbalance}}</td>
-            <td style="text-align:center;white-space:nowrap;" v-if="$parent.$parent.searchdata.f_meter_type === '机表'">{{row.f_tablebase}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
-            <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
-          </tr>
-        </template>
-      </data-grid>
-      <modal :show.sync="cardCental" v-ref:modal backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <h4 class="modal-title">温馨提示</h4>
-        </header>
-        <article slot="modal-body" class="modal-body">
-          <div class="form-group">
-           <p> 当日此用户已经进行过一次购气,若卡上无气,请先进行补卡(未过表),之后掉气补气即可</p>
-          </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='cancel()'>确认
-          </button>
-        </footer>
-      </modal>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '操作查询',
-    data () {
-      return {
-        model: {rows: []},
-        f_calculation: '',
-        cardCental: false,
-        hasCardCental: false
-      }
-    },
-    props: ['searchdata'],
-    ready () {
-      this.getsalerecord()
-    },
-    methods: {
-      cancel () {
-        this.cardCental = false
-      },
-      async getsalerecord () {
-        let http = new HttpResetClass()
-        // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
-        this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
-        let record = await http.load('POST', 'api/af-revenue/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
-          rejectMsg: '流水查询出错！！',
-          resolveMsg: null
-        })
-        this.f_calculation = this.searchdata.f_calculation
-        this.model.rows = record.data
-        this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
-        if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
-          let checkdata = this.model.rows[0].operate_date.substr(0, 10)
-          let nowdate = new Date()
-          let pdate = nowdate.getFullYear() + '-' + (nowdate.getMonth() < 10 ? '0' + nowdate.getMonth() + 1 : nowdate.getMonth() + 1) + '-' + (nowdate.getDate() < 10 ? '0' + nowdate.getDate() : nowdate.getDate())
-          if (new Date(checkdata).getTime() == new Date(pdate).getTime()) {
-            this.cardCental = true
-          }
-        }
-      }
-    },
-    watch: {
-      'searchdata' () {
-        this.getsalerecord()
-      }
-    }
-  }
-</script>
+<template>
+    <div style="height:100%">
+      <data-grid :model="model" class="table_sy"   partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>气量</nobr></th>
+            <th><nobr>应交</nobr></th>
+            <th><nobr>付款方式</nobr></th>
+            <th v-if="!$parent.$parent.f_calculation.includes('表端结算')"><nobr>上期结余</nobr></th>
+            <th v-if="$parent.$parent.searchdata.f_meter_type === '机表'"><nobr>上期底数</nobr></th>
+            <th><nobr>收款</nobr></th>
+            <th v-if="!$parent.$parent.f_calculation.includes('表端结算')"><nobr>本期结余</nobr></th>
+            <th v-if="$parent.$parent.searchdata.f_meter_type === '机表'"><nobr>本期底数</nobr></th>
+            <th><nobr>操作类型</nobr></th>
+            <th><nobr>操作时间 </nobr></th>
+            <th><nobr>操作员 </nobr></th>
+            <th><nobr>备注</nobr></th>
+            <th><nobr>写卡状态</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.gas}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_payment}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-if="!$parent.$parent.f_calculation.includes('表端结算')">{{row.f_balance}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-if="$parent.$parent.searchdata.f_meter_type === '机表'">{{row.f_last_tablebase}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-if="!$parent.$parent.f_calculation.includes('表端结算')">{{row.f_curbalance}}</td>
+            <td style="text-align:center;white-space:nowrap;" v-if="$parent.$parent.searchdata.f_meter_type === '机表'">{{row.f_tablebase}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
+            <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
+          </tr>
+        </template>
+      </data-grid>
+      <modal :show.sync="cardCental" v-ref:modal backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <h4 class="modal-title">温馨提示</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="form-group">
+           <p> 当日此用户已经进行过一次购气,若卡上无气,请先进行补卡(未过表),之后掉气补气即可</p>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='cancel()'>确认
+          </button>
+        </footer>
+      </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '操作查询',
+    data () {
+      return {
+        model: {rows: []},
+        f_calculation: '',
+        cardCental: false,
+        hasCardCental: false
+      }
+    },
+    props: ['searchdata'],
+    ready () {
+      this.getsalerecord()
+    },
+    methods: {
+      cancel () {
+        this.cardCental = false
+      },
+      async getsalerecord () {
+        let http = new HttpResetClass()
+        // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
+        this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
+        let record = await http.load('POST', 'api/af-revenue/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
+          rejectMsg: '流水查询出错！！',
+          resolveMsg: null
+        })
+        this.f_calculation = this.searchdata.f_calculation
+        this.model.rows = record.data
+        this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
+        if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
+          let checkdata = this.model.rows[0].operate_date.substr(0, 10)
+          let nowdate = new Date()
+          let pdate = nowdate.getFullYear() + '-' + (nowdate.getMonth() < 10 ? '0' + nowdate.getMonth() + 1 : nowdate.getMonth() + 1) + '-' + (nowdate.getDate() < 10 ? '0' + nowdate.getDate() : nowdate.getDate())
+          if (new Date(checkdata).getTime() == new Date(pdate).getTime()) {
+            this.cardCental = true
+          }
+        }
+      }
+    },
+    watch: {
+      'searchdata' () {
+        this.getsalerecord()
+      }
+    }
+  }
+</script>

package/src/filiale/ronghao/ic_detail/WatchCollection.vue

@@ -1,115 +1,115 @@
-<template >
-  <div id="stand-work-list" >
-    <div @keyup.enter="search" class="span">
-      <criteria-paged :model="model" v-ref:paged>
-        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
-          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
-            <div class="row">
-
-              <div class="col-sm-2 form-group ">
-                <label class="font_normal_body">上报时间</label>
-                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
-                            class="datepicker"
-                            condition="m.f_hand_date >= '{}'"
-                            placeholder="大于等于"
-                            style="width: 60%"
-                            v-model="model.f_start_date"
-                ></datepicker>
-              </div>
-              <div class="col-sm-2 form-group " >
-                <label class="font_normal_body">&nbsp;至</label>
-                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
-                            class="datepicker"
-                            condition="m.f_hand_date <= '{}'"
-                            placeholder="小于等于"
-                            style="width: 60%"
-                            v-model="model.f_end_date"
-                ></datepicker>
-              </div>
-              <div style="float: right">
-                <button  @click="search()"  class="button_search" v-el:cba>查询</button>
-              </div>
-            </div>
-
-          </div>
-        </criteria>
-        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th><nobr>上报日期</nobr></th>
-              <th><nobr>{{$parent.$parent.$parent.row.f_collection_type == '按气量' ? '表上余量' :'表上余额' }}</nobr></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><nobr>信噪比</nobr></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><nobr>补偿状态</nobr></th>
-            </tr>
-          </template>
-          <template partial='body' partial='list'>
-            <tr >
-              <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 == 0 ? '开阀' : row.f_valvestate === '1' ? '关阀' : '未上报'}}</nobr>
-              <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-
-  export default {
-    title: 'WatchCollection',
-    data () {
-      return {
-        model: new PagedList('api/af-revenue/sql/iot_getNewLoseUserQuery', 50)
-      }
-    },
-    props: ['row'],
-    ready () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    methods: {
-      search (args) {
-        args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
-        this.model.search(args.condition, args.model)
-      }
-    },
-    watch: {
-      // 监听查询对象
-      'row' (val) {
-        if (this.row != null) {
-          this.$refs.paged.$refs.criteria.search()
-        }
-      }
-    }
-  }
-</script>
-
+<template >
+  <div id="stand-work-list" >
+    <div @keyup.enter="search" class="span">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+
+              <div class="col-sm-2 form-group ">
+                <label class="font_normal_body">上报时间</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="m.f_hand_date >= '{}'"
+                            placeholder="大于等于"
+                            style="width: 60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group " >
+                <label class="font_normal_body">&nbsp;至</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="m.f_hand_date <= '{}'"
+                            placeholder="小于等于"
+                            style="width: 60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div style="float: right">
+                <button  @click="search()"  class="button_search" v-el:cba>查询</button>
+              </div>
+            </div>
+
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>上报日期</nobr></th>
+              <th><nobr>{{$parent.$parent.$parent.row.f_collection_type == '按气量' ? '表上余量' :'表上余额' }}</nobr></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><nobr>信噪比</nobr></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><nobr>补偿状态</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list'>
+            <tr >
+              <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 == 0 ? '开阀' : row.f_valvestate === '1' ? '关阀' : '未上报'}}</nobr>
+              <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: 'WatchCollection',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/iot_getNewLoseUserQuery', 50)
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      search (args) {
+        args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+      // 监听查询对象
+      'row' (val) {
+        if (this.row != null) {
+          this.$refs.paged.$refs.criteria.search()
+        }
+      }
+    }
+  }
+</script>
+