manage-client 3.3.174 → 3.3.175

package/src/filiale/meihekou/ChargeQuery.vue

@@ -206,40 +206,40 @@
                             condition="f_state in {}"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body">银行名称</label>
                   <v-select :value.sync="model.f_bank_name"
                             v-model="model.f_bank_name"
                             :options='$parent.$parent.bank' placeholder='请选择'
                             condition="f_bank_name = '{}'"
                             close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
+                </div> -->
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body">是否优惠</label>
                   <v-select :value.sync="model.f_privilege_money"
                             v-model="model.f_privilege_money"
                             :options='$parent.$parent.privilege_money' placeholder='请选择'
                             condition="f_privilege_money {}"
                             close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
+                </div> -->
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收&ensp;据&ensp;号</label>
                   <input type="text" style="width:30%" class="input_search" title="大于等于"
                          v-model="model.f_bill_number_big" condition="f_bill_number >= {}" placeholder='大于等于'>
                   <input type="text" style="width:30%" class="input_search" title="小于等于"
                          v-model="model.f_bill_number_small" condition="f_bill_number <= {}" placeholder='小于等于'>
-                </div>
+                </div> -->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;流水号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
                          condition="f_serial_id = '{}'" placeholder='流水号'>
                 </div>
-                <div class="col-sm-2 form-group">
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body">发票号码</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_invoice_num"
                          condition="f_invoice_num = '{}'" placeholder='发票号码'>
-                </div>
-                <div class="col-sm-2 form-group">
+                </div> -->
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="发票类型查询">发票类型</label>
                   <v-select :value.sync="model.f_invoice_type"
                             v-model="model.f_invoice_type"
@@ -247,13 +247,13 @@
                             condition="f_invoice_type = '{}'"
                             close-on-select :value-single="true" :search="false">
                   </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
+                </div> -->
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body">开&ensp;票&ensp;人</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_invoiceuse_operator"
                          condition="f_invoiceuse_operator like '%{}%'" placeholder='开票人'>
-                </div>
-                <div class="col-sm-2 form-group">
+                </div> -->
+                <!-- <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开票时间</label>
                   <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
                               v-model="model.invoice_startDate"
@@ -272,7 +272,7 @@
                               :show-reset-button="true"
                               condition="f_invoice_date <= '{}'">
                   </datepicker>
-                </div>
+                </div> -->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
@@ -303,14 +303,14 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_street"
                          condition="f_street like '%{}%'" placeholder='街道'>
                 </div>
-                <div class="col-sm-2 form-group">
+                <!-- <div class="col-sm-2 form-group">
                   <label class="font_normal_body">数&ensp;据&ensp;包</label>
                   <v-select :value.sync="model.f_bluetooth_package" v-model="model.f_bluetooth_package"
                             :options='$parent.$parent.bluetoothpackage' placeholder='数据包状态'
                             style="width:60%"
                             close-on-select
                             condition="f_bluetooth_package = '{}'"></v-select>
-                </div>
+                </div> -->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">pos设备&nbsp;</label>
                   <v-select :value.sync="model.f_terminal_name" multiple
@@ -423,9 +423,9 @@
                 <th>
                   <nobr>终端号</nobr>
                 </th>
-                <th>
+                <!-- <th>
                   <nobr>蓝牙数据包状态</nobr>
-                </th>
+                </th> -->
                 <th>
                   <nobr>状态</nobr>
                 </th>
@@ -448,7 +448,7 @@
                 <th>
                   <nobr>流水号</nobr>
                 </th>
-                <th>
+                <!-- <th>
                   <nobr>收据号</nobr>
                 </th>
                 <th>
@@ -465,7 +465,7 @@
                 </th>
                 <th>
                   <nobr>开票时间</nobr>
-                </th>
+                </th> -->
                 <th>
                   <nobr>累计写卡气量</nobr>
                 </th>
@@ -603,9 +603,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_terminal_num}}</nobr>
               </td>
-              <td style="text-align: center;">
+              <!-- <td style="text-align: center;">
                 <nobr>{{row.f_bluetooth_package}}</nobr>
-              </td>
+              </td> -->
               <td style="text-align: center;">
                 <nobr>{{row.f_state}}</nobr>
               </td>
@@ -628,7 +628,7 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_serial_id}}</nobr>
               </td>
-              <td style="text-align: center;">
+              <!-- <td style="text-align: center;">
                 <nobr>{{row.f_bill_number}}</nobr>
               </td>
               <td style="text-align: center;">
@@ -645,7 +645,7 @@
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_invoice_date}}</nobr>
-              </td>
+              </td> -->
               <td style="text-align: center;">
                 <nobr>{{row.f_write_totalgas}}</nobr>
               </td>

package/src/filiale/shaoguan/errorHandplanQuery.vue

@@ -294,6 +294,7 @@
           f_print: '普通收据',
           f_payment:'银行转账',
           isBreakOverdue:false,
+          f_bank_name: row.f_bankname,
           floor:true,
           operInfo: {
             f_operator: this.$login.f.name,

package/src/main.js

@@ -1,76 +1,68 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-// import saleManage from './saleManage'
-// import FilialeSaleManage from './filiale/WEINAN/sale'
-// import webmeterManage from './webmeterManage'
-// import FilialeWebmeterManage from './filiale/yuncheng/webmeterManage'
-import reportManage from './reportManage'
-// import FilialeReportManage from './filiale/WEINAN/reportManage'
-// import newmanage from './newmanage'
-// import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-// // 开启 nginx 加密
-// Vue.mmType = 'nginx'
-// Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
-//
-// Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-// saleManage()
-// FilialeSaleManage()
-// webmeterManage()
-// FilialeWebmeterManage()
-// ManageHome()
-// newmanage()
-reportManage()
-// FilialeReportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import ShanXianSaleManage from './filiale/shexian/sale'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+ShanXianSaleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+